[gentoo-commits] dev/leio:master commit in: media-libs/gst-plugins-bad/files/, media-libs/gst-plugins-bad/

[gentoo-commits] dev/leio:master commit in: media-libs/gst-plugins-bad/files/, media-libs/gst-plugins-bad/

[Mart Raudsepp]

commit:     ebd4fa76fa568485f35bd796bf6a7d9b7dfdf61f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 01:05:05 2015 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 01:05:05 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=ebd4fa76

Bump gst-plugins-bad to 1.4.5, include a resizing patch to glimagesink and fix some deps

---
 media-libs/gst-plugins-bad/Manifest                |  2 +-
 .../files/fix-wayland-glimagesink.patch            | 25 ++++++++++++++++++++++
 ...d-1.4.4.ebuild => gst-plugins-bad-1.4.5.ebuild} |  5 +++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index e9202dd..bccf665 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1 +1 @@
-DIST gst-plugins-bad-1.4.4.tar.xz 3821332 SHA256 e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7 SHA512 9c60af8e7b992794110ceacb50fe2383a2fc55898c63bfb435c4f70363e645252ed4d54cbff136f2d82cc6c20b9893991e0ac2aa9a93f847fc435484f6e4ad3c WHIRLPOOL 689bcbe6f1647536d3449255ffe9db3632cf2714d48d0691acfd07268aafcb6966006c16953bc5818d9c99990548e59f394791f651f001df8dbceedb02ca02d3
+DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7

diff --git a/media-libs/gst-plugins-bad/files/fix-wayland-glimagesink.patch b/media-libs/gst-plugins-bad/files/fix-wayland-glimagesink.patch
new file mode 100644
index 0000000..73764ae
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/fix-wayland-glimagesink.patch
@@ -0,0 +1,25 @@
+From a7ce6119707251ffcc1feb3b6e5f3f72dad0ad80 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Thu, 27 Nov 2014 13:01:19 +1100
+Subject: glimagesink: only attempt a resize when the window has already
+ resized
+
+fixes a black startup screen on wayland
+
+diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
+index c06f580..1c3a7c4 100644
+--- a/ext/gl/gstglimagesink.c
++++ b/ext/gl/gstglimagesink.c
+@@ -1260,7 +1260,8 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
+   /* opengl scene */
+   GST_TRACE ("redrawing texture:%u", gl_sink->redisplay_texture);
+ 
+-  if (gl_sink->caps_change) {
++  if (gl_sink->caps_change && gl_sink->window_width > 0
++      && gl_sink->window_height > 0) {
+     GST_GLIMAGE_SINK_UNLOCK (gl_sink);
+     gst_glimage_sink_on_resize (gl_sink, gl_sink->window_width,
+         gl_sink->window_height);
+-- 
+cgit v0.10.2
+

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
similarity index 94%
rename from media-libs/gst-plugins-bad/gst-plugins-bad-1.4.4.ebuild
rename to media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
index e1d46c1..09c481f 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild
@@ -22,8 +22,8 @@ IUSE="egl gles2 +introspection +orc opengl rpi vnc wayland"
 # X11 is automagic for now, upstream #709530
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.2:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-1.2:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.4:${SLOT}[${MULTILIB_USEDEP}]
 	egl? (
 		rpi? ( media-libs/raspberrypi-userland )
 		!rpi? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Make RPI egl stuff use pkg-config - https://bugzilla.gnome.org/733248
 	epatch "${FILESDIR}"/egl-rpi-pkgconfig.patch
+	epatch "${FILESDIR}"/fix-wayland-glimagesink.patch
 	eautoreconf
 }