Fix compat with latest gstreamermm, also fixing bug #501862 by Mark Purtill, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 83 insertions, 36 deletions

diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index 850eff729c8c..a3e850bd8ad4 100644
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/subtitleeditor
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.24 2013/12/08 19:17:56 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.25 2014/02/22 11:14:31 pacho Exp $
+
+*subtitleeditor-0.41.0-r1 (22 Feb 2014)
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/subtitleeditor-0.41.0-keyframe-generation.patch,
+  +files/subtitleeditor-0.41.0-textoverlay.patch,
+  +subtitleeditor-0.41.0-r1.ebuild, -subtitleeditor-0.40.0.ebuild:
+  Fix compat with latest gstreamermm, also fixing bug #501862 by Mark Purtill,
+  drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> subtitleeditor-0.41.0.ebuild:
   x86 stable, bug #478252
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index ea7b407be273..b59ee827e37e 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX subtitleeditor-0.40.0-glib-2.31.patch 374 SHA256 8f32496eb6b7e1504bbc93f89194b217232498b9912bc4eac52d66ed66311861 SHA512 a1f3bbbccdf2b9242679a6ecd5226bcc33f4913ffab8c61cb129c2f0730304daa8113569a719e04a10a4d95f0081f44c0ae7e94571c71e1a33bcfe4664a285e7 WHIRLPOOL 85710ece606237b796892afad0bd4a95b337a339f0ef8605e44738eae2e401b1ba9eb153b8bddb6f2dd7bfa3d8820b8d42a996e99bc6e36c0adc581c3919b17c
-DIST subtitleeditor-0.40.0.tar.gz 1421300 SHA256 b8d948f3e770524bf63fe632600aa94fcbd4edba772cad2aec4fdb3b3335b02d SHA512 cead2ed1c4e78f8c02c92c98a442822ad14bec70b92f3f9083efebb0cc62a33486d4947afdc618863be64f885f769c23179b5bd7c54b1a9c7bf9ded980e0b610 WHIRLPOOL 9e98efa850e3757dbe2856dd46ddd3770c67f0033d4490c2b3f1ab35ed504888ecbb6e69ffcb04aa71114c9562eea2e5df9cb203cc25409ca51672b91a7faef6
+AUX subtitleeditor-0.41.0-keyframe-generation.patch 1288 SHA256 3461ea5819a795dd0ea07668fccb61fedf5c20315339370eddde87fb119d35c8 SHA512 a4c659d191ddb10395c619f478e23a4fc51d20260153f110927a390781fc7b57b3953b6f0ce71964053ec8d52bbb1970a6fa90dd9c59292b8eaeb58bdc0f366d WHIRLPOOL 42980f31c7fca2c6721a747cdce5b79130a811fa8ab9cd7236e9137b7d4f49f8b0d845b82ddada70acebff4ccc881680832ff09eccfc3b9114f328f2ee3e5e00
+AUX subtitleeditor-0.41.0-textoverlay.patch 591 SHA256 46153824964ec754bde35a43158195662af1bfee8299b206e81082325fdfac7e SHA512 f63d84d39ff544fcb2429bb6ea5ef5777ec36e589e470f20b670dbe69b4648b2dc2d71d0cc997272e2322f3835b2774f1afca33909337fc361e955a95d784d77 WHIRLPOOL 866b122164c624d8726dabc1a13297255628833a90a366d9cb46289dcd91586c20f37fece89f69c72508250d00bd3f4478688e8a6bcdf19a44fe6d4b0e395f60
 DIST subtitleeditor-0.41.0.tar.gz 1637527 SHA256 30e7fc29e8a6e714f6b0eedf80b2b387099957b9d70093fa0032fd5528b14e62 SHA512 fd2c0150754a4ba0ed5ad4b6f1460d78e9bf9c0593de5ec6c565ed5bec605ada6a5203aaa9b31a4dc5c99a97e863718c8c0458e8bfaea17dc0b045b410dcca22 WHIRLPOOL fd0160fe61eb1c46077ec651dece4376f2c502be53505190efa1375e579d741926e41c8baba2f3c7f5406a1af87b718a716faa6c5c3e31f025cada3498e53095
-EBUILD subtitleeditor-0.40.0.ebuild 1805 SHA256 d4b88118b96735439348b7f09defd7f0b448506f0a7f83640f59edad6d03a314 SHA512 2f50408362d177018918ccf1965d566d314b0d69a48fb06a45a37a99394a441a298c1cf5ef6f3a4cc65166ff94d2e664c127ab5dd1795de8684a56c87d0104af WHIRLPOOL 8bd2bd800fa142c47628d24e651758a0566b7fdf4f70bd35d18595946ba9b7777b0aefecca301668aa7c62143fbeae0955bc5b8c22d8fe11f176cf56f666a45c
+EBUILD subtitleeditor-0.41.0-r1.ebuild 1646 SHA256 8ccac2b238796a0b87d2ba7f27e5b462c55a10ce7859ac00529ff62b984fe7dd SHA512 b685611dc89248179f077b1a156fe3220a52d4891ba343d204db17c935040e5ff63ec6dee403b4a4911e28b1c087fbfca83d3467a19f0f728fb4189635e61598 WHIRLPOOL ec7a5d7da0ae65a9d6c7c5edc6a2a83ece4c1518196ae826d8f67db1572778991cf2a66caceab673983c7ee08f8a8ef09b24832ed1bb29cd338aea7301eaebaf
 EBUILD subtitleeditor-0.41.0.ebuild 1382 SHA256 aa7ccb97586b4b2c7bddc51f377b491684eebbd568684c8642f98e2a8c3330d6 SHA512 227a255f77bab755568575aa00fd6f403e04d7c0ccc19c0f1f49679decbd0415d17e008b51f0658b2d5010b2608a722241491a2bda2018585cad44baf46dc681 WHIRLPOOL 430b205ba2e9a65f6cfa70ecc5e30f51b8e45ca224809e45b0a0cabbfc060e4940c462c961b9a5ffa3254db5cfc8f7dceaad46bbc7d8b16617d0bd0f4d1201a5
-MISC ChangeLog 4387 SHA256 21903ce52078a6c8dfd43f79cfb8f9924e37ec0f04b16c32ae94b44382a6b805 SHA512 93ed27576c512a49299bf8f02ec87de35288857edef29c6405ef91f227b9b87954027f1d16a5239c5e14d74427c105f569009c0f6b16e125e0699baaafb24805 WHIRLPOOL 7e2e88684546dd757dcfb851c4aee74ff0b2ea47770c0e8e8e3277120955a2ee5e2ddaee812718f4afcc766124154d0b595c8f93bc4619b48c890f6c5ee8a700
+MISC ChangeLog 4740 SHA256 a7055d965fde88593dd36fb6bbbfe303c3787cf3b8ce44ab66e869732430a2a7 SHA512 f46d17f0bb2124ce8e3caa9643606d661e652dba1bb8015f679007ce93592e6fa09bcb64a49443f39dc1a4c5dbf1bffe8200293c1e7c59e928d50a6638dcc204 WHIRLPOOL 5f7b1ddc5ed15b17b5bd3b61e8e58a81f55794c9c8b563fb796220a587e0a8eec0007cd7a24f5afc619988137999e2ddaf24971ac05951b29f525d2aa4928812
 MISC metadata.xml 569 SHA256 01b59f2475b528613f323b616eb4fd83c585dea04782eed9fa73f6228a39d323 SHA512 f2bece30fd1eb914b5727d7f81b9b54b3c66efa629721fcace6efa5a5d6dab9dba7f34ee68fb07b3b576fbc3f4b9f4c7cdbbc5ce3423094204d6dec23fde7e48 WHIRLPOOL 7817122e4dc041edbf1192bd6a2209fac5cfbd27f535268d3ed81c12cb0af9e104cf981a6329c18b8f325a1724ef3d0b66866773cee72f92d3bd01df0c2da08e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkxeUACgkQCaWpQKGI+9TqXQCfRtDusbHsFXqH5jfqXLbWF8zC
-UnEAn3Gd5/W/7K38NSEkpyV4vccV480H
-=UyC3
+iEYEAREIAAYFAlMIhpgACgkQCaWpQKGI+9RxFACfUbyAxa5c2w0NbvV+myLilGz/
+h7IAn1zOjKkwKCAk1FANvBYXj4iqhbmL
+=Jev3
 -----END PGP SIGNATURE-----
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch
new file mode 100644
index 000000000000..b347d4ce4261
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch
@@ -0,0 +1,30 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Prevent crash when generating keyframes with gstreamermm 0.10.11
+--- a/plugins/actions/keyframesmanagement/keyframesgenerator.cc
++++ b/plugins/actions/keyframesmanagement/keyframesgenerator.cc
+@@ -87,12 +87,20 @@
+ 			if(structure_name.find("video") == Glib::ustring::npos)
+ 				return Glib::RefPtr<Gst::Element>(NULL);
+ 
+-			Glib::RefPtr<Gst::Bin> videobin = Glib::RefPtr<Gst::Bin>::cast_dynamic(
+-					Gst::Parse::create_bin(
+-						"ffmpegcolorspace ! fakesink name=vsink", true));
++			// ffmpegcolorspace
++			Glib::RefPtr<Gst::Element> conv = Gst::ElementFactory::create_element("ffmpegcolorspace", "conv");
++			// fakesink
++			Glib::RefPtr<Gst::FakeSink> vsink = Gst::FakeSink::create("vsink");
++			// videobin
++			Glib::RefPtr<Gst::Bin> videobin = Gst::Bin::create("videobin");
+ 
+-			Glib::RefPtr<Gst::FakeSink> vsink = Glib::RefPtr<Gst::FakeSink>::cast_dynamic(
+-					videobin->get_element("vsink"));
++			// Add and link
++			videobin->add(conv)->add(vsink);
++			conv->link_pads("src", vsink, "sink");
++
++			// Add sink pad to bin element
++			Glib::RefPtr<Gst::Pad> pad = conv->get_static_pad("sink");
++			videobin->add_pad(Gst::GhostPad::create(pad, "sink"));
+ 
+ 			vsink->set_sync(false);
+ 			vsink->property_silent() = true;
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch
new file mode 100644
index 000000000000..7a8552c7a71f
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch
@@ -0,0 +1,16 @@
+Author: Philip Rinn <rinni@inventati.org>
+Description: Get textoverlay working with gstreamermm 0.10.11
+--- a/src/vp/gstplayer.cc
++++ b/src/vp/gstplayer.cc
+@@ -656,7 +656,10 @@
+ 							"Please check your GStreamer installation."), "ffmpegcolorspace"));
+ 		}
+ 		// textoverlay
+-		textoverlay = Gst::ElementFactory::create_element("textoverlay", "overlay");
++		// Workaround to prevent getting a NULL pointer from the 
++		// cast_dynamic(textoverlay) call under gstreamermm 0.10.11
++		textoverlay = Gst::TextOverlay::create("overlay");
++
+ 		if(!textoverlay)
+ 		{
+ 			throw std::runtime_error(
diff --git a/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild
index 35718ccd972b..18aeb7391529 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild,v 1.5 2012/05/04 00:50:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild,v 1.1 2014/02/22 11:14:31 pacho Exp $
 
-EAPI="4"
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit eutils versionator flag-o-matic
+inherit gnome2 versionator flag-o-matic
 
-DESCRIPTION="GTK+2 subtitle editing tool."
+DESCRIPTION="GTK+2 subtitle editing tool"
 HOMEPAGE="http://home.gna.org/subtitleeditor/"
 SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug nls opengl"
 
 RDEPEND="
@@ -21,7 +23,7 @@ RDEPEND="
 	>=dev-cpp/glibmm-2.16.3:2
 	>=dev-cpp/libxmlpp-2.20:2.6
 	>=app-text/enchant-1.4
-	>=dev-cpp/gstreamermm-0.10.4
+	>=dev-cpp/gstreamermm-0.10.6
 	>=media-libs/gst-plugins-good-0.10:0.10
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 	>=media-plugins/gst-plugins-pango-0.10:0.10
@@ -30,16 +32,19 @@ RDEPEND="
 "
 # gst-plugins-pango needed for text overlay
 # gst-plugins-xvideo needed for video output
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	# bug #413843, https://gna.org/bugs/index.php?19709
-	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+	# Get textoverlay working with gstreamermm 0.10.11
+	epatch "${FILESDIR}/${P}-textoverlay.patch"
+
+	# Prevent crash when generating keyframes with gstreamermm 0.10.11
+	epatch "${FILESDIR}/${P}-keyframe-generation.patch"
+
+	gnome2_src_prepare
 }
 
 src_configure() {
@@ -48,22 +53,8 @@ src_configure() {
 	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
 	use debug && append-flags -DDEBUG
 
-	econf \
+	gnome2_src_configure \
 		--disable-debug \
 		$(use_enable nls) \
 		$(use_enable opengl gl)
 }
-
-src_install() {
-	default
-
-	# plugins are loaded without the help of libtool files
-	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}