[xine-ui] Fix build with libcaca >= 0.99.beta20
commit a058b40765c0cb332736b95f0f5096db23919467
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Dec 17 19:45:11 2021 +0100
Fix build with libcaca >= 0.99.beta20
xine-ui-0.9.13-libcaca_beta20.patch | 40 +++++++++++++++++++++++++++++++++++++
xine-ui.spec | 4 ++++
2 files changed, 44 insertions(+)
---
diff --git a/xine-ui-0.9.13-libcaca_beta20.patch b/xine-ui-0.9.13-libcaca_beta20.patch
new file mode 100644
index 0000000..ae74a42
--- /dev/null
+++ b/xine-ui-0.9.13-libcaca_beta20.patch
@@ -0,0 +1,40 @@
+Fix build with libcaca >= 0.99.beta20.
+--- src/aaui/main.c.orig 2021-12-12 13:49:29.000000000 -0600
++++ src/aaui/main.c 2021-12-17 00:36:53.000000000 -0600
+@@ -69,6 +69,9 @@
+ # include <caca.h>
+ # ifdef CUCUL
+ # include <cucul.h>
++# define caca_canvas_t cucul_canvas_t
++# define caca_create_canvas cucul_create_canvas
++# define caca_free_canvas cucul_free_canvas
+ # endif
+ #endif
+
+@@ -93,7 +96,7 @@
+ aa_context *context;
+ #endif
+ #ifdef CACA
+- cucul_canvas_t *canvas;
++ caca_canvas_t *canvas;
+ caca_display_t *display;
+ #endif
+ char *mrl[1024];
+@@ -828,7 +831,7 @@
+ if(!video_driver_id)
+ video_driver_id = "caca";
+
+- aaxine.canvas = cucul_create_canvas(0, 0);
++ aaxine.canvas = caca_create_canvas(0, 0);
+ aaxine.display = caca_create_display(aaxine.canvas);
+ aaxine.vo_port = xine_open_video_driver(__xineui_global_xine_instance,
+ video_driver_id,
+@@ -1145,7 +1148,7 @@
+ #ifdef CACA
+ if(aaxine.display) {
+ caca_free_display(aaxine.display);
+- cucul_free_canvas(aaxine.canvas);
++ caca_free_canvas(aaxine.canvas);
+ }
+ #endif
+
diff --git a/xine-ui.spec b/xine-ui.spec
index f68d909..6980a1a 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -62,6 +62,8 @@ Patch1: xine-ui-0.99.13-utf8doc.patch
# Fix build on armv7hl, ppc64le and aarch64
# https://sourceforge.net/p/xine/xine-ui/ci/f9a98e02460348ca23ca2f5c2b39e62...
Patch100: xine-ui-0.9.13-Fix_build.patch
+#
https://raw.githubusercontent.com/macports/macports-ports/f925ff1a4f8d59a...
+Patch101: xine-ui-0.9.13-libcaca_beta20.patch
BuildRequires: aalib-devel >= 1.2.0
BuildRequires: autoconf
@@ -132,6 +134,7 @@ It also contains the color ascii art and framebuffer versions.
%patch1 -p1
%patch100 -p1
+%patch101 -p0
# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
# it's provided by libX11-devel => version the dlopen()
@@ -265,6 +268,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%changelog
* Fri Dec 17 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-2
- Fix build on armv7hl, ppc64le and aarch64
+- Fix build with libcaca >= 0.99.beta20
* Mon Dec 13 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-1
- Update to 0.99.13