Wed Aug 27 17:16:44 2008 UTC ()
add a patch from upstream CVS to make a header usable from C++,
bump PKGREVISION, thanks Rumko for pointing out


(drochner)
diff -r1.64 -r1.65 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.59 -r1.60 pkgsrc/multimedia/xine-lib/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-fc
cvs diff -r1.64 -r1.65 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2008/08/26 13:12:30 1.64
+++ pkgsrc/multimedia/xine-lib/Makefile 2008/08/27 17:16:43 1.65
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.64 2008/08/26 13:12:30 drochner Exp $ 1# $NetBSD: Makefile,v 1.65 2008/08/27 17:16:43 drochner Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
 7PKGREVISION= 1
 8
7COMMENT= Multimedia player library 9COMMENT= Multimedia player library
8 10
9BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 11BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
10 12
11SUBST_CLASSES+= oss 13SUBST_CLASSES+= oss
12SUBST_STAGE.oss= post-patch 14SUBST_STAGE.oss= post-patch
13SUBST_FILES.oss= src/audio_out/audio_oss_out.c 15SUBST_FILES.oss= src/audio_out/audio_oss_out.c
14SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 16SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
15.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 17.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
16SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" 18SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
17.endif 19.endif
18SUBST_MESSAGE.oss= Fixing hardcoded audio device. 20SUBST_MESSAGE.oss= Fixing hardcoded audio device.
19 21
cvs diff -r1.59 -r1.60 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2008/08/26 13:12:30 1.59
+++ pkgsrc/multimedia/xine-lib/distinfo 2008/08/27 17:16:43 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.59 2008/08/26 13:12:30 drochner Exp $ 1$NetBSD: distinfo,v 1.60 2008/08/27 17:16:43 drochner Exp $
2 2
3SHA1 (xine-lib-1.1.15.tar.bz2) = bcb567ea2a11c5f26b2384d5400b8466ea9048c6 3SHA1 (xine-lib-1.1.15.tar.bz2) = bcb567ea2a11c5f26b2384d5400b8466ea9048c6
4RMD160 (xine-lib-1.1.15.tar.bz2) = 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f 4RMD160 (xine-lib-1.1.15.tar.bz2) = 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f
5Size (xine-lib-1.1.15.tar.bz2) = 7478750 bytes 5Size (xine-lib-1.1.15.tar.bz2) = 7478750 bytes
6SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc 6SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
7SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 7SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
8SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 8SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
9SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b 9SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b
10SHA1 (patch-ag) = fa2298e1214a4dbea36526aed27a6e506a069681 10SHA1 (patch-ag) = fa2298e1214a4dbea36526aed27a6e506a069681
11SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f 11SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
12SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc 12SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
13SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 13SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
14SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe 14SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe
@@ -20,13 +20,14 @@ SHA1 (patch-as) = a0a93a256589e87a66eef3 @@ -20,13 +20,14 @@ SHA1 (patch-as) = a0a93a256589e87a66eef3
20SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60 20SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60
21SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc 21SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
22SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48 22SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48
23SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100 23SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100
24SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b 24SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
25SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 25SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
26SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 26SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
27SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d 27SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d
28SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a 28SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
29SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a 29SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
30SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 30SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
31SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 31SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
32SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 32SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
 33SHA1 (patch-fc) = 5960e8326f667191fd7eb64758e08d20f2893458
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-fc
$NetBSD: patch-fc,v 1.1 2008/08/27 17:16:44 drochner Exp $

--- src/xine-engine/buffer.h.orig	2008-07-16 23:01:56.000000000 +0200
+++ src/xine-engine/buffer.h
@@ -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;
 }