Tue Apr 13 15:09:40 2010 UTC ()
update to 1.1.18.1
This release adds support for WMA Pro and basic support for Quicktime
media links (much better support is present in the 1.2 branch) and has
various fixes for 24-bit FLAC and LPCM, TTA, and AAC in Flash video;
there's also one important fix for DXR3 users, allowing xine-lib to work
with recent versions of the em8300 driver. It also has enhanced support
for metadata (currently Ogg-only).


(drochner)
diff -r1.76 -r1.77 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.63 -r1.64 pkgsrc/multimedia/xine-lib/Makefile.common
diff -r1.65 -r1.66 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.8 -r1.9 pkgsrc/multimedia/xine-lib/patches/patch-ap
cvs diff -r1.76 -r1.77 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2010/01/18 09:59:18 1.76
+++ pkgsrc/multimedia/xine-lib/Makefile 2010/04/13 15:09:40 1.77
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.76 2010/01/18 09:59:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.77 2010/04/13 15:09:40 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
7COMMENT= Multimedia player library 7COMMENT= Multimedia player library
8PKGREVISION= 2 
9 8
10BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 9BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
11 10
12SUBST_CLASSES+= oss 11SUBST_CLASSES+= oss
13SUBST_STAGE.oss= post-patch 12SUBST_STAGE.oss= post-patch
14SUBST_FILES.oss= src/audio_out/audio_oss_out.c 13SUBST_FILES.oss= src/audio_out/audio_oss_out.c
15SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 14SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
16.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 15.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
17SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" 16SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
18.endif 17.endif
19SUBST_MESSAGE.oss= Fixing hardcoded audio device. 18SUBST_MESSAGE.oss= Fixing hardcoded audio device.
20 19
21SUBST_CLASSES+= w32path 20SUBST_CLASSES+= w32path
cvs diff -r1.63 -r1.64 pkgsrc/multimedia/xine-lib/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile.common 2009/12/14 11:47:44 1.63
+++ pkgsrc/multimedia/xine-lib/Makefile.common 2010/04/13 15:09:40 1.64
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile.common,v 1.63 2009/12/14 11:47:44 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.64 2010/04/13 15:09:40 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# used by audio/xine-pulse/Makefile 6# used by audio/xine-pulse/Makefile
7 7
8DISTNAME= xine-lib-1.1.17 8DISTNAME= xine-lib-1.1.18.1
9XINE_PKGNAME= xine-lib-1.1.17 9XINE_PKGNAME= xine-lib-1.1.18.1
10PKGNAME?= ${XINE_PKGNAME} 10PKGNAME?= ${XINE_PKGNAME}
11CATEGORIES?= multimedia 11CATEGORIES?= multimedia
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://xinehq.de/ 16HOMEPAGE= http://xinehq.de/
17 17
18XINE_MOD_DIR_VER= 1.27 18XINE_MOD_DIR_VER= 1.28
19PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} 19PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
20 20
21DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo 21DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo
22PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches 22PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches
23 23
24GNU_CONFIGURE= YES 24GNU_CONFIGURE= YES
25USE_PKGLOCALEDIR= YES 25USE_PKGLOCALEDIR= YES
26USE_LIBTOOL= YES 26USE_LIBTOOL= YES
27LIBTOOL_OVERRIDE= libtool libtool-nofpic 27LIBTOOL_OVERRIDE= libtool libtool-nofpic
28PKGCONFIG_OVERRIDE= misc/libxine.pc.in 28PKGCONFIG_OVERRIDE= misc/libxine.pc.in
29USE_TOOLS+= autoconf gmake msgfmt pkg-config xmkmf perl 29USE_TOOLS+= autoconf gmake msgfmt pkg-config xmkmf perl
30 30
31CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' 31CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
cvs diff -r1.65 -r1.66 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2009/12/09 10:13:03 1.65
+++ pkgsrc/multimedia/xine-lib/distinfo 2010/04/13 15:09:40 1.66
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: distinfo,v 1.65 2009/12/09 10:13:03 drochner Exp $ 1$NetBSD: distinfo,v 1.66 2010/04/13 15:09:40 drochner Exp $
2 2
3SHA1 (xine-lib-1.1.17.tar.bz2) = 2438e66bb571c8a4c981581188376687c42b72c4 3SHA1 (xine-lib-1.1.18.1.tar.bz2) = 783232b6d6e23850a7ac97bf53b2a8bc2e743270
4RMD160 (xine-lib-1.1.17.tar.bz2) = ecac0711431a94c74edaf8f00e696ade5ed0b6ee 4RMD160 (xine-lib-1.1.18.1.tar.bz2) = caa05f16a58bb5ba438b6bd4605cdc2ed91c7201
5Size (xine-lib-1.1.17.tar.bz2) = 7528937 bytes 5Size (xine-lib-1.1.18.1.tar.bz2) = 7530681 bytes
6SHA1 (patch-aa) = 740b3132bcf27886632a6cfe126c3ca493d38c5b 6SHA1 (patch-aa) = 740b3132bcf27886632a6cfe126c3ca493d38c5b
7SHA1 (patch-ab) = eb58985011ed97d61dc18ef648c97477558f2ad8 7SHA1 (patch-ab) = eb58985011ed97d61dc18ef648c97477558f2ad8
8SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 8SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
9SHA1 (patch-ae) = 0c101fd7360ba6abfe9003b8fd6eae4028a3cd2d 9SHA1 (patch-ae) = 0c101fd7360ba6abfe9003b8fd6eae4028a3cd2d
10SHA1 (patch-ag) = 6dee1af3eba997df95d833a2d46331a9e4c46d36 10SHA1 (patch-ag) = 6dee1af3eba997df95d833a2d46331a9e4c46d36
11SHA1 (patch-ah) = 56a0cbb1b5b3c9d1a0e55694ebb82307f82d3198 11SHA1 (patch-ah) = 56a0cbb1b5b3c9d1a0e55694ebb82307f82d3198
12SHA1 (patch-ai) = 4644746f1a5105cdc1e0d20612fc7be467852140 12SHA1 (patch-ai) = 4644746f1a5105cdc1e0d20612fc7be467852140
13SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 13SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
14SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 14SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
15SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a 15SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a
16SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa 16SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa
17SHA1 (patch-ap) = 36f2bab3aa8c7d772960311d7ed71c95df68bf3f 17SHA1 (patch-ap) = f22810c78ac0d1bb7e958ed92fd2ad8a7f889d92
18SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 18SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
19SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 19SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
20SHA1 (patch-aw) = 52520d47bd9b5af313fab9a38e79f24f5c58d37c 20SHA1 (patch-aw) = 52520d47bd9b5af313fab9a38e79f24f5c58d37c
21SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633 21SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633
22SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1 22SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1
23SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 23SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
24SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 24SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
25SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d 25SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d
26SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a 26SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
27SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a 27SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
28SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 28SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
29SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 29SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
30SHA1 (patch-fb) = fe4913041758b6e42f32cd810534199129d61351 30SHA1 (patch-fb) = fe4913041758b6e42f32cd810534199129d61351
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/xine-lib/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/patches/Attic/patch-ap 2009/12/09 10:13:03 1.8
+++ pkgsrc/multimedia/xine-lib/patches/Attic/patch-ap 2010/04/13 15:09:40 1.9
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ap,v 1.8 2009/12/09 10:13:03 drochner Exp $ 1$NetBSD: patch-ap,v 1.9 2010/04/13 15:09:40 drochner Exp $
2 2
3--- src/dxr3/Makefile.am.orig 2009-11-30 22:12:44.000000000 +0100 3--- src/dxr3/Makefile.am.orig 2010-02-24 01:18:20.000000000 +0000
4+++ src/dxr3/Makefile.am 4+++ src/dxr3/Makefile.am
5@@ -17,6 +17,9 @@ endif 5@@ -17,6 +17,9 @@ endif
6 if HAVE_LIBRTE 6 if HAVE_LIBRTE
7 link_rte = -lrte 7 link_rte = -lrte
8 endif 8 endif
9+if HAVE_XINERAMA 9+if HAVE_XINERAMA
10+link_xinerama = -lXinerama 10+link_xinerama = -lXinerama
11+endif 11+endif
12  12
13 xineplug_LTLIBRARIES = $(dxr3_modules) 13 EXTRA_DIST = compat.c
14  14
15@@ -43,7 +46,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \ 15@@ -45,7 +48,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
16 dxr3_scr.c \ 16 dxr3_scr.c \
17 video_out_dxr3.c 17 video_out_dxr3.c
18  18
19-xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm 19-xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
20+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm 20+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
21 xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) 21 xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
22 xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module 22 xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
23  23