Added patch to avoid adding extra cflags if user doesn't provide them. Removed cflags filtering, as now it should be less picky with them (and most of them was related to rc versions). Removed -r1 as that seemed to crash pretty badly with some DVDs. With this version it should be possible to have useful backtraces, too.

Package-Manager: portage-2.0.51.22

5 files changed, 34 insertions, 43 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 327d940e8811..5f41cd6a9b5a 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,16 @@
 # 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.245 2005/08/24 22:51:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.246 2005/08/29 10:08:29 flameeyes Exp $
+
+*xine-lib-1.1.0-r2 (29 Aug 2005)
+
+  29 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -xine-lib-1.1.0-r1.ebuild, +xine-lib-1.1.0-r2.ebuild:
+  Added patch to avoid adding extra cflags if user doesn't provide them.
+  Removed cflags filtering, as now it should be less picky with them (and most
+  of them was related to rc versions). Removed -r1 as that seemed to crash
+  pretty badly with some DVDs. With this version it should be possible to have
+  useful backtraces, too.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xine-lib-1.1.0.ebuild:
   stable on ia64
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 793008cce82a..840f30887605 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 6b5209f80c08295cc46aa8953f88945f xine-lib-1_rc6-r2.ebuild 5200
+MD5 d92d5e6566722609bbe28980cfab317f xine-lib-1.1.0-r2.ebuild 5744
 MD5 62bf57d51524f488827371d4395ca2d0 xine-lib-1.1.0.ebuild 7279
-MD5 548e10de9d321dcde2c462afee9530e5 xine-lib-1.1.0-r1.ebuild 6340
+MD5 a9c5c91e9dcb7b5ff318e685e86a4eae ChangeLog 12720
+MD5 31e9c61884e82a9f95e4da1db5642500 xine-lib-1.0.2.ebuild 7466
 MD5 d9c8313a7655ca801a2e893bf8fcfc72 xine-lib-1.0-r2.ebuild 7114
-MD5 6b5209f80c08295cc46aa8953f88945f xine-lib-1_rc6-r2.ebuild 5200
 MD5 0ee055a2a3b1dab3d1e359b36059f2ed xine-lib-1.0.1-r3.ebuild 7463
-MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
-MD5 31e9c61884e82a9f95e4da1db5642500 xine-lib-1.0.2.ebuild 7466
-MD5 bb140b6a5cedec27f3623a4bcdae3163 ChangeLog 12243
 MD5 05ac5f3e87594fa2a81a1a810983c9cf xine-lib-1_rc8-r1.ebuild 5240
+MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
+MD5 57a9f924e9a78a68610f12a3f59435b3 files/digest-xine-lib-1_rc6-r2 139
+MD5 82a083eb7333107ca44f32653d54cb4c files/digest-xine-lib-1.1.0-r2 138
 MD5 b5cff6ac57a1f66ac90f95608a138717 files/digest-xine-lib-1.0.2 137
-MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
-MD5 73353231a7958597249b14903d98aa3f files/digest-xine-lib-1.1.0-r1 137
+MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r2 134
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r1 138
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r3 137
-MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r2 134
-MD5 57a9f924e9a78a68610f12a3f59435b3 files/digest-xine-lib-1_rc6-r2 139
+MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDDPqJBXaUFmZvwyMRAnJhAJ9/KfPSx4l7CKo/DdMxZu9EgGWTbQCffgqE
-/xPbSiix2DRZ3cer9auOy3M=
-=t5MS
+iD8DBQFDEt63j5H05b2HAEkRAtGxAJ4qkSsVVgB6Ehl/oxIMwiJZKHI5BACdGRc0
+ecTq/8uFEfbZUQMhQBofIdw=
+=iT3L
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r1
deleted file mode 100644
index f6244f7b041e..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
-MD5 ef8136cefa3fd6d01a57b6264e38c25f xine-lib-patches-12.tar.bz2 7626
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r2 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r2
new file mode 100644
index 000000000000..5361521e0d2d
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r2
@@ -0,0 +1,2 @@
+MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
+MD5 e0914036f1bb9ad23652d38679e97649 xine-lib-patches-13.tar.bz2 13145
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r2.ebuild
index b0f81b7f5b58..5d0b67e5aa2e 100644
--- a/media-libs/xine-lib/xine-lib-1.1.0-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r2.ebuild
@@ -1,14 +1,14 @@
 # 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.0-r1.ebuild,v 1.2 2005/08/18 19:12:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r2.ebuild,v 1.1 2005/08/29 10:08:29 flameeyes Exp $
 
-inherit eutils flag-o-matic toolchain-funcs libtool
+inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
 # This should normally be empty string, unless a release has a suffix.
 MY_PKG_SUFFIX=""
 MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
-PATCHLEVEL="12"
+PATCHLEVEL="13"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -50,9 +50,9 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 
 DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
 	dev-util/pkgconfig
+    >=sys-devel/automake-1.7
+    >=sys-devel/autoconf-2.59
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${MY_P}
@@ -61,7 +61,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
 
 	elibtoolize
 
@@ -69,12 +69,7 @@ src_unpack() {
 	# autotools
 	export WANT_AUTOCONF=2.5
 	export WANT_AUTOMAKE=1.7
-	aclocal -I m4 || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake -afc || die "automake failed"
-	autoconf || die "autoconf failed"
-
-	libtoolize --copy --force || die "libtoolize failed"
+	M4DIR="m4" eautoreconf
 }
 
 # check for the X11 path for a given library
@@ -87,26 +82,11 @@ get_x11_dir() {
 }
 
 src_compile() {
-	#filter dangerous compile CFLAGS
-	strip-flags
-
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections
 
 	[[ $(tc-arch) == "x86" ]] && has_pic && append-flags -UHAVE_MMX
 
-	if [[ "$(gcc-major-version)" -eq "3" && "$(gcc-minor-version)" -ge "4" ]] || [[ "$(gcc-major-version)" -ge "4" ]]; then
-		# bugs 49509 and 55202
-		append-flags -fno-web -funit-at-a-time
-		filter-flags -fno-unit-at-a-time #55202
-	fi
-
-	# fix build errors with sse2 #49482
-	if [[ $(tc-arch) = "x86" && $(gcc-major-version) -ge 3 ]]; then
-		append-flags -mno-sse2 $(test_flag -mno-sse3)
-		filter-mfpmath sse
-	fi
-
 	local myconf
 
 	# the win32 codec path should ignore $(get_libdir) and always use lib
@@ -191,6 +171,7 @@ src_compile() {
 		$(use_enable esd) \
 		$(use_enable vcd) --without-internal-vcdlibs \
 		--disable-polypaudio \
+		--disable-optimizations \
 		${myconf} \
 		--disable-dependency-tracking || die "econf failed"