summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2008-03-23 13:59:03 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2008-03-23 13:59:03 +0000
commit4a9b60f70e54599c80e74d6944de2c2214ff9a85 (patch)
treed803e845479bf86a6de82dc8c821956543f9a2b8 /multimedia
parent- update to 2.0.5 (diff)
Fix build error with libcaca.
PR: ports/121348 Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Notes
Notes: svn path=/head/; revision=209624
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine/Makefile2
-rw-r--r--multimedia/xine/files/patch-src_aaui_main.c11
2 files changed, 12 insertions, 1 deletions
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 263086b293ed..12c650f74eac 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -100,7 +100,7 @@ CONFIGURE_ARGS+= --disable-lirc
.endif
.if defined(WITH_CACA)
-LIBXINE_VER!= cd ${PORTSDIR}/multimedia/libxine && ${MAKE} -VPORTVERSION
+LIBXINE_VER= 1.20
.if !exists(${LOCALBASE}/lib/xine/plugins/${LIBXINE_VER}/xineplug_vo_out_caca.so)
IGNORE=libxine should be compiled with caca support
.endif
diff --git a/multimedia/xine/files/patch-src_aaui_main.c b/multimedia/xine/files/patch-src_aaui_main.c
new file mode 100644
index 000000000000..cdb936953331
--- /dev/null
+++ b/multimedia/xine/files/patch-src_aaui_main.c
@@ -0,0 +1,11 @@
+--- src/aaui/main.c.orig 2008-03-23 22:52:31.000000000 +0900
++++ src/aaui/main.c 2008-03-23 22:53:32.000000000 +0900
+@@ -593,7 +593,7 @@
+ while ( !caca_get_event(aaxine.display, CACA_EVENT_KEY_PRESS, &ev, 50000) && aaxine.running ) ;
+
+ if (!aaxine.running) return 0;
+- return ev.data.key.ch;
++ return caca_get_event_key_ch(&ev);
+ #endif
+ }
+