update to 1.1.14 changes: -adds Xv port & type selection -improved content type detection for HTTP streams -some DVB and V4L improvements -DVB audio bug fixeddiff -r1.52 -r1.53 pkgsrc/multimedia/xine-lib/Makefile.common
(drochner)
@@ -1,56 +1,56 @@ | @@ -1,56 +1,56 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.52 2008/06/21 15:45:16 drochner Exp $ | 1 | # $NetBSD: Makefile.common,v 1.53 2008/07/17 17:00:35 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | # used by audio/xine-arts/Makefile | 4 | # used by audio/xine-arts/Makefile | |
5 | # used by audio/xine-esound/Makefile | 5 | # used by audio/xine-esound/Makefile | |
6 | 6 | |||
7 | DISTNAME= xine-lib-1.1.13 | 7 | DISTNAME= xine-lib-1.1.14 | |
8 | XINE_PKGNAME= xine-lib-1.1.13 | 8 | XINE_PKGNAME= xine-lib-1.1.14 | |
9 | PKGNAME?= ${XINE_PKGNAME} | 9 | PKGNAME?= ${XINE_PKGNAME} | |
10 | CATEGORIES?= multimedia | 10 | CATEGORIES?= multimedia | |
11 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} | 11 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} | |
12 | EXTRACT_SUFX= .tar.bz2 | 12 | EXTRACT_SUFX= .tar.bz2 | |
13 | 13 | |||
14 | MAINTAINER= pkgsrc-users@NetBSD.org | 14 | MAINTAINER= pkgsrc-users@NetBSD.org | |
15 | HOMEPAGE= http://xinehq.de/ | 15 | HOMEPAGE= http://xinehq.de/ | |
16 | 16 | |||
17 | XINE_LIB_VER= 1.1.13 | 17 | XINE_LIB_VER= 1.1.14 | |
18 | XINE_MOD_DIR_VER= 1.22 | 18 | XINE_MOD_DIR_VER= 1.23 | |
19 | PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} | 19 | PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} | |
20 | PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} | 20 | PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} | |
21 | 21 | |||
22 | DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo | 22 | DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo | |
23 | PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches | 23 | PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches | |
24 | 24 | |||
25 | GNU_CONFIGURE= YES | 25 | GNU_CONFIGURE= YES | |
26 | USE_PKGLOCALEDIR= YES | 26 | USE_PKGLOCALEDIR= YES | |
27 | USE_LIBTOOL= YES | 27 | USE_LIBTOOL= YES | |
28 | LIBTOOL_OVERRIDE= libtool libtool-nofpic | 28 | LIBTOOL_OVERRIDE= libtool libtool-nofpic | |
29 | PKGCONFIG_OVERRIDE= misc/libxine.pc.in | 29 | PKGCONFIG_OVERRIDE= misc/libxine.pc.in | |
30 | USE_TOOLS+= autoconf gmake msgfmt pkg-config | 30 | USE_TOOLS+= autoconf gmake msgfmt pkg-config | |
31 | 31 | |||
32 | CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' | 32 | CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' | |
33 | CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest | 33 | CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest | |
34 | CONFIGURE_ENV+= have_libpng="yes" | 34 | CONFIGURE_ENV+= have_libpng="yes" | |
35 | CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" | 35 | CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" | |
36 | CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" | 36 | CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" | |
37 | PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" | 37 | PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" | |
38 | 38 | |||
39 | .include "../../mk/bsd.prefs.mk" | 39 | .include "../../mk/bsd.prefs.mk" | |
40 | 40 | |||
41 | PLIST_VARS+= xv | 41 | PLIST_VARS+= xv | |
42 | .if ${X11_TYPE} == "modular" | 42 | .if ${X11_TYPE} == "modular" | |
43 | . include "../../x11/libXv/buildlink3.mk" | 43 | . include "../../x11/libXv/buildlink3.mk" | |
44 | .endif | 44 | .endif | |
45 | .if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/libXv.so) | 45 | .if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/libXv.so) | |
46 | CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib' | 46 | CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib' | |
47 | PLIST.xv= yes | 47 | PLIST.xv= yes | |
48 | .endif | 48 | .endif | |
49 | 49 | |||
50 | pre-configure: | 50 | pre-configure: | |
51 | cd ${WRKSRC} && autoconf | 51 | cd ${WRKSRC} && autoconf | |
52 | 52 | |||
53 | .include "../../converters/libiconv/buildlink3.mk" | 53 | .include "../../converters/libiconv/buildlink3.mk" | |
54 | .include "../../graphics/freetype2/buildlink3.mk" | 54 | .include "../../graphics/freetype2/buildlink3.mk" | |
55 | .include "../../mk/oss.buildlink3.mk" | 55 | .include "../../mk/oss.buildlink3.mk" | |
56 | .include "../../mk/pthread.buildlink3.mk" | 56 | .include "../../mk/pthread.buildlink3.mk" |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | $NetBSD: distinfo,v 1.57 2008/06/21 15:45:16 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.58 2008/07/17 17:00:35 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (xine-lib-1.1.13.tar.bz2) = d1f4cf0511067a554dbe243468311ebeb3bbdce4 | 3 | SHA1 (xine-lib-1.1.14.tar.bz2) = 8dfe071865ebdb0cfe2f5ce287485bb5ed7c6978 | |
4 | RMD160 (xine-lib-1.1.13.tar.bz2) = a2ffcb43890ec525115e62f796dec6e835ceb4d5 | 4 | RMD160 (xine-lib-1.1.14.tar.bz2) = 518b4e90d55971154d78af71f6987f0930ed937c | |
5 | Size (xine-lib-1.1.13.tar.bz2) = 7444294 bytes | 5 | Size (xine-lib-1.1.14.tar.bz2) = 7455590 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) = 9e3ad86a7d7f32e58de157fa37141138af10838e | 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 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-al,v 1.6 2006/06/26 17:13:11 wiz Exp $ | 1 | $NetBSD: patch-al,v 1.7 2008/07/17 17:00:35 drochner Exp $ | |
2 | 2 | |||
3 | --- src/xine-utils/xineutils.h.orig 2005-10-08 13:57:49.000000000 +0000 | 3 | --- src/xine-utils/xineutils.h.orig 2008-06-25 15:04:09.000000000 +0200 | |
4 | +++ src/xine-utils/xineutils.h | 4 | +++ src/xine-utils/xineutils.h | |
5 | @@ -679,7 +679,13 @@ void xine_strdupa(char *dest, char *src) | 5 | @@ -673,7 +673,13 @@ void xine_strdupa(char *dest, char *src) | |
6 | 6 | |||
7 | /* compatibility macros */ | 7 | /* compatibility macros */ | |
8 | #define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT)) | 8 | #define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT)) | |
9 | + | 9 | + | |
10 | +#ifndef HAVE_STRSEP | 10 | +#ifndef HAVE_STRSEP | |
11 | +#define strsep(STRINGP, DELIM) _xine_private_strsep((STRINGP), (DELIM)) | 11 | +#define strsep(STRINGP, DELIM) _xine_private_strsep((STRINGP), (DELIM)) | |
12 | +char *_xine_private_strsep(char **stringp, const char *delim); | 12 | +char *_xine_private_strsep(char **stringp, const char *delim); | |
13 | +#endif | 13 | +#endif | |
14 | #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM)) | 14 | #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM)) | |
15 | + | 15 | + | |
16 | #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX)) | 16 | #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX)) | |
17 | 17 | |||
18 | /* | 18 | /** |