Update the patchset, disable win32codecs entirely when not requested. Fix building on FreeBSD.

(Portage version: 2.0.53_rc7)

4 files changed, 14 insertions, 21 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index f9d9b1b8ca3e..713cb55588dd 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.278 2005/11/22 10:34:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.279 2005/11/23 20:14:05 flameeyes Exp $
+
+  23 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.1-r1.ebuild:
+  Update the patchset, disable win32codecs entirely when not requested. Fix
+  building on FreeBSD.
 
   22 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.0.1-r4.ebuild, xine-lib-1.1.0.ebuild, xine-lib-1.1.0-r5.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 3718cbc12459..a66ddd019d32 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 583db25a87caad160e6bea40eff0c2e2 ChangeLog 18793
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
 MD5 9ca4799efa33fefe9faaad047fb3dcbb files/digest-xine-lib-1.1.0-r7 138
 MD5 c67420852e94a93aef8edd92271497e0 files/digest-xine-lib-1.1.1 137
-MD5 648f776c694beba27e3a1115194afb54 files/digest-xine-lib-1.1.1-r1 137
+MD5 674191abd0aa33d2c912468714b7c8d0 files/digest-xine-lib-1.1.1-r1 137
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r2 138
 MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
@@ -15,13 +12,6 @@ MD5 e8e9ff87a88138924d026c3e5c9dd27a xine-lib-1.0.1-r4.ebuild 7482
 MD5 5aa3700abdfbc432b89a5ac75ae9bc03 xine-lib-1.1.0-r5.ebuild 6820
 MD5 36cffcbea10e76a1963c6da1ddd77fb8 xine-lib-1.1.0-r7.ebuild 6827
 MD5 3e7009cff141eff5526219bfc185ece9 xine-lib-1.1.0.ebuild 7254
-MD5 3f81408542d26546cbae742a59a9ea0a xine-lib-1.1.1-r1.ebuild 7305
+MD5 72e593f6b989b1c7b0119585ebeba46d xine-lib-1.1.1-r1.ebuild 7305
 MD5 763b50b7933568c96be6a5b639e2bf69 xine-lib-1.1.1.ebuild 6706
 MD5 8e8e38d54e416b12108a0597f4d0801f xine-lib-1_rc8-r2.ebuild 5288
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDgvRsAiZjviIA2XgRAiUWAKCUwUBLt3+pBckQFxQEXlq4EpWuEgCcCyt8
-L4+AmnDiGsgydlIUhUb+y8M=
-=Wljq
------END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1
index af8b6ca08ac1..3d8048790f86 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.1-r1
@@ -1,2 +1,2 @@
 MD5 b1f42602c776bb93e3cbf127e220cbfd xine-lib-1.1.1.tar.gz 7990031
-MD5 bfadb6c6c06f226f3a3ba4474e393d29 xine-lib-patches-18.tar.bz2 6005
+MD5 3a001cf10c0383c85b95e90f233b0797 xine-lib-patches-19.tar.bz2 7304
diff --git a/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild
index cbb7224e6f5a..b0afc00ac3e2 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild,v 1.10 2005/11/22 10:34:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r1.ebuild,v 1.11 2005/11/23 20:14:05 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -8,12 +8,12 @@ inherit eutils flag-o-matic toolchain-funcs libtool autotools
 MY_PKG_SUFFIX=""
 MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
-PATCHLEVEL="18"
+PATCHLEVEL="19"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -128,10 +128,6 @@ src_compile() {
 
 	local myconf
 
-	# the win32 codec path should ignore $(get_libdir) and always use lib
-	use win32codecs \
-		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32"
-
 	# enable/disable appropiate optimizations on sparc
 	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
 	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
@@ -216,10 +212,12 @@ src_compile() {
 		$(use_enable vcd) --without-internal-vcdlibs \
 		\
 		$(use_enable asf) \
+		$(use_enable win32codecs w32dll) \
 		$(use_with ffmpeg external-ffmpeg) \
 		--disable-polypaudio \
 		--disable-optimizations \
 		${myconf} \
+		--with-w32-path=/usr/lib/win32 \
 		--disable-dependency-tracking || die "econf failed"
 
 		#$(use_with dvdnav external-dvdnav) \