<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/14fac26169652357b2e34bddf60877c7f33f286b">https://github.com/macports/macports-ports/commit/14fac26169652357b2e34bddf60877c7f33f286b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 14fac26169652357b2e34bddf60877c7f33f286b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 16 19:48:17 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-lib: Fix build; add libGLU dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build failures due to implicit declaration of functions (with Xcode
</span><span style='display:block; white-space:pre;color:#404040;'> 12 and later) and with libcaca 0.99.beta20 and later.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Explicitly add dependencies and flags for opengl, aom, and dav1d which
</span><span style='display:block; white-space:pre;color:#404040;'> were already used before.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add dependency and flag for libGLU.
</span>---
multimedia/xine-lib/Portfile | 24 +++--
multimedia/xine-lib/files/implicit.patch | 85 +++++++++++++++
multimedia/xine-lib/files/libcaca0.99.beta20.patch | 118 +++++++++++++++++++++
3 files changed, 221 insertions(+), 6 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 a920c7c8a6c..c9d416ab36c 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name xine-lib
version 1.2.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> checksums rmd160 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c \
sha256 9cb3f069d3c1ffb7456ea91a936a85bbb07ac2ab7be1e9d0d2c94ffe4110dc57 \
size 5226116
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,8 @@ depends_build port:libtool \
</span>
depends_lib port:a52dec \
port:aalib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:aom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dav1d \
</span> port:esound \
port:faad2 \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +47,7 @@ depends_lib port:a52dec \
</span> port:libdca \
port:libdvdnav \
port:libdvdread \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libGLU \
</span> port:libmad \
port:libmng \
port:libmpcdec \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +66,9 @@ depends_lib port:a52dec \
</span>
patchfiles-append clang.patch \
demux_ts.c.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- headers.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ headers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcaca0.99.beta20.patch
</span>
# bad register name `%rax'
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,20 +77,25 @@ universal_variant no
</span> compiler.blacklist *llvm-gcc-4.2
configure.args --disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-wayland \
</span> --enable-a52dec \
--enable-dvd \
--enable-faad \
--enable-ffmpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-glu \
</span> --enable-libjpeg \
--enable-libpng \
--enable-mad \
--enable-mng \
--enable-modplug \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-opengl \
</span> --enable-sftp \
--enable-tls \
--enable-vpx \
--enable-xinerama \
--enable-xvmc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-aom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-dav1d \
</span> --with-esound \
--with-external-dvdnav \
--with-fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,14 +111,16 @@ configure.args --disable-silent-rules \
</span> --with-x \
--with-xcb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && [string match *64 $build_arch]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args V=1
platform darwin {
patchfiles-append src_xine-engine_Makefile.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *64 ${build_arch}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform macosx {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..debf8a7b760
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-06 07:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-12-14 21:56:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28476,10 +28476,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/vldXvMC.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCPutSlice()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCPutSlice(0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28491,10 +28492,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/vldXvMC.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCPutSlice()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCPutSlice(0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28529,10 +28531,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/XvMClib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCCreateContext()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCCreateContext(0,0,0,0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28544,10 +28548,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/XvMClib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCCreateContext()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCCreateContext(0,0,0,0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28588,10 +28594,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/XvMClib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCCreateContext()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCCreateContext(0,0,0,0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28603,10 +28611,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/extensions/XvMClib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XvMCCreateContext()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XvMCCreateContext(0,0,0,0,0,0,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..264ef18b7dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/libcaca0.99.beta20.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,118 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with libcaca >= 0.99.beta20.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-lib-1.2/ci/3f383e140270cd45448bd9ebaa08232579e1c1af/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-06 07:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-12-15 19:25:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26238,6 +26238,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x"$have_caca$have_cucul" = x"yesyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_CUCUL=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++printf "%s\n" "#define HAVE_CUCUL /**/" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/video_out/video_out_caca.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/video_out/video_out_caca.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright (C) 2003-2019 the xine project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright (C) 2003-2021 the xine project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This file is part of xine, a free video player.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,12 +35,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mman.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUCUL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <cucul.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <cucul.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_canvas_t cucul_canvas_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_create_canvas cucul_create_canvas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_get_canvas_width cucul_get_canvas_width
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_get_canvas_height cucul_get_canvas_height
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_free_canvas cucul_free_canvas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_dither_t cucul_dither_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_create_dither define cucul_create_dither
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_dither_bitmap cucul_dither_bitmap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define caca_free_dither cucul_free_dither
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <caca.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xine.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <xine/video_out.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vo_frame_t vo_frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cucul_dither_t *pixmap_s; /* pixmap info structure */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ caca_dither_t *pixmap_s; /* pixmap info structure */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *pixmap_d; /* pixmap data */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yuv2rgb_factory_t *yuv2rgb_factory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cucul_canvas_t *cv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ caca_canvas_t *cv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caca_display_t *dp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } caca_driver_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +112,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free (frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->pixmap_s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cucul_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ caca_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->yuv2rgb->dispose (frame->yuv2rgb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _x_freep (&frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->pixmap_s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cucul_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ caca_free_dither (frame->pixmap_s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->pixmap_s = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->format = format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->pixmap_d = (uint8_t *) calloc (height, width * 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- frame->pixmap_s = cucul_create_dither (32, width, height, width * 4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0xff0000, 0xff00, 0xff, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (format == XINE_IMGFMT_YV12) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,7 +222,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->vo_frame.free (&frame->vo_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ 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:#e0ffe0;'>+ frame->pixmap_s, frame->pixmap_d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caca_refresh_display (this->dp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +270,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caca_driver_t *this = (caca_driver_t*) this_gen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->yuv2rgb_factory->dispose (this->yuv2rgb_factory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caca_free_display(this->dp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cucul_free_canvas(this->cv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ caca_free_canvas(this->cv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -309,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->cv = caca_get_canvas(dp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->dp = dp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this->cv = cucul_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this->cv = caca_create_canvas(0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->dp = caca_create_display(this->cv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>