fix iso mpeg4 inside avi

Package-Manager: portage-2.0.51.19

5 files changed, 157 insertions, 31 deletions

diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog
index 42fef736d01d..e8e6ff1f7407 100644
--- a/media-libs/gst-plugins/ChangeLog
+++ b/media-libs/gst-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gst-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.110 2005/06/12 18:45:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.111 2005/06/13 21:32:42 zaheerm Exp $
+
+*gst-plugins-0.8.9-r2 (13 Jun 2005)
+
+  13 Jun 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/gst-plugins-0.8.9-riffmedia-isompeg4.patch,
+  +gst-plugins-0.8.9-r2.ebuild:
+  add fix to support ISO mpeg4 in avi's
 
   12 Jun 2005; Olivier Crête <tester@gentoo.org>
   gst-plugins-0.8.8-r2.ebuild:
diff --git a/media-libs/gst-plugins/Manifest b/media-libs/gst-plugins/Manifest
index 07c92fcfc5a4..20a6b9a314e5 100644
--- a/media-libs/gst-plugins/Manifest
+++ b/media-libs/gst-plugins/Manifest
@@ -1,40 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4d7330ab641498e301c9b0697bc9c8bf gst-plugins-0.8.1.ebuild 2253
-MD5 3e6a724afd82f75a69f551d4b976303b gst-plugins-0.8.3.ebuild 1869
-MD5 d7cacbfacbedd2429f72181c730b6ee8 gst-plugins-0.8.2.ebuild 1869
-MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
 MD5 d8d8df9fa1d27db4e838fe5f88469c37 gst-plugins-0.8.7.ebuild 2013
+MD5 d7cacbfacbedd2429f72181c730b6ee8 gst-plugins-0.8.2.ebuild 1869
+MD5 397081e39ecc606a3e7afe165c61edab gst-plugins-0.8.9-r2.ebuild 2273
+MD5 74c4a47725402e2c92df0ccb750b2964 gst-plugins-0.8.9.ebuild 2044
+MD5 731e08818bd3e32b8df68bd3cdb6918e gst-plugins-0.8.8-r2.ebuild 2163
+MD5 4d7330ab641498e301c9b0697bc9c8bf gst-plugins-0.8.1.ebuild 2253
+MD5 2ec06266e92d24e81e2c3da8f33e7e82 gst-plugins-0.8.9-r1.ebuild 2163
 MD5 cc26e45cd840601105c37359fc434a8c gst-plugins-0.8.5-r1.ebuild 2020
-MD5 56ebc14249f3f09d600f305d7d630bfa ChangeLog 15013
+MD5 070e460bd9189fee7dd79b165fe072fe ChangeLog 15233
 MD5 f7cda973aab228bdbbf67f9867e287d4 gst-plugins-0.8.8.ebuild 1933
+MD5 3e6a724afd82f75a69f551d4b976303b gst-plugins-0.8.3.ebuild 1869
+MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
 MD5 d4dde2cb238164f6f0e2a4b64ae52daa gst-plugins-0.8.8-r1.ebuild 2037
-MD5 731e08818bd3e32b8df68bd3cdb6918e gst-plugins-0.8.8-r2.ebuild 2163
-MD5 2ec06266e92d24e81e2c3da8f33e7e82 gst-plugins-0.8.9-r1.ebuild 2163
-MD5 74c4a47725402e2c92df0ccb750b2964 gst-plugins-0.8.9.ebuild 2044
 MD5 acf565d7ba42d81f95f66ad754ab8be9 files/digest-gst-plugins-0.8.5-r1 71
-MD5 a440c49c40c858da65d86ca58adc280d files/gst-plugins-0.8.7-gcc2.patch 1565
-MD5 b34b0c2aff88ed12404f38ecc09f44f0 files/digest-gst-plugins-0.8.3 71
+MD5 33cfc77852e050bbb91b003695c91131 files/digest-gst-plugins-0.8.8-r1 71
+MD5 33cfc77852e050bbb91b003695c91131 files/digest-gst-plugins-0.8.8-r2 71
+MD5 c6551068a03bbc459e7e798d919c744a files/digest-gst-plugins-0.8.9-r1 71
+MD5 c6551068a03bbc459e7e798d919c744a files/digest-gst-plugins-0.8.9-r2 71
+MD5 08ef8415d9778f702053aa3e0090404b files/gst-plugins-0.8.9-ximagefix.patch 2525
+MD5 d454a981aba7bfc51b76556d18ef0357 files/digest-gst-plugins-0.8.1 71
 MD5 fdc36508749cec2850c94b4bff5cc0a2 files/digest-gst-plugins-0.8.2 71
-MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
-MD5 c6e69d419de61401529c6e3000271e1b files/gst-plugins-0.8.0-audioconvert_stereo.patch 4437
-MD5 c6551068a03bbc459e7e798d919c744a files/digest-gst-plugins-0.8.9 71
+MD5 b34b0c2aff88ed12404f38ecc09f44f0 files/digest-gst-plugins-0.8.3 71
 MD5 1d2b17e15b2072757c3db8f184b7d174 files/digest-gst-plugins-0.8.7 71
-MD5 187dd1210be84f747699a2d2bd11fd0b files/gst-plugins-0.8.5-tcp.patch 1059
-MD5 d454a981aba7bfc51b76556d18ef0357 files/digest-gst-plugins-0.8.1 71
 MD5 33cfc77852e050bbb91b003695c91131 files/digest-gst-plugins-0.8.8 71
-MD5 33cfc77852e050bbb91b003695c91131 files/digest-gst-plugins-0.8.8-r1 71
-MD5 33cfc77852e050bbb91b003695c91131 files/digest-gst-plugins-0.8.8-r2 71
+MD5 c6551068a03bbc459e7e798d919c744a files/digest-gst-plugins-0.8.9 71
+MD5 a440c49c40c858da65d86ca58adc280d files/gst-plugins-0.8.7-gcc2.patch 1565
+MD5 62a6ceb0d791f58680a8260b121f06ba files/gst-plugins-0.8.9-qtdemux-fixrawpcm.patch 698
+MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
+MD5 5f3b15884236441972571887125d0a48 files/gst-plugins-0.8.9-riffmedia-isompeg4.patch 1178
 MD5 047909fa0e548bb37041ef3b534f7a30 files/gst-plugins-0.8.8-gstplaybin_subfont.patch 3927
+MD5 187dd1210be84f747699a2d2bd11fd0b files/gst-plugins-0.8.5-tcp.patch 1059
+MD5 c6e69d419de61401529c6e3000271e1b files/gst-plugins-0.8.0-audioconvert_stereo.patch 4437
 MD5 2a2cbe69a3c199ac03a66ae707700d70 files/gst-plugins-0.8.8-qtdemux.diff.gz 5379
-MD5 c6551068a03bbc459e7e798d919c744a files/digest-gst-plugins-0.8.9-r1 71
-MD5 62a6ceb0d791f58680a8260b121f06ba files/gst-plugins-0.8.9-qtdemux-fixrawpcm.patch 698
-MD5 08ef8415d9778f702053aa3e0090404b files/gst-plugins-0.8.9-ximagefix.patch 2525
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrILjmOfEJZHYOKcRAqcfAJ9sb8QfPDHsZo7MP4DRBEQe6D3ZoACgjNhi
-1xgS98ZS2XopZu2njT+Qs84=
-=zM2m
------END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.8.9-r2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.8.9-r2
new file mode 100644
index 000000000000..346795226dc3
--- /dev/null
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.8.9-r2
@@ -0,0 +1 @@
+MD5 663461ef7b16e9bd7f2605e4ed0db5ba gst-plugins-0.8.9.tar.bz2 2356958
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.8.9-riffmedia-isompeg4.patch b/media-libs/gst-plugins/files/gst-plugins-0.8.9-riffmedia-isompeg4.patch
new file mode 100644
index 000000000000..90e9c82c5326
--- /dev/null
+++ b/media-libs/gst-plugins/files/gst-plugins-0.8.9-riffmedia-isompeg4.patch
@@ -0,0 +1,30 @@
+===================================================================
+RCS file: /cvs/gstreamer/gst-plugins/gst-libs/gst/riff/Attic/riff-media.c,v
+rcsdiff: /cvs/gstreamer/gst-plugins/gst-libs/gst/riff/Attic/riff-media.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.42.2.1
+retrieving revision 1.42.2.2
+diff -u -r1.42.2.1 -r1.42.2.2
+--- riff-media.c	2005/04/02 12:24:52	1.42.2.1
++++ riff-media.c	2005/06/09 09:47:22	1.42.2.2
+@@ -250,6 +250,13 @@
+         *codec_name = g_strdup ("Microsoft MPEG-4 4.3");
+       break;
+ 
++    case GST_MAKE_FOURCC ('M', '4', 'S', '2'):
++      caps = gst_caps_new_simple ("video/mpeg",
++          "mpegversion", G_TYPE_INT, 4, NULL);
++      if (codec_name)
++        *codec_name = g_strdup ("Microsoft ISO MPEG-4 1.1");
++      break;
++
+     case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
+     case GST_MAKE_FOURCC ('3', 'I', 'V', '2'):
+       caps = gst_caps_new_simple ("video/x-3ivx", NULL);
+@@ -644,6 +651,7 @@
+     GST_MAKE_FOURCC ('D', 'I', 'B', ' '),
+     GST_MAKE_FOURCC ('X', 'x', 'a', 'n'),
+     GST_MAKE_FOURCC ('I', 'V', '5', '0'),
++    GST_MAKE_FOURCC ('M', '4', 'S', '2'),
+     /* FILL ME */
+     0
+   };
diff --git a/media-libs/gst-plugins/gst-plugins-0.8.9-r2.ebuild b/media-libs/gst-plugins/gst-plugins-0.8.9-r2.ebuild
new file mode 100644
index 000000000000..74ff47603196
--- /dev/null
+++ b/media-libs/gst-plugins/gst-plugins-0.8.9-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.9-r2.ebuild,v 1.1 2005/06/13 21:32:42 zaheerm Exp $
+
+# order is important, gnome2 after gst-plugins
+inherit gst-plugins gnome2 eutils flag-o-matic libtool
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.net/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~arm ~ppc64"
+IUSE="esd alsa oss"
+
+RDEPEND=">=media-libs/gstreamer-0.8.9
+	>=gnome-base/gconf-1.2"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	>=dev-util/pkgconfig-0.9"
+
+PDEPEND="oss? ( >=media-plugins/gst-plugins-oss-${PV} )
+	alsa? ( >=media-plugins/gst-plugins-alsa-${PV} )
+	esd? ( >=media-plugins/gst-plugins-esd-${PV} )"
+
+# we need x for the x overlay to get linked
+GST_PLUGINS_BUILD="x xshm"
+
+# overrides the eclass
+src_unpack() {
+	unpack ${A}
+
+	# fix ximagesrc to work in gst-inspect
+	cd ${S}/sys/ximage
+	epatch ${FILESDIR}/${P}-ximagefix.patch
+
+	# fix qtdemux so raw pcm files sound proper
+	cd ${S}/gst/qtdemux
+	epatch ${FILESDIR}/${P}-qtdemux-fixrawpcm.patch
+
+	# add iso mpeg4 support to avi
+	cd ${S}/gst-libs/gst/riff
+	epatch ${FILESDIR}/${P}-riffmedia-isompeg4.patch
+
+}
+
+src_compile() {
+
+	elibtoolize
+
+	# gst doesnt handle optimisations well
+	strip-flags
+	replace-flags "-O3" "-O2"
+	filter-flags "-fprefetch-loop-arrays" # see bug 22249
+	if use alpha || use amd64 || use ia64 || use hppa; then
+		append-flags -fPIC
+	fi
+
+	gst-plugins_src_configure
+
+	emake || die
+
+}
+
+# override eclass
+src_install() {
+
+	gnome2_src_install
+
+}
+
+DOCS="AUTHORS INSTALL README RELEASE TODO"
+
+pkg_postinst () {
+
+	gnome2_pkg_postinst
+	gst-plugins_pkg_postinst
+
+	echo ""
+	einfo "The Gstreamer plugins setup has changed quite a bit on Gentoo,"
+	einfo "applications now should provide the basic plugins needed."
+	echo ""
+	einfo "The new seperate plugins are all named 'gst-plugins-<plugin>'."
+	einfo "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'."
+	einfo "In most cases it shouldn't be needed though to emerge extra plugins."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+	gst-plugins_pkg_postrm
+
+}