Version bump thanks to flameeyes in bug 175048

Package-Manager: portage-2.1.2-r12

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 4d562541370f4d0cbeeca446ce5ae46365f1252a..edc6a6568524c660d55bebe135822f40fcf104a6 100644 (file)
--- 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/Manifest b/media-libs/xine-lib/Manifest
index c543afdbb9f936654c0969130f9877ed5ae832ca..423381d6cfd3e12fab62028d125fe54478dcfd57 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,15 +2,11 @@ AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83
 MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
-AUX xine-lib-cdda-fix.patch 1303 RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb SHA1 1cab891c9c533468ac0b6ffbb193f5a07c51a0af SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886
-MD5 447c61bea8e82ab50977620fa122d99d files/xine-lib-cdda-fix.patch 1303
-RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb files/xine-lib-cdda-fix.patch 1303
-SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886 files/xine-lib-cdda-fix.patch 1303
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
 DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb
 DIST xine-lib-1.1.4.tar.bz2 6997816 RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 SHA1 ee3496a3de8d9935ca23ff1fae3677a61ce1cb21 SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23
-DIST xine-lib-1.1.5.tar.bz2 7290020 RMD160 24a4121badbff6bfc7c6bd2610dbf8d22b4334fc SHA1 6eb8bf3c59b3373a2ec6530d5c0537bbe35007bc SHA256 7bd3cb5ea274b79d60d2ce2d98a142cbc8267fe9a153b80e9c1eef1e8539544d
+DIST xine-lib-1.1.6.tar.bz2 7293043 RMD160 938be4d24a41439428162dde0f1d0dd59a4b376a SHA1 f7c865d08991be875eb986dab2640e788946e426 SHA256 ead4cd9b9db554e0a7473670dd666df7a43f87945ee701419a2ca258cbc31a3a
 DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2
 DIST xine-lib-patches-63.tar.bz2 22862 RMD160 1aa3c0541e9d739968f6f62c09567caa2a646414 SHA1 ac1a6a40c8b783c40d823905e8db69f5139784d4 SHA256 7e7a137a27605addad5c4e96c46984293c5febdfa08eec976600be8b206448f6
 DIST xine-lib-patches-64.tar.bz2 23578 RMD160 6a4272d82c7d8de004e71e2991e0cdf66ab833c2 SHA1 d7a059d487e3d05af687f501e3394ee625b5f295 SHA256 d5fcf477e59d6963235c6d6f682d887e21f849bc76441d915152b83f93d44884
@@ -38,14 +34,14 @@ EBUILD xine-lib-1.1.4.ebuild 5318 RMD160 7af0795d3c6f32c248c31926d4370d8cef4b584
 MD5 3b6b716101c2fcd780dfd3dc77a28bfe xine-lib-1.1.4.ebuild 5318
 RMD160 7af0795d3c6f32c248c31926d4370d8cef4b5840 xine-lib-1.1.4.ebuild 5318
 SHA256 ca3550b53b700a3d8dc48dfe97c87ffe550299783e44eae41be41da6bafc77eb xine-lib-1.1.4.ebuild 5318
-EBUILD xine-lib-1.1.5.ebuild 5761 RMD160 5b2b45c0732e7e7ccbacd7df343e92c371873f46 SHA1 5013ab0af7f626a8e1614ba38283fba29dc930b9 SHA256 490972a552e4740c9d87f450d6e82ff73f7276cfb3226a7f6587d6fbd34e9129
-MD5 26c8696c90a51abbe9acb7777ffa31a9 xine-lib-1.1.5.ebuild 5761
-RMD160 5b2b45c0732e7e7ccbacd7df343e92c371873f46 xine-lib-1.1.5.ebuild 5761
-SHA256 490972a552e4740c9d87f450d6e82ff73f7276cfb3226a7f6587d6fbd34e9129 xine-lib-1.1.5.ebuild 5761
-MISC ChangeLog 51154 RMD160 7339c24914d6da1ab78a8f26401ed8886420e5ec SHA1 01eb1cb31a73f3cabf098383fc9e649e9c3420ab SHA256 3c90fd026ecd0f828a30d37031f92c879cf3b438dcdae7e92cf0fa8e4aefc5b5
-MD5 db12062b37ffbf5981cbb34ec295eff5 ChangeLog 51154
-RMD160 7339c24914d6da1ab78a8f26401ed8886420e5ec ChangeLog 51154
-SHA256 3c90fd026ecd0f828a30d37031f92c879cf3b438dcdae7e92cf0fa8e4aefc5b5 ChangeLog 51154
+EBUILD xine-lib-1.1.6.ebuild 5556 RMD160 44f16a04fc701cc15b4aa6d7ec243e0e41559ef7 SHA1 9a0cd921dc7fbb1a68c9644ee173eed1bef40d70 SHA256 06eac21bd0fbdee5f3c0835c8bb5787fa61a4089d8ffc4c1dc21fef5c240a8e9
+MD5 787368fc7e56e4e2475d482024c105d8 xine-lib-1.1.6.ebuild 5556
+RMD160 44f16a04fc701cc15b4aa6d7ec243e0e41559ef7 xine-lib-1.1.6.ebuild 5556
+SHA256 06eac21bd0fbdee5f3c0835c8bb5787fa61a4089d8ffc4c1dc21fef5c240a8e9 xine-lib-1.1.6.ebuild 5556
+MISC ChangeLog 51372 RMD160 34bfc95a12ca8d46bed78d15b02b3e9e1f09e5da SHA1 a9a6167f17d21eb831ac57496aa60fb5a7be4699 SHA256 35531e84b23691f744a5aebf8cbca3b9a1ef7d60915d68faa20b18642d8d0eda
+MD5 dfb548c02310ad476d0fe9ef421c9c21 ChangeLog 51372
+RMD160 34bfc95a12ca8d46bed78d15b02b3e9e1f09e5da ChangeLog 51372
+SHA256 35531e84b23691f744a5aebf8cbca3b9a1ef7d60915d68faa20b18642d8d0eda ChangeLog 51372
 MISC metadata.xml 306 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 SHA1 1b6a82c8dbb60a55051e663290b1fa4fbd0cdb2e SHA256 cc2402ccd44aff7c94a0865c12d43a8250e8277253395924cb145fe99a6fb560
 MD5 baed93b1b1c2bcbdce8ae48aa25df8fd metadata.xml 306
 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 metadata.xml 306
@@ -68,6 +64,6 @@ SHA256 360727ef64b680578258f7c715c18cd8084ab53bc5ceb3973f8ad63bd6083a4c files/di
 MD5 a772cb8123385cb3185e9b3f19b5906a files/digest-xine-lib-1.1.4-r2 512
 RMD160 180e6a88dda4bf1ef40d2edad8567aed17b43383 files/digest-xine-lib-1.1.4-r2 512
 SHA256 360727ef64b680578258f7c715c18cd8084ab53bc5ceb3973f8ad63bd6083a4c files/digest-xine-lib-1.1.4-r2 512
-MD5 c36456626d060f165bea50afde6de2cd files/digest-xine-lib-1.1.5 250
-RMD160 f68033e1eb7613bca8b3943a1b1855b8d0de3515 files/digest-xine-lib-1.1.5 250
-SHA256 3b0a76eac54645c4a357a0f5273fcd8d3c7105b1f185c64d2fac5d757e03f5e7 files/digest-xine-lib-1.1.5 250
+MD5 d62713c2df2be0b36d29a94c7f67388b files/digest-xine-lib-1.1.6 250
+RMD160 cc64e0b36804908d8eb66dbcc7d64503835e29a9 files/digest-xine-lib-1.1.6 250
+SHA256 816acc43865c717293aeeac4d9d2d458a0a9c2a34d1fb0bac0eadce7ff2aab18 files/digest-xine-lib-1.1.6 250

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 (file)
index 7dbc0c9..0000000
--- 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 (file)
index 0000000..97793ba
--- /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 (file)
index a289da0..0000000
--- 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
similarity index 95%
rename from media-libs/xine-lib/xine-lib-1.1.5.ebuild
rename to media-libs/xine-lib/xine-lib-1.1.6.ebuild
index dbebd3629cdd1b77bee63d96d818056b59f3bb89..8121e9b99c3910bb41f27130ea62874132dfa289 100644 (file)
--- 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 \