Version bump thanks to flameeyes in bug 175048

(Portage version: 2.1.2-r12)

5 files changed, 14 insertions, 49 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 4d562541370f..edc6a6568524 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.466 2007/04/16 16:09:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.467 2007/04/18 10:16:36 genstef Exp $
+
+*xine-lib-1.1.6 (18 Apr 2007)
+
+  18 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/xine-lib-cdda-fix.patch, -xine-lib-1.1.5.ebuild,
+  +xine-lib-1.1.6.ebuild:
+  Version bump thanks to flameeyes in bug 175048
 
   16 Apr 2007; Raúl Porcel <armin76@gentoo.org> xine-lib-1.1.4-r2.ebuild:
   ia64 stable wrt bug 170208
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.5 b/media-libs/xine-lib/files/digest-xine-lib-1.1.5
deleted file mode 100644
index 7dbc0c94a6e0..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fa9ffa381a9b4579fd884700bab5c64 xine-lib-1.1.5.tar.bz2 7290020
-RMD160 24a4121badbff6bfc7c6bd2610dbf8d22b4334fc xine-lib-1.1.5.tar.bz2 7290020
-SHA256 7bd3cb5ea274b79d60d2ce2d98a142cbc8267fe9a153b80e9c1eef1e8539544d xine-lib-1.1.5.tar.bz2 7290020
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.6 b/media-libs/xine-lib/files/digest-xine-lib-1.1.6
new file mode 100644
index 000000000000..97793ba073ab
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.6
@@ -0,0 +1,3 @@
+MD5 9dc1a4f81ccd644e4c0e294ff35fb76d xine-lib-1.1.6.tar.bz2 7293043
+RMD160 938be4d24a41439428162dde0f1d0dd59a4b376a xine-lib-1.1.6.tar.bz2 7293043
+SHA256 ead4cd9b9db554e0a7473670dd666df7a43f87945ee701419a2ca258cbc31a3a xine-lib-1.1.6.tar.bz2 7293043
diff --git a/media-libs/xine-lib/files/xine-lib-cdda-fix.patch b/media-libs/xine-lib/files/xine-lib-cdda-fix.patch
deleted file mode 100644
index a289da04e39d..000000000000
--- a/media-libs/xine-lib/files/xine-lib-cdda-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
-# Date 1176501310 -7200
-# Node ID 16e2e0741d34d2b8b47a835076aa1c15637d4964
-# Parent 7d3dcb71e309c19196e2027ba418fdb17f1d6c8d
-Use the stream's audio_fifo as it hasn't been reported on the demuxer's instance yet.
-
---- a/src/demuxers/demux_ac3.c	Thu Apr 12 18:02:38 2007 +0200
-+++ b/src/demuxers/demux_ac3.c	Fri Apr 13 23:55:10 2007 +0200
-@@ -138,7 +138,7 @@ static int open_ac3_file(demux_ac3_t *th
-   if (blocksize) {
-     this->input->seek(this->input, 0, SEEK_SET);
-     buf_element_t *buf = this->input->read_block(this->input,
--						 this->audio_fifo,
-+						 this->stream->audio_fifo,
- 						 blocksize);
-     this->input->seek(this->input, 0, SEEK_SET);
- 
---- a/src/demuxers/demux_dts.c	Thu Apr 12 18:02:38 2007 +0200
-+++ b/src/demuxers/demux_dts.c	Fri Apr 13 23:55:10 2007 +0200
-@@ -86,9 +86,9 @@ static int open_dts_file(demux_dts_t *th
- 
-   blocksize = this->input->get_blocksize(this->input);
-   if (blocksize) {
--    this->input->seek(this->input, 0, SEEK_SET);
-+    //    this->input->seek(this->input, 0, SEEK_SET);
-     buf_element_t *buf = this->input->read_block(this->input,
--						 this->audio_fifo,
-+						 this->stream->audio_fifo,
- 						 blocksize);
-     this->input->seek(this->input, 0, SEEK_SET);
- 
-
diff --git a/media-libs/xine-lib/xine-lib-1.1.5.ebuild b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
index dbebd3629cdd..8121e9b99c39 100644
--- a/media-libs/xine-lib/xine-lib-1.1.5.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.5.ebuild,v 1.4 2007/04/14 17:54:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.6.ebuild,v 1.1 2007/04/18 10:16:36 genstef Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -85,12 +85,6 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/xine-lib-cdda-fix.patch
-}
-
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections
@@ -103,10 +97,6 @@ src_compile() {
 		is-flag -O? || append-flags -O2
 	fi
 
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
 	local myconf
 
 	# enable/disable appropiate optimizations on sparc
@@ -172,6 +162,8 @@ src_compile() {
 		\
 		$(use_enable mmap) \
 		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		\
+		$(use_enable debug) \
 		--enable-asf \
 		--with-external-ffmpeg \
 		--disable-optimizations \