Fix zero-length .webm encodings with libvpx-1.1 (bug #435282, thanks to Alexandre et al.)

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 89 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-vp8/ChangeLog b/media-plugins/gst-plugins-vp8/ChangeLog
index 7cd6d7274074..1f23f4edd37a 100644
--- a/media-plugins/gst-plugins-vp8/ChangeLog
+++ b/media-plugins/gst-plugins-vp8/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-vp8
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/ChangeLog,v 1.13 2012/12/02 19:58:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/ChangeLog,v 1.14 2012/12/06 05:21:11 tetromino Exp $
+
+*gst-plugins-vp8-0.10.23-r1 (06 Dec 2012)
+
+  06 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gst-plugins-vp8-0.10.23-r1.ebuild,
+  +files/gst-plugins-vp8-0.10.23-libvpx-1.1.patch:
+  Fix zero-length .webm encodings with libvpx-1.1 (bug #435282, thanks to
+  Alexandre et al.)
 
   02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
   gst-plugins-vp8-0.10.22.ebuild, gst-plugins-vp8-0.10.23.ebuild:
diff --git a/media-plugins/gst-plugins-vp8/Manifest b/media-plugins/gst-plugins-vp8/Manifest
index feef2907ebdb..ce164fb2a042 100644
--- a/media-plugins/gst-plugins-vp8/Manifest
+++ b/media-plugins/gst-plugins-vp8/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gst-plugins-vp8-0.10.23-libvpx-1.1.patch 1590 SHA256 9ed46ba6135912426420c835f1b5f4c63d510518fad80776f96d396518661620 SHA512 3a3c7664202632526d5012955c839f1191042cb85572bf418ecdbf90c39647dfd8002d7e185c8c9e6a934c059ead29650df9557edf3645d0afaada73ebf5e26e WHIRLPOOL 9dd77d5f088e7a38781091b8b8dd09b32987dea416c5fc3b0fdb247d89236b344f1cb9b25cd3cb718f907a7ff67b463ceb755df16b49a75c83e4e39686045394
 DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c SHA512 5a5df41df5899a2578a7d4cf03789080db028af78229254183c36f6bb094c4351c13bae4e893c6aad8e2385bafba292d7a7702436dd163cc4c53604df481349e WHIRLPOOL f028207602b652e60c9dd7fade3ca67a7e7b0173dea84602865ea66402fcb8e275529baceae416bea1a1f7bb4074e4b6d66bc0b87e15f9fedb9f4831e1820eef
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 EBUILD gst-plugins-vp8-0.10.22.ebuild 740 SHA256 a91cb583e00f28ee13a5567ae204e39cf8476361de3566725dc3e7d12b17113d SHA512 c92bc80f074425fec15929d64b2aa04d6ee37de6f1f1c7ca3383df73fc35649424cd8412e3693c0722460c27b142c20556f96edf150ec6e4bcef9cd82bb666f4 WHIRLPOOL f4e93a66b17d44a0dd1442722afa437270f728431aea58add8abfe96fe446bb899fc722cb60ce6cf94703291a63652b47630a6df42528b0e8ca39e8a0d9b75da
+EBUILD gst-plugins-vp8-0.10.23-r1.ebuild 772 SHA256 6b282aae40962ad5e4e927e8393bb268cc216ece89b75d4f9dfbf263780ef27f SHA512 a0006ecf41b73fee948f2ac9a3f9b4bbf237a9549f2927aa8adc02a34859513dde2a39d07f719f8aa0337fabaa4754a39b76c0437a56d617bef6b4a4e733586d WHIRLPOOL 312847c7e41820e267bed9d9df7965b4e307f3463e89d7ce4b94e984fb4a606f15c7ed5152987b94a9ca2c77a42ecbe1309f4d8fb35101d51d19ae67670ef3ed
 EBUILD gst-plugins-vp8-0.10.23.ebuild 640 SHA256 a59d665a38574e47ee74bea7c0a3b58800e38fcacf0f017e144576edc68b2a4c SHA512 e2ee8dfaa5db503a89f925ed2728fd910e293edc46cfe5bd2e1edc444566f06f93b4e5445819cf848cef611fb78b397661ef4e3d4b5ededa2f6398133f8ed366 WHIRLPOOL 25bb1b468042454a104e8dc34c0720cd5b16bf79726d0af881e33aa5c3ca84fe775893c9b3128c3293493d83a18fc5e2565412b0fba872f227c0a9649117d03b
-MISC ChangeLog 2288 SHA256 6816d77dae0054234ab25d74a16cbd79cf000e1e8c8641f517a637a57de21c59 SHA512 f3c874e8a597c860c88f5610d2eb8556e40ef8d9a10bbe22dc73fce585158f3867b04be18a14fdc10d0d64d48d84932d94b3ae35efaba8bbb89dfddc18ebc726 WHIRLPOOL cb40aeca23c99a21331c7dcd5bb7861b8909780bff83944431127c73039ff9eeafc71ad4da6a48fa83e3d8ae4883a58d5641eb749869ec904ee1d6aefffdaf03
+MISC ChangeLog 2580 SHA256 72e6038dfe90a3b3bfa51ed1fa3080b6dae02ad54d2334aa0bc5c67bd26dc54f SHA512 ddbb27d59c5a565062659ae5dfe814b362cf01b2eee30c3915c875944a309fcf388b159cd1be367f003be9cd74b67dcab4f5d5e514842c11fce2e83f498c61db WHIRLPOOL 6f68166a64fd967399fdd02dcbc4202a0f4a7ff5265cdbe0fdc765497e1ff4829ecea31febbabbf72d2d16f7c758fcecbd997beb26d66b6fb7738e2790206010
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC7suUACgkQ1fmVwcYIWAYDdgCg3wC++JrkErThzJVdrvvXmI+q
-Fn4AniPlnGqNzurPvqWPefSl3ZqD7+IR
-=Ikv5
+iQEcBAEBCAAGBQJQwCtIAAoJEJ0WA1zPCt1hzZUIAI2bzpRtRqNjHxHL+xSMTSDY
+7hn7SIszNp67G12Cewc8dcHSPxhs8PbMKusnbxAIZXxe5wUzKfbpQb9bH0IVSpwK
+3vK9vwLt6vmwcuE6IqF0d/rzFrf7IOR6iPg+d9N9igW4qOAN0sLSUcy75Msso5TA
+Jy1cpQgHw/aje2Pi2YNTQ7jdsRsoTulxSi7EzdDkNM0HPqSYez4WP/eWZWS3Uvnp
+bWkQWOY7B/+tBmemIueSvGJa/XKRBs3WBuf0uSg5782kmfBnQd9bIpoZ4bvRws8R
+c41JNQyhhEgc7FldkDe8m2wrwagAyiFZguL80gXw+3he8upcs8qJSZiOyDrwaFY=
+=liAk
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-libvpx-1.1.patch b/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-libvpx-1.1.patch
new file mode 100644
index 000000000000..fd26db8c2ab7
--- /dev/null
+++ b/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-libvpx-1.1.patch
@@ -0,0 +1,46 @@
+From 7e51c854b28f68e434523b83cd4bd76ea18aab54 Mon Sep 17 00:00:00 2001
+From: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
+Date: Fri, 18 May 2012 12:46:55 +0100
+Subject: [PATCH] vp8enc: fix target bitrate config with libvpx 1.1.0
+
+libvpx 1.1.0 disallows a bitrate of 0, which was used by
+vp8enc as a default value.
+
+Instead, we use the default libvpx bitrate, scaled to our
+video size, if no bitrate was specified.
+
+This fixes encoding VP8 video with libvpx 1.1.0.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676245
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 0.10.23]
+---
+ ext/vp8/gstvp8enc.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
+index b1f06e0..123d4dd 100644
+--- a/ext/vp8/gstvp8enc.c
++++ b/ext/vp8/gstvp8enc.c
+@@ -732,6 +732,10 @@ gst_vp8_enc_set_format (GstBaseVideoEncoder * base_video_encoder,
+     return FALSE;
+   }
+ 
++  /* Scale default bitrate to our size */
++  cfg.rc_target_bitrate = gst_util_uint64_scale (cfg.rc_target_bitrate,
++      state->width * state->height, cfg.g_w * cfg.g_h);
++
+   cfg.g_w = state->width;
+   cfg.g_h = state->height;
+   cfg.g_timebase.num = state->fps_d;
+@@ -755,7 +759,6 @@ gst_vp8_enc_set_format (GstBaseVideoEncoder * base_video_encoder,
+   } else {
+     cfg.rc_min_quantizer = (gint) (63 - encoder->quality * 6.2);
+     cfg.rc_max_quantizer = (gint) (63 - encoder->quality * 6.2);
+-    cfg.rc_target_bitrate = encoder->bitrate;
+   }
+   cfg.rc_dropframe_thresh = encoder->drop_frame;
+   cfg.rc_resize_allowed = encoder->resize_allowed;
+-- 
+1.8.0
+
diff --git a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild
new file mode 100644
index 000000000000..468639d42059
--- /dev/null
+++ b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild,v 1.1 2012/12/06 05:21:11 tetromino Exp $
+
+EAPI="5"
+
+inherit eutils gst-plugins-bad gst-plugins10
+
+DESCRIPTION="GStreamer decoder for vpx video format"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/libvpx"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix zero-bitrate vp8 encoding with libvpx-1.1, bug #435282
+	epatch "${FILESDIR}/${PN}-0.10.23-libvpx-1.1.patch"
+
+	gst-plugins10_find_plugin_dir
+	# gstbasevideo has no .pc
+	sed -e "s:\$(top_builddir)/gst-libs/gst/video/.*\.la:-lgstbasevideo-${SLOT}:" \
+		-i Makefile.am Makefile.in || die
+}