version bump

(Portage version: 2.1_pre7-r2)

8 files changed, 42 insertions, 145 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index d8da7a2c4aa9..2a1684ca0e40 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.54 2006/03/29 18:11:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.55 2006/04/01 14:04:18 zaheerm Exp $
+
+*gst-plugins-ffmpeg-0.10.1 (01 Apr 2006)
+
+  01 Apr 2006; <zaheer@gentoo.org> -files/ffmpeg_dos.patch,
+  -gst-plugins-ffmpeg-0.10.0.ebuild, -gst-plugins-ffmpeg-0.10.0-r1.ebuild,
+  +gst-plugins-ffmpeg-0.10.1.ebuild:
+  version bump
 
   29 Mar 2006; Markus Rothe <corsair@gentoo.org>
   gst-plugins-ffmpeg-0.10.0-r1.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 8feadb609ddc..f0e6466d6101 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,12 +1,42 @@
 MD5 1fc56caf03126ce71ceed78af3cc6844 ChangeLog 8054
+RMD160 6ff7efdcc982b9fd37d5aeefb9ac7aa840379904 ChangeLog 8054
+SHA256 6215e9cc034e6bbf31e39599f97957c31eb9f1859787a9c273f24da97c35dbfb ChangeLog 8054
 MD5 4e1e8378e4303b131780f2b9263a6810 files/digest-gst-plugins-ffmpeg-0.10.0 71
+RMD160 5db7d7d18846d676ec5bd4bf25fc2d37194208b6 files/digest-gst-plugins-ffmpeg-0.10.0 71
+SHA256 64f8ab8d10f113d9d4ca79ec3fc7c358cc7a813739a6449166effd1de6e831df files/digest-gst-plugins-ffmpeg-0.10.0 71
 MD5 4e1e8378e4303b131780f2b9263a6810 files/digest-gst-plugins-ffmpeg-0.10.0-r1 71
+RMD160 5db7d7d18846d676ec5bd4bf25fc2d37194208b6 files/digest-gst-plugins-ffmpeg-0.10.0-r1 71
+SHA256 64f8ab8d10f113d9d4ca79ec3fc7c358cc7a813739a6449166effd1de6e831df files/digest-gst-plugins-ffmpeg-0.10.0-r1 71
+MD5 8c7dc824f560834f84afb8d0ede86c4e files/digest-gst-plugins-ffmpeg-0.10.1 259
+RMD160 4736498118d51b30f29fcb639e7bbd994d2f38a8 files/digest-gst-plugins-ffmpeg-0.10.1 259
+SHA256 c34389d9be028e32dbccc2f26095e288bf0be0e0f9f3a3a14f519584c542679d files/digest-gst-plugins-ffmpeg-0.10.1 259
 MD5 7a94bdb0f81ff1bb5d568333930d5b20 files/digest-gst-plugins-ffmpeg-0.8.7-r1 70
+RMD160 0694738755352e6ed2e62935ee169ee180e74a99 files/digest-gst-plugins-ffmpeg-0.8.7-r1 70
+SHA256 b85f9e6536eb78501408279988326f9f8446369eef7f81d23e2ae3c34c6cb655 files/digest-gst-plugins-ffmpeg-0.8.7-r1 70
 MD5 622065818c9e4ae7054c4230d3205d5f files/ffmpeg_dos.patch 3467
+RMD160 27b9d67aba8e3361b243d667dbdca02922f38d12 files/ffmpeg_dos.patch 3467
+SHA256 e76bf74120640437102be9cf1484c2fcc5a56ec4c94a037f0db2f138b37202a9 files/ffmpeg_dos.patch 3467
 MD5 59ef3574f3e888dd1353990d7b3c74ba files/gst-ffmpeg-gcc4.patch 4606
+RMD160 ab7797090e5571a54bb4abac55cd9ffabb2fd3a5 files/gst-ffmpeg-gcc4.patch 4606
+SHA256 98f6a225a49c349eb26dea18eadc3dc4dbd1d0369d9f16c2c6023a36fa96585c files/gst-ffmpeg-gcc4.patch 4606
 MD5 17bff3394f5317a370ff75f983c76d16 files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch 905
+RMD160 8ffab5fa8892bdd00b45a90c9b2beaed00eb4e84 files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch 905
+SHA256 30455208cf8c0ecc1d7ec2df01e4770e28793ffd1d7f3b1efabb474c4f756e7d files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch 905
 MD5 2963f26bd29fbec176f2e0fb08213e75 files/gst-plugins-ffmpeg-0.8.5-gmake.patch 322
+RMD160 e7c91a5daea308d991a2cb36314a10edaaef24db files/gst-plugins-ffmpeg-0.8.5-gmake.patch 322
+SHA256 15d17051747b52e56f0c566e60d694ce86ab0622fb0853b8f3c257742964e0c2 files/gst-plugins-ffmpeg-0.8.5-gmake.patch 322
 MD5 298e5611c718d4b914d4cd4a62eb7f63 gst-plugins-ffmpeg-0.10.0-r1.ebuild 1346
+RMD160 ddfbd1d8d8810e55d9ef270f9af5e9eac78e9bfc gst-plugins-ffmpeg-0.10.0-r1.ebuild 1346
+SHA256 4b06e51acdf685667549e826606fcbc586986694dd6f77e614da2df373845b06 gst-plugins-ffmpeg-0.10.0-r1.ebuild 1346
 MD5 bd9a573e4c8653240c98a7b3cb718210 gst-plugins-ffmpeg-0.10.0.ebuild 1261
+RMD160 1d8a67186bf98c60c7a7564a01536311edffca51 gst-plugins-ffmpeg-0.10.0.ebuild 1261
+SHA256 638df0242e5c54de9a2962a6ad67c6a78b10bc9e280c4a33f402fb4e0179b0bb gst-plugins-ffmpeg-0.10.0.ebuild 1261
+MD5 206b2f1c8dbf46a83484695414652c9b gst-plugins-ffmpeg-0.10.1.ebuild 1309
+RMD160 ebdbf234a20c2de5a15ac427397cb05d9b56a681 gst-plugins-ffmpeg-0.10.1.ebuild 1309
+SHA256 21e10d68d7655b4305652f065d553b63187e3adcd23ca479e437891638af5acf gst-plugins-ffmpeg-0.10.1.ebuild 1309
 MD5 40c7a2ab85c7d6b2389c4b51b187a4f2 gst-plugins-ffmpeg-0.8.7-r1.ebuild 1639
+RMD160 4688893c3f34bf05fecc30c0afb94176e1c28174 gst-plugins-ffmpeg-0.8.7-r1.ebuild 1639
+SHA256 05c087516324008fd3765a2d16747f38ae0a72fba5e34226c3f061a1358f2c71 gst-plugins-ffmpeg-0.8.7-r1.ebuild 1639
 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
+RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d metadata.xml 181
+SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5 metadata.xml 181
diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0
deleted file mode 100644
index d9c6e0974928..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53625b1b21203ff99f115c8ecb0718cd gst-ffmpeg-0.10.0.tar.bz2 2027178
diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0-r1 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0-r1
deleted file mode 100644
index d9c6e0974928..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53625b1b21203ff99f115c8ecb0718cd gst-ffmpeg-0.10.0.tar.bz2 2027178
diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.1 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.1
new file mode 100644
index 000000000000..29fbd260406d
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.10.1
@@ -0,0 +1,3 @@
+MD5 e21aef9a84d67dea9a68c1379781f763 gst-ffmpeg-0.10.1.tar.bz2 2246682
+RMD160 8106a431926c14411ce252f440ec6d1fbdd127d9 gst-ffmpeg-0.10.1.tar.bz2 2246682
+SHA256 a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607 gst-ffmpeg-0.10.1.tar.bz2 2246682
diff --git a/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch b/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch
deleted file mode 100644
index 3425c1f5be83..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: libavcodec/utils.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
-retrieving revision 1.161
-retrieving revision 1.162
-diff -u -r1.161 -r1.162
---- gst-libs/ext/ffmpeg/libavcodec/utils.c	2 Nov 2005 09:18:32 -0000	1.161
-+++ gst-libs/ext/ffmpeg/libavcodec/utils.c	2 Dec 2005 00:12:37 -0000	1.162
-@@ -292,27 +292,10 @@
-         buf->last_pic_num= *picture_number;
-     }else{
-         int h_chroma_shift, v_chroma_shift;
--        int pixel_size;
--        
-+        int pixel_size, size[3];
-+        AVPicture picture;
-+
-         avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
--        
--        switch(s->pix_fmt){
--        case PIX_FMT_RGB555:
--        case PIX_FMT_RGB565:
--        case PIX_FMT_YUV422:
--        case PIX_FMT_UYVY422:
--            pixel_size=2;
--            break;
--        case PIX_FMT_RGB24:
--        case PIX_FMT_BGR24:
--            pixel_size=3;
--            break;
--        case PIX_FMT_RGBA32:
--            pixel_size=4;
--            break;
--        default:
--            pixel_size=1;
--        }
- 
-         avcodec_align_dimensions(s, &w, &h);
-             
-@@ -320,21 +303,39 @@
-             w+= EDGE_WIDTH*2;
-             h+= EDGE_WIDTH*2;
-         }
--        
-+        avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+        pixel_size= picture.linesize[0]*8 / w;
-+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt);
-+        assert(pixel_size>=1);
-+            //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
-+        if(pixel_size == 3*8)
-+            w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift);
-+        else
-+            w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size;
-+        size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+        size[0] = picture.linesize[0] * h;
-+        size[1] -= size[0];
-+        if(picture.data[2])
-+            size[1]= size[2]= size[1]/2;
-+        else
-+            size[2]= 0;
-+
-         buf->last_pic_num= -256*256*256*64;
-+        memset(buf->base, 0, sizeof(buf->base));
-+        memset(buf->data, 0, sizeof(buf->data));
- 
--        for(i=0; i<3; i++){
-+        for(i=0; i<3 && size[i]; i++){
-             const int h_shift= i==0 ? 0 : h_chroma_shift;
-             const int v_shift= i==0 ? 0 : v_chroma_shift;
- 
--            //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
--            buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, STRIDE_ALIGN<<(h_chroma_shift-h_shift)); 
-+            buf->linesize[i]= picture.linesize[i];
- 
--            buf->base[i]= av_malloc((buf->linesize[i]*h>>v_shift)+16); //FIXME 16
-+            buf->base[i]= av_malloc(size[i]+16); //FIXME 16
-             if(buf->base[i]==NULL) return -1;
--            memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift);
--        
--            if(s->flags&CODEC_FLAG_EMU_EDGE)
-+            memset(buf->base[i], 128, size[i]);
-+
-+            // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ...
-+            if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) 
-                 buf->data[i] = buf->base[i];
-             else
-                 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN);
-
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0.ebuild
deleted file mode 100644
index 793b012efa49..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0.ebuild,v 1.1 2005/12/05 20:33:08 zaheerm Exp $
-
-inherit flag-o-matic eutils
-
-MY_PN=${PN/-plugins/}
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-#SLOT=0.10
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=media-libs/gstreamer-0.10.0
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	# Restrictions taken from the mplayer ebuild
-	# See bug #64262 for more info
-	# let's play the filtration game!
-	filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -msse3 -falign-functions -fweb
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-	if use x86 ; then
-		replace-flags -O0 -O2
-		replace-flags -O3 -O2
-	fi
-
-	econf || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-}
-
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.1.ebuild
index 0dccb5e80f4a..28d97ff13f47 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0-r1.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.0-r1.ebuild,v 1.3 2006/03/29 18:11:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.1.ebuild,v 1.1 2006/04/01 14:04:18 zaheerm Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,7 +38,6 @@ src_compile() {
 		replace-flags -O3 -O2
 	fi
 
-	epatch ${FILESDIR}/ffmpeg_dos.patch
 	econf || die
 	emake || die