From 299992b3282c07c8a96f3d796ad046c76f63e17d Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 17 Sep 2016 14:39:26 +0200 Subject: [PATCH] media-video/subtitleeditor: Drop old Package-Manager: portage-2.3.0 --- media-video/subtitleeditor/Manifest | 1 - ...tleeditor-0.41.0-keyframe-generation.patch | 30 -------- ...btitleeditor-0.41.0-subtitle-edition.patch | 27 ------- .../subtitleeditor-0.41.0-textoverlay.patch | 16 ----- .../subtitleeditor-0.41.1-r1.ebuild | 72 ------------------- 5 files changed, 146 deletions(-) delete mode 100644 media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch delete mode 100644 media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch delete mode 100644 media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch delete mode 100644 media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest index 5b416263cdb41..c511af2702836 100644 --- a/media-video/subtitleeditor/Manifest +++ b/media-video/subtitleeditor/Manifest @@ -1,2 +1 @@ -DIST subtitleeditor-0.41.1.tar.gz 1637940 SHA256 3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0 SHA512 6e87df6bf1b97fc085387f331fa415be48086b9dabf445e6050ff3ab3c812c8fff72e613959308f07c2e849bf95064c5d288f44dbc266997e7143bbb46615c9d WHIRLPOOL 111163dde1cf17df34e0dfb0aeeb874a98095d6d338ca22138ff13747697d78a2d1be127f344c36286b79f828918ab1c615bccc7e04cc8586b12efe407c76f52 DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f WHIRLPOOL def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44 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 deleted file mode 100644 index b347d4ce42614..0000000000000 --- a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch +++ /dev/null @@ -1,30 +0,0 @@ -Author: Philip Rinn -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(NULL); - -- Glib::RefPtr videobin = Glib::RefPtr::cast_dynamic( -- Gst::Parse::create_bin( -- "ffmpegcolorspace ! fakesink name=vsink", true)); -+ // ffmpegcolorspace -+ Glib::RefPtr conv = Gst::ElementFactory::create_element("ffmpegcolorspace", "conv"); -+ // fakesink -+ Glib::RefPtr vsink = Gst::FakeSink::create("vsink"); -+ // videobin -+ Glib::RefPtr videobin = Gst::Bin::create("videobin"); - -- Glib::RefPtr vsink = Glib::RefPtr::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 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-subtitle-edition.patch b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch deleted file mode 100644 index eff958fd66cc7..0000000000000 --- a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Philip Rinn -Description: With glib >= 2.42.0 you need to add interfaces before class_init ---- a/src/gui/textviewcell.cc -+++ b/src/gui/textviewcell.cc -@@ -30,8 +30,8 @@ - * Initialize the widget with the AutomaticSpellChecker. - */ - TextViewCell::TextViewCell() -+: Gtk::CellEditable(), -+ Glib::ObjectBase(typeid(TextViewCell)), --: Glib::ObjectBase(typeid(TextViewCell)), -- Gtk::CellEditable(), - m_editing_canceled(false), - m_used_ctrl_enter_to_confirm_change(false) - { - ---- a/src/gui/textviewcell.h -+++ b/src/gui/textviewcell.h -@@ -29,7 +29,7 @@ - /* - * Cell text editable with multiline support. - */ --class TextViewCell : public Gtk::TextView, public Gtk::CellEditable -+class TextViewCell : public Gtk::CellEditable, public Gtk::TextView - { - public: - diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch deleted file mode 100644 index 7a8552c7a71f7..0000000000000 --- a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Philip Rinn -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.41.1-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild deleted file mode 100644 index 7b161619fbde1..0000000000000 --- a/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 versionator flag-o-matic - -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-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug nls opengl" - -RDEPEND=" - app-text/iso-codes - dev-cpp/cairomm - >=dev-cpp/gtkmm-2.14:2.4 - >=dev-cpp/glibmm-2.16.3:2 - dev-libs/glib:2 - dev-libs/libsigc++:2 - >=dev-cpp/libxmlpp-2.20:2.6 - >=app-text/enchant-1.4 - >=dev-cpp/gstreamermm-0.10.6:0.10 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - >=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 - >=media-plugins/gst-plugins-xvideo-0.10:0.10 - x11-libs/gtk+:2 - virtual/libintl - opengl? ( - >=dev-cpp/gtkglextmm-1.2:1.0 - virtual/opengl ) -" -# gst-plugins-pango needed for text overlay -# gst-plugins-xvideo needed for video output -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig -" - -src_prepare() { - # Get textoverlay working with gstreamermm 0.10.11 - epatch "${FILESDIR}"/${PN}-0.41.0-textoverlay.patch - - # Prevent crash when generating keyframes with gstreamermm 0.10.11 - epatch "${FILESDIR}"/${PN}-0.41.0-keyframe-generation.patch - - # Fix typing/editing subtitle, bug #536246 - epatch "${FILESDIR}"/${PN}-0.41.0-subtitle-edition.patch - - gnome2_src_prepare -} - -src_configure() { - export GST_REGISTRY="${T}/home/registry.cache.xml" - - # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS - use debug && append-flags -DDEBUG - - gnome2_src_configure \ - --disable-debug \ - $(use_enable nls) \ - $(use_enable opengl gl) -}