add a patch from upstream CVS to make a header usable from C++, bump PKGREVISION, thanks Rumko for pointing outdiff -r1.64 -r1.65 pkgsrc/multimedia/xine-lib/Makefile
(drochner)
@@ -1,50 +1,52 @@ | @@ -1,50 +1,52 @@ | |||
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 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "Makefile.common" | 5 | .include "Makefile.common" | |
6 | 6 | |||
7 | PKGREVISION= 1 | |||
8 | ||||
7 | COMMENT= Multimedia player library | 9 | COMMENT= Multimedia player library | |
8 | 10 | |||
9 | BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 | 11 | BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 | |
10 | 12 | |||
11 | SUBST_CLASSES+= oss | 13 | SUBST_CLASSES+= oss | |
12 | SUBST_STAGE.oss= post-patch | 14 | SUBST_STAGE.oss= post-patch | |
13 | SUBST_FILES.oss= src/audio_out/audio_oss_out.c | 15 | SUBST_FILES.oss= src/audio_out/audio_oss_out.c | |
14 | SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" | 16 | SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" | |
15 | .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" | 17 | .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" | |
16 | SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" | 18 | SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" | |
17 | .endif | 19 | .endif | |
18 | SUBST_MESSAGE.oss= Fixing hardcoded audio device. | 20 | SUBST_MESSAGE.oss= Fixing hardcoded audio device. | |
19 | 21 | |||
20 | SUBST_CLASSES+= w32path | 22 | SUBST_CLASSES+= w32path | |
21 | SUBST_STAGE.w32path= post-patch | 23 | SUBST_STAGE.w32path= post-patch | |
22 | SUBST_FILES.w32path= src/libw32dll/common.c | 24 | SUBST_FILES.w32path= src/libw32dll/common.c | |
23 | SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," | 25 | SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," | |
24 | SUBST_MESSAGE.w32path= Fixing win32 dll path. | 26 | SUBST_MESSAGE.w32path= Fixing win32 dll path. | |
25 | 27 | |||
26 | # Needed to fix build problems under, at least, NetBSD/amd64. | 28 | # Needed to fix build problems under, at least, NetBSD/amd64. | |
27 | BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 | 29 | BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 | |
28 | 30 | |||
29 | # flac is supported internally; don't know what the plugin is good for | 31 | # flac is supported internally; don't know what the plugin is good for | |
30 | #.include "../../audio/flac/buildlink3.mk" | 32 | #.include "../../audio/flac/buildlink3.mk" | |
31 | .include "../../audio/libvorbis/buildlink3.mk" | 33 | .include "../../audio/libvorbis/buildlink3.mk" | |
32 | .include "../../audio/speex/buildlink3.mk" | 34 | .include "../../audio/speex/buildlink3.mk" | |
33 | .include "../../devel/gettext-lib/buildlink3.mk" | 35 | .include "../../devel/gettext-lib/buildlink3.mk" | |
34 | # these could be options or (better) extra plugin packages | 36 | # these could be options or (better) extra plugin packages | |
35 | #.include "../../devel/SDL/buildlink3.mk" | 37 | #.include "../../devel/SDL/buildlink3.mk" | |
36 | #.include "../../graphics/ImageMagick/buildlink3.mk" | 38 | #.include "../../graphics/ImageMagick/buildlink3.mk" | |
37 | #.include "../../graphics/Mesa/buildlink3.mk" | 39 | #.include "../../graphics/Mesa/buildlink3.mk" | |
38 | CONFIGURE_ARGS+= --disable-opengl | 40 | CONFIGURE_ARGS+= --disable-opengl | |
39 | #.include "../../graphics/aalib/buildlink3.mk" | 41 | #.include "../../graphics/aalib/buildlink3.mk" | |
40 | .include "../../graphics/mng/buildlink3.mk" | 42 | .include "../../graphics/mng/buildlink3.mk" | |
41 | .include "../../graphics/png/buildlink3.mk" | 43 | .include "../../graphics/png/buildlink3.mk" | |
42 | .include "../../misc/libcdio/buildlink3.mk" | 44 | .include "../../misc/libcdio/buildlink3.mk" | |
43 | .include "../../multimedia/libtheora/buildlink3.mk" | 45 | .include "../../multimedia/libtheora/buildlink3.mk" | |
44 | .include "../../sysutils/vcdimager-devel/buildlink3.mk" | 46 | .include "../../sysutils/vcdimager-devel/buildlink3.mk" | |
45 | .include "../../x11/libXext/buildlink3.mk" | 47 | .include "../../x11/libXext/buildlink3.mk" | |
46 | .include "../../x11/libXt/buildlink3.mk" | 48 | .include "../../x11/libXt/buildlink3.mk" | |
47 | .include "../../x11/libX11/buildlink3.mk" | 49 | .include "../../x11/libX11/buildlink3.mk" | |
48 | .include "../../x11/libXinerama/buildlink3.mk" | 50 | .include "../../x11/libXinerama/buildlink3.mk" | |
49 | .include "../../x11/xextproto/buildlink3.mk" | 51 | .include "../../x11/xextproto/buildlink3.mk" | |
50 | .include "../../mk/bsd.pkg.mk" | 52 | .include "../../mk/bsd.pkg.mk" |
@@ -1,32 +1,33 @@ | @@ -1,32 +1,33 @@ | |||
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 | |||
3 | SHA1 (xine-lib-1.1.15.tar.bz2) = bcb567ea2a11c5f26b2384d5400b8466ea9048c6 | 3 | SHA1 (xine-lib-1.1.15.tar.bz2) = bcb567ea2a11c5f26b2384d5400b8466ea9048c6 | |
4 | RMD160 (xine-lib-1.1.15.tar.bz2) = 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f | 4 | RMD160 (xine-lib-1.1.15.tar.bz2) = 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f | |
5 | Size (xine-lib-1.1.15.tar.bz2) = 7478750 bytes | 5 | Size (xine-lib-1.1.15.tar.bz2) = 7478750 bytes | |
6 | SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc | 6 | SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc | |
7 | SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 | 7 | SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 | |
8 | SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 | 8 | SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 | |
9 | SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b | 9 | SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b | |
10 | SHA1 (patch-ag) = fa2298e1214a4dbea36526aed27a6e506a069681 | 10 | SHA1 (patch-ag) = fa2298e1214a4dbea36526aed27a6e506a069681 | |
11 | SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f | 11 | SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f | |
12 | SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc | 12 | SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc | |
13 | SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b | 13 | SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b | |
14 | SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe | 14 | SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe | |
15 | SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a | 15 | SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a | |
16 | SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133 | 16 | SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133 | |
17 | SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100 | 17 | SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100 | |
18 | SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 | 18 | SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 | |
19 | SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 | 19 | SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 | |
20 | SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60 | 20 | SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60 | |
21 | SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc | 21 | SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc | |
22 | SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48 | 22 | SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48 | |
23 | SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100 | 23 | SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100 | |
24 | SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b | 24 | SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b | |
25 | SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 | 25 | SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 | |
26 | SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 | 26 | SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 | |
27 | SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d | 27 | SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d | |
28 | SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a | 28 | SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a | |
29 | SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a | 29 | SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a | |
30 | SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 | 30 | SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 | |
31 | SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c | 31 | SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c | |
32 | SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 | 32 | SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 | |
33 | SHA1 (patch-fc) = 5960e8326f667191fd7eb64758e08d20f2893458 |
$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;
}