<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/1d44cccc13675be5a450074d76eccd4cb2fbd367">https://github.com/macports/macports-ports/commit/1d44cccc13675be5a450074d76eccd4cb2fbd367</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 1d44cccc136 xine-lib: Update to 1.2.12
</span>1d44cccc136 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1d44cccc13675be5a450074d76eccd4cb2fbd367
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 10 06:52:52 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-lib: Update to 1.2.12
</span>---
multimedia/xine-lib/Portfile | 17 ++-
multimedia/xine-lib/files/XineOpenGLView.patch | 16 ---
multimedia/xine-lib/files/dynamic_lookup-11.patch | 12 +--
multimedia/xine-lib/files/implicit.patch | 17 +--
multimedia/xine-lib/files/libcaca0.99.beta20.patch | 118 ---------------------
.../files/src_xine-engine_Makefile.in.diff | 6 +-
6 files changed, 25 insertions(+), 161 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/Portfile b/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7e61988bcb..ac2e5cd3755 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,14 +3,13 @@
</span> PortSystem 1.0
name xine-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 025b1bd5b46e98d8676293359f6e4237df7d7e39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5282204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 42f6755bde10f20604f50a38caae8b8e1a069128 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5341212
</span>
categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> # bundled libdvdnav is GPL-2 only but we use MacPorts libdvdnav now
license GPL-2+
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,10 +64,8 @@ depends_lib port:a52dec \
</span> port:xorg-libXvMC \
port:xorg-xcb-util
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append XineOpenGLView.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dynamic_lookup-11.patch \
</span><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:#e0ffe0;'>+patchfiles-append dynamic_lookup-11.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
post-patch {
# Use newer config.guess and config.sub to support Apple Silicon.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/XineOpenGLView.patch b/multimedia/xine-lib/files/XineOpenGLView.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 14dbcfee86e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/XineOpenGLView.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 "error: config.h not included in source file !"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/mailman/message/37402193/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-lib-1.2/ci/2bccbbbd6bf18cfcd6b75865d305f65735abb923/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video_out/macosx/XineOpenGLView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video_out/macosx/XineOpenGLView.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include "config.h"
</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;'>- #import <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/dynamic_lookup-11.patch b/multimedia/xine-lib/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e9dd320c603..0242dfd55ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 12 and later, remove inaccurate comment, and simplify.
</span> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-12-06 07:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-28 20:40:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11071,16 +11071,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-03-09 07:16:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-03-10 06:43:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11140,16 +11140,11 @@
</span> _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,14 +11,14 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span> - # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[912]*)
</span> - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 10.[012][,.]*)
+ darwin*)
+ case $MACOSX_DEPLOYMENT_TARGET,$host in
+ 10.[012],*|,*powerpc*-darwin[5-8]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*|11.*)
</span> + *)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/implicit.patch b/multimedia/xine-lib/files/implicit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3325e1ec5d4..2f6d84b5911 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</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 2020-12-06 07:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-14 21:56:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28476,10 +28476,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-03-09 07:16:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-03-10 06:44:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28625,10 +28625,11 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28491,10 +28492,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28640,10 +28641,11 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28529,10 +28531,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28678,10 +28680,12 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28544,10 +28548,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28693,10 +28697,12 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28588,10 +28594,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28737,10 +28743,12 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28603,10 +28611,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28752,10 +28760,12 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,3 +84,4 @@ https://sourceforge.net/p/xine/mailman/message/37402884/
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/libcaca0.99.beta20.patch b/multimedia/xine-lib/files/libcaca0.99.beta20.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 264ef18b7dd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/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,118 +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/xine-lib-1.2/ci/3f383e140270cd45448bd9ebaa08232579e1c1af/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-12-06 07:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-15 19:25:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26238,6 +26238,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x"$have_caca$have_cucul" = x"yesyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_CUCUL=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+printf "%s\n" "#define HAVE_CUCUL /**/" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video_out/video_out_caca.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video_out/video_out_caca.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Copyright (C) 2003-2019 the xine project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Copyright (C) 2003-2021 the xine project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This file is part of xine, a free video player.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,12 +35,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/mman.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CUCUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <cucul.h>
</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_get_canvas_width cucul_get_canvas_width
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_get_canvas_height cucul_get_canvas_height
</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;'>-+# define caca_dither_t cucul_dither_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_create_dither define cucul_create_dither
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_dither_bitmap cucul_dither_bitmap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define caca_free_dither cucul_free_dither
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <caca.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xine.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xine/video_out.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vo_frame_t vo_frame;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_dither_t *pixmap_s; /* pixmap info structure */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_dither_t *pixmap_s; /* pixmap info structure */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t *pixmap_d; /* pixmap data */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int width, height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yuv2rgb_factory_t *yuv2rgb_factory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_canvas_t *cv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_canvas_t *cv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_display_t *dp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } caca_driver_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +112,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free (frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (frame->pixmap_s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->yuv2rgb->dispose (frame->yuv2rgb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _x_freep (&frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (frame->pixmap_s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->pixmap_s = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->format = format;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->pixmap_d = (uint8_t *) calloc (height, width * 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- frame->pixmap_s = cucul_create_dither (32, width, height, width * 4,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0xff0000, 0xff00, 0xff, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (format == XINE_IMGFMT_YV12) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,7 +222,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->vo_frame.free (&frame->vo_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_dither_bitmap(this->cv, 0, 0, cucul_get_canvas_width(this->cv)-1, cucul_get_canvas_height(this->cv)-1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_dither_bitmap(this->cv, 0, 0, caca_get_canvas_width(this->cv)-1, caca_get_canvas_height(this->cv)-1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frame->pixmap_s, frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_refresh_display (this->dp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,7 +270,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_driver_t *this = (caca_driver_t*) this_gen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->yuv2rgb_factory->dispose (this->yuv2rgb_factory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caca_free_display(this->dp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cucul_free_canvas(this->cv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caca_free_canvas(this->cv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->cv = caca_get_canvas(dp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->dp = dp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this->cv = cucul_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->cv = caca_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->dp = caca_create_display(this->cv);
</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-lib/files/src_xine-engine_Makefile.in.diff b/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 804311150da..3b3123d52f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> ar: no archive members specified
https://bugs.xine-project.org/show_bug.cgi?id=456
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xine-engine/Makefile.in.orig 2019-12-13 15:36:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xine-engine/Makefile.in 2020-04-26 23:57:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -751,7 +751,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xine-engine/Makefile.in.orig 2022-03-09 07:16:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xine-engine/Makefile.in 2022-03-10 06:42:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -761,7 +761,11 @@
</span> }
libxine-interface.la: $(libxine_interface_la_OBJECTS) $(libxine_interface_la_DEPENDENCIES) $(EXTRA_libxine_interface_la_DEPENDENCIES)
</pre><pre style='margin:0'>
</pre>