pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] multimedia/xine-lib: Fix a compilation failure when using C++.



Check
http://sourceforge.net/project/shownotes.php?release_id=619869&group_id=9655
for details about the patches.

Tested by building amarok (without the patch it fails).

PKGREVISION (or whatever it's called) should probably be set as well?
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/distinfo,v
retrieving revision 1.59
diff -u -r1.59 distinfo
--- distinfo    26 Aug 2008 13:12:30 -0000      1.59
+++ distinfo    26 Aug 2008 18:41:17 -0000
@@ -30,3 +30,4 @@
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
+SHA1 (patch-fc) = 4bd113d197e8318ae35c936a88524c0b25cf0201
Index: patches/patch-fc
===================================================================
RCS file: patches/patch-fc
diff -N patches/patch-fc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-fc    26 Aug 2008 18:41:17 -0000
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Darren Salt <linux%youmustbejoking.demon.co.uk@localhost>
+# Date 1218967411 -3600
+# Node ID c35bdd51ce1c67df623d0fcd9f5e856b735e3fcb
+# Parent 1cb8085922eb46a0149ff09ad2d01649dccf09cb
+Fix a compilation failure when using C++.
+
+--- ./src/xine-engine/buffer.h.orig    Sun Aug 17 11:03:27 2008 +0100
++++ ./src/xine-engine/buffer.h Sun Aug 17 11:03:31 2008 +0100
+@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
+ /* convert xine_waveformatex struct from little endian */
+ void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
+ 
+-static inline _x_is_fourcc(void *ptr, void *tag) {
++static inline int _x_is_fourcc(void *ptr, void *tag) {
+   return memcmp(ptr, tag, 4) == 0;
+ }
+ 
+
+
+# HG changeset patch
+# User Darren Salt <linux%youmustbejoking.demon.co.uk@localhost>
+# Date 1219080475 -3600
+# Node ID b3822572afa5d1ccff3dff12e0d085e45ab29985
+# Parent c35bdd51ce1c67df623d0fcd9f5e856b735e3fcb
+Fix another compilation failure when using C++.
+
+--- ./src/xine-engine/buffer.h.orig    Sun Aug 17 11:03:31 2008 +0100
++++ ./src/xine-engine/buffer.h Mon Aug 18 18:27:55 2008 +0100
+@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
+ /* convert xine_waveformatex struct from little endian */
+ void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
+ 
+-static inline int _x_is_fourcc(void *ptr, void *tag) {
++static __inline int _x_is_fourcc(void *ptr, void *tag) {
+   return memcmp(ptr, tag, 4) == 0;
+ }
+ 
+



Home | Main Index | Thread Index | Old Index