mark 0.8.2 x86, rev bump with minor fixes

6 files changed, 130 insertions, 7 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index d2544d1a1f39..bd1167fca20e 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.10 2004/10/30 22:09:39 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.11 2004/11/28 23:32:28 foser Exp $
+
+*gst-plugins-ffmpeg-0.8.2-r1 (29 Nov 2004)
+
+  29 Nov 2004; foser <foser@gentoo.org> gst-plugins-ffmpeg-0.8.2-r1.ebuild :
+  Add patch to fix aspect ratio issues with some movies
+  http://bugzilla.gnome.org/show_bug.cgi?id=159755
+  Filter more flags to fix bugs like #64262
 
   30 Oct 2004; Travis Tilley <lv@gentoo.org> gst-plugins-ffmpeg-0.8.1.ebuild:
   stable on amd64
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 4d43fc084fa0..54f9188da81f 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,8 +1,11 @@
-MD5 8bc67806e51a18e5538d3b92947df639 ChangeLog 1482
-MD5 7656b8141a9dafd7103958ece9272f1e gst-plugins-ffmpeg-0.8.0.ebuild 1043
+MD5 4d390ded0a6222bece88f135be534932 gst-plugins-ffmpeg-0.8.2.ebuild 1171
 MD5 ded71f2c6e4a988773764f333835a64e gst-plugins-ffmpeg-0.8.1.ebuild 1090
+MD5 a065e6148b263a9e2e79150fabd6fdd2 gst-plugins-ffmpeg-0.8.2-r1.ebuild 1337
+MD5 7656b8141a9dafd7103958ece9272f1e gst-plugins-ffmpeg-0.8.0.ebuild 1043
+MD5 8bc67806e51a18e5538d3b92947df639 ChangeLog 1482
 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
-MD5 4d390ded0a6222bece88f135be534932 gst-plugins-ffmpeg-0.8.2.ebuild 1171
 MD5 08218449f7831982743033aa8a752314 files/digest-gst-plugins-ffmpeg-0.8.0 70
 MD5 0b33ba99748b99f1f1f0398c89c9bd41 files/digest-gst-plugins-ffmpeg-0.8.1 70
 MD5 bee099502f714662c0dc1be53cd1b8aa files/digest-gst-plugins-ffmpeg-0.8.2 70
+MD5 bee099502f714662c0dc1be53cd1b8aa files/digest-gst-plugins-ffmpeg-0.8.2-r1 70
+MD5 6fc50f636b3cbafacb7f26fc99a27fc9 files/gst-plugins-ffmpeg-0.8.2-par_fixes.patch 2144
diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.2-r1 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.2-r1
new file mode 100644
index 000000000000..b07f7dc0fa1f
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.2-r1
@@ -0,0 +1 @@
+MD5 834270830aa7a4c07485d5185b77af17 gst-ffmpeg-0.8.2.tar.bz2 1650219
diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.2-par_fixes.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.2-par_fixes.patch
new file mode 100644
index 000000000000..54be8b104e7d
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.2-par_fixes.patch
@@ -0,0 +1,36 @@
+--- gst-ffmpeg-0.8.2/ext/ffmpeg/gstffmpegdec.c	2004-10-09 18:22:07.000000000 +0200
++++ gst-ffmpeg-0.8.2.patched/ext/ffmpeg/gstffmpegdec.c	2004-11-28 20:45:36.290598936 +0100
+@@ -476,14 +476,26 @@
+         caps = gst_ffmpeg_codectype_to_caps (oclass->in_plugin->type,
+             ffmpegdec->context);
+ 
+-        /* add in pixel-aspect-ratio if we have it */
+-        if (caps && ffmpegdec->par) {
+-          GST_DEBUG_OBJECT (ffmpegdec, "setting pixel-aspect-ratio");
+-	  gst_structure_set (gst_caps_get_structure (caps, 0),
+-              "pixel-aspect-ratio", GST_TYPE_FRACTION,
+-              gst_value_get_fraction_numerator (ffmpegdec->par),
+-              gst_value_get_fraction_denominator (ffmpegdec->par),
++        /* add in pixel-aspect-ratio if we have it,
++	 * prefer ffmpeg par over sink par 
++	 */
++       if (caps) {
++         if (ffmpegdec->context->sample_aspect_ratio.num &&
++		ffmpegdec->context->sample_aspect_ratio.den) {
++            GST_DEBUG ("setting ffmpeg provided pixel-aspect-ratio");
++	    gst_structure_set (gst_caps_get_structure (caps, 0),
++               "pixel-aspect-ratio", GST_TYPE_FRACTION,
++               ffmpegdec->context->sample_aspect_ratio.num,
++               ffmpegdec->context->sample_aspect_ratio.den,
++	       NULL);
++	  }
++	  else if (ffmpegdec->par) {
++            GST_DEBUG ("passing on pixel-aspect-ratio from sink");
++	    gst_structure_set (gst_caps_get_structure (caps, 0),
++              gst_value_get_fraction_numerator (ffmpegdec->context->sample_aspect_ratio.num),
++              gst_value_get_fraction_denominator (ffmpegdec->context->sample_aspect_ratio.den),
+               NULL);
++	  }
+         }
+         if (caps == NULL ||
+             !gst_pad_set_explicit_caps (ffmpegdec->srcpad, caps)) {
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..542cf08b1be4
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 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.8.2-r1.ebuild,v 1.1 2004/11/28 23:32:28 foser Exp $
+
+inherit flag-o-matic
+
+MY_PN=${PN/-plugins/}
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+LICENSE="GPL-2"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=media-libs/gstreamer-0.8
+	dev-util/pkgconfig"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Use ffmpeg pixel-aspect-ratio if available
+	epatch ${FILESDIR}/${P}-par_fixes.patch
+
+}
+
+src_compile() {
+
+	# just a few random flags, see #56075
+	filter-flags "-Os" "-O3" "-fforce-addr"
+	strip-flags
+
+	econf || die
+	emake || die
+
+}
+
+src_install() {
+
+	# einstall || die
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+
+}
+
+# ripped from the gst-plugins eclass
+update_registry() {
+
+	einfo "Updating gstreamer plugins registry for gstreamer ${SLOT}..."
+	gst-register-${SLOT}
+
+}
+
+pkg_postinst() {
+
+	update_registry
+
+}
+
+pkg_postrm() {
+
+	update_registry
+
+}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2.ebuild
index c67280072241..5d4f0afb1a82 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.2.ebuild,v 1.1 2004/10/11 11:23:41 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2.ebuild,v 1.2 2004/11/28 23:32:28 foser Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,8 @@ DEPEND=">=media-libs/gstreamer-0.8
 src_compile() {
 
 	# just a few random flags, see #56075
-	filter-flags "-Os" "-fforce-addr"
+	filter-flags "-Os" "-O3" "-fforce-addr"
+	strip-flags
 
 	econf || die
 	emake || die