<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d012d34413b71c3fcb6a0e475b44f81d7aeba7f2">https://github.com/macports/macports-ports/commit/d012d34413b71c3fcb6a0e475b44f81d7aeba7f2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d012d34413b xine-ui: Update to 0.99.14
</span>d012d34413b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d012d34413b71c3fcb6a0e475b44f81d7aeba7f2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 11 23:45:08 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-ui: Update to 0.99.14
</span>---
multimedia/xine-ui/Portfile | 16 ++++-----
multimedia/xine-ui/files/implicit.patch | 38 ++++++++++----------
multimedia/xine-ui/files/libcaca0.99.beta20.patch | 42 -----------------------
multimedia/xine-ui/files/malloc.patch | 13 -------
multimedia/xine-ui/files/strlcpy.patch | 16 ---------
5 files changed, 25 insertions(+), 100 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/Portfile b/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fa7bc41e83..78274576324 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,15 +3,14 @@
</span> PortSystem 1.0
name xine-ui
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.99.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d7bf046241a3fdf3c488e3644744798028a45d88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b2382d075c72b1b10039e0e90310cc86c8d910358c53559ed82d3d584201f5c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2156892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.99.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a23b4cc56e7d117fe0b561eb338f45a2738b7110 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d4d490d5cece70e2bb9849c9e482f2cf87af0302d451b614476fdcc3642cd9c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2214740
</span>
maintainers {ryandesign @ryandesign} openmaintainer
categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
description A free multimedia player
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +43,7 @@ depends_lib port:aalib \
</span> universal_variant no
patchfiles globals.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcaca0.99.beta20.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strlcpy.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
configure.args --disable-lirc \
--with-readline=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/implicit.patch b/multimedia/xine-ui/files/implicit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 596930b0b48..704e9bb8a0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +1,40 @@
</span> Fix implicit declaration of functions.
https://sourceforge.net/p/xine/mailman/message/37402884/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-12-12 13:51:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-16 23:56:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8892,10 +8892,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-01-07 13:29:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-01-11 23:26:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9641,10 +9641,11 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <xine/xineutils.h>
int
<span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main (void)
</span> {
-xine_open_cloexec();
+xine_open_cloexec(0,0);
;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8924,10 +8925,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9674,10 +9675,11 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <xine/xineutils.h>
int
<span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main (void)
</span> {
-xine_socket_cloexec();
+xine_socket_cloexec(0,0,0);
;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8957,11 +8959,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9708,11 +9710,12 @@
</span> /* end confdefs.h. */
+#include <xine/list.h>
int
<span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main (void)
</span> {
-xine_list_next_value ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,18 +42,18 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span>
;
return 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10627,8 +10630,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11425,8 +11428,8 @@
</span> fi
if test "$ac_cv_header_sys_shm_h" = "yes"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking whether shmctl IPC_RMID allowes subsequent attaches... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shmctl IPC_RMID allows subsequent attaches" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking whether shmctl IPC_RMID allows subsequent attaches... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$cross_compiling" = yes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "assuming no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10636,6 +10639,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking whether shmctl IPC_RMID allowes subsequent attaches... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether shmctl IPC_RMID allows subsequent attaches" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++printf %s "checking whether shmctl IPC_RMID allows subsequent attaches... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$cross_compiling" = yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: assuming no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11435,6 +11438,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> #include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12097,6 +12101,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12916,6 +12920,7 @@
</span>
#include <stdio.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> #include <aalib.h>
int main () {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12207,6 +12212,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13029,6 +13034,7 @@
</span>
#include <stdio.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/libcaca0.99.beta20.patch b/multimedia/xine-ui/files/libcaca0.99.beta20.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8fdba916d64..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/libcaca0.99.beta20.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with libcaca >= 0.99.beta20.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/mailman/message/37402888/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-ui/ci/42006da2b512315c16d1e55db60ac115f31dfc3e/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aaui/main.c.orig 2021-12-12 13:49:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aaui/main.c 2021-12-17 00:36:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +69,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <caca.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef CUCUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <cucul.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_canvas_t cucul_canvas_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_create_canvas cucul_create_canvas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_free_canvas cucul_free_canvas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aa_context *context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef CACA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_canvas_t *canvas;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_canvas_t *canvas;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_display_t *display;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *mrl[1024];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -828,7 +831,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!video_driver_id)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- video_driver_id = "caca";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- aaxine.canvas = cucul_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ aaxine.canvas = caca_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aaxine.display = caca_create_display(aaxine.canvas);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aaxine.vo_port = xine_open_video_driver(__xineui_global_xine_instance,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- video_driver_id,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1145,7 +1148,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef CACA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(aaxine.display) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_free_display(aaxine.display);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_free_canvas(aaxine.canvas);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_free_canvas(aaxine.canvas);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/malloc.patch b/multimedia/xine-ui/files/malloc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 082e8187b1b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove malloc.h include since it is nonstandard and does not exist on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/mailman/message/37402874/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-ui/ci/3ea5f5a563782e4f2f5230e9d8e3a658229536a4/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xitk/xine-toolkit/backend_x11.c.orig 2021-12-12 13:49:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xitk/xine-toolkit/backend_x11.c 2021-12-16 23:59:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <strings.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xutil.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/strlcpy.patch b/multimedia/xine-ui/files/strlcpy.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index da70ee33fc0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/strlcpy.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix overlapping src and dst for strlcpy that caused crash on launch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-ui/ci/922dfad300c48592c23bffe647035a2a2b1c82b3/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xitk/xine-toolkit/backend_x11.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xitk/xine-toolkit/backend_x11.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2248,9 +2248,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *res_class = (const char *)win->props[XITK_X11_WT_RES_CLASS].value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *res_name = (const char *)win->props[XITK_X11_WT_RES_NAME].value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (res_class)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (res_class && res_class != win->res_class)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strlcpy (win->res_class, res_class, sizeof (win->res_class));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (res_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (res_name && res_name != win->res_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strlcpy (win->res_name, res_name, sizeof (win->res_name));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xclasshint->res_name = win->res_name[0] ? win->res_name : "Xine Window";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xclasshint->res_class = win->res_class[0] ? win->res_class : (char *)"Xitk";
</span></pre><pre style='margin:0'>
</pre>