From 27dfd272ae3be15b1017f733682211afa1c7c0f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Nov 2017 21:07:25 +0000 Subject: gentoo resync : 02.11.2017 --- dev-cpp/gstreamermm/Manifest | 7 +- .../files/1.8.0-add-missing-header.patch | 42 ------------ dev-cpp/gstreamermm/files/1.8.0-fix-wrapping.patch | 23 ------- .../files/1.8.0-gst-bad-pkgconfig-cflags.patch | 42 ------------ dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild | 63 ++++++++++++++++++ dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild | 74 ---------------------- 6 files changed, 65 insertions(+), 186 deletions(-) delete mode 100644 dev-cpp/gstreamermm/files/1.8.0-add-missing-header.patch delete mode 100644 dev-cpp/gstreamermm/files/1.8.0-fix-wrapping.patch delete mode 100644 dev-cpp/gstreamermm/files/1.8.0-gst-bad-pkgconfig-cflags.patch create mode 100644 dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild delete mode 100644 dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild (limited to 'dev-cpp/gstreamermm') diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest index 447ad746ff20..cb65381370c9 100644 --- a/dev-cpp/gstreamermm/Manifest +++ b/dev-cpp/gstreamermm/Manifest @@ -1,13 +1,10 @@ AUX 1.4.3-fix-compile.patch 881 SHA256 32787570eea193b372248af3f9b5d13ef16bff990a2caa409b65993bc737302c SHA512 a26b09d202a2aba70774722da39b5a6fcd0ca25e8fb4cf852d73bab0791d573a08fec4c824332d443905ad1a2711399dc6cab5a426ef9825644c8bdad4debc58 WHIRLPOOL 9bcdf60ed13a32e9885719120796b2a48868ee558bc9a2fbab7bcfb143578151b4a45a9844bfff85d36d6ee1b23223102ec129aa0049d3502c29cf17cadc49a3 -AUX 1.8.0-add-missing-header.patch 1139 SHA256 205aa61d46b4cacb78401fa6ccc46307d1982eda00ee49fac9fa74210ab13c33 SHA512 193bf9b06d647ad553f7f360643f60fea9396f02b63bc79cd2c9aac47ac42c53d63068ec8db2655efc93dfd5a9a5e28adddaf2cb8e0a3e9094603eab9f123d1b WHIRLPOOL 2b75146f41c852e35be18b43cc8b9eb58b9351fe889d4acc883fba19397ffc6b15b8b8d17fb7caaf8b67d768f75914ff5657acb5415ed872ab05bd1064ff7c6e -AUX 1.8.0-fix-wrapping.patch 1336 SHA256 755a7146cc4ae6c80ce276647898ff1c1d930f0b95973dc1d2fef81fc8fdc315 SHA512 9cae5e02a043c51e24dea06293f13536c895a8892d709b0a451f127d9b093c3b1455ec4e419aa533d2f47b43591ae7bc4a7b0dcf5dddd87ee12ecf510c9a06b6 WHIRLPOOL 197eb0f0d40025b2a9ba54be55484c4c27894e72a3236ce3004d0610337bdb94f567fd24568ae0c4f1f903f518a565168d1e1d05e8af112aaf2e951c26603e90 -AUX 1.8.0-gst-bad-pkgconfig-cflags.patch 2305 SHA256 b2eea798f2ba1f1febe52891c9ab70c7ed7e90d22594c928a65dd5522814fa49 SHA512 8121d2f8c283f26311a05318d86544ae4affc4b126adaee0e30cad1a5e62586e109b9f376996eb2d7e35b8dc0d12d5c24101cacc21ccbd3b3c9b2151e00bf11d WHIRLPOOL 441f5e4f2f39d6b3b0ae52e886199046c84a2919b9d526d37708de25e5bc6f1075f122ace8afc9c7dfaad236495dfad19c9abc360abbc51beecf8a604dfe6b92 DIST gstreamermm-0.10.11.tar.xz 5840552 SHA256 12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6 SHA512 2ad370f6902dcb4663ea801bdbbf744a98de9e24fc04f27b5044a4a95337168e2bb195761a07ac9c1011f9ed4936287fcc5f4c2b984f0a362b429d05be7d3909 WHIRLPOOL d9be72d4691b9b0769b75819ca9403a2df7f1dbdad4974e4b26e4fd87d4b7ea0503fb2ba6a500a008ec9d1c29f6677e61649798801e6babf7e4d7b8562cc72f2 +DIST gstreamermm-1.10.0.tar.xz 3529640 SHA256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429 WHIRLPOOL 52fee9b7934e93dac6df8214bb7d3ba9e83b55d556bf8e6ccd041d98a742094e3ca2f0ef34b38ec089a08198d360fd153b666fcfea6e70c34364990ff71d1a02 DIST gstreamermm-1.4.3.tar.xz 5886048 SHA256 f1c11ee1cf7537d77de7f8d486e09c5140cc4bb78882849718cd88959a55462e SHA512 ea4d281a4f3b79113fc3a0474e23d82442facac6eaf66215de412310b9c306aa5d586ee5570087d94d90acbfc09c5766edba1414b50f0fd9a3111cda610f5671 WHIRLPOOL b8bee1e9672c5ca527718e1826a4b486ea47fd772b079dddb532716c2082bb4cca55823a8b3dcd5eabe8819ee944b0cb68740c6b986ff329b71dad47240fe904 -DIST gstreamermm-1.8.0.tar.xz 3848488 SHA256 3ee3c1457ea2c32c1e17b784faa828f414ba27a9731532bf26d137a2ad999a44 SHA512 4d458c8a2efde683dabd00308ddde6fbf732788fb9282cb2eeab9f3a01dc9b4a03bfbbe9991cd50ef3092cec861034b3a34a6c5e364582dbfc6b1a0d5bb935fe WHIRLPOOL 77b7bf6c3f6d96e26e41a80116b417e6012cacaaf884e7705218c694bc55aceeb7d065996ec02c2c3744975f146cced365974d853ef98195b069b9d6982b71ae EBUILD gstreamermm-0.10.11.ebuild 897 SHA256 6e993409de4635a319cd86e91cee5c7c12d50e6d29f6cb9d9b7350c33dcdf9e7 SHA512 ae96f4cfcc2dcfe0dc00254e97c4b7a57ab3723bacda48127b1ddde11d95881c8b943ba65cc09711a4f5ee4b42d58dd4be99435ebf89a7d875dd0656ababb903 WHIRLPOOL 4f79e8a607b7a7b4e32e5eb190686f0687473749faf12f4a652862c52e5b801a75018ae3768118f5720c1537512fcff75eeaeb19d9448016fecacaf9c3f44537 +EBUILD gstreamermm-1.10.0.ebuild 1437 SHA256 3026d445bd78819e6d24c0029493fb542b0344fa7b413d0f852c16567f407f23 SHA512 1dd4a74c2b24a169647defe937ffdde38d2b3d78a05bd38b848746fc38028b7cf39b87bfda157dc7c2ff63924328aabdfcbd6ba96aadf155c62aae8c0c89df20 WHIRLPOOL b5283c7287951209ac922b84467dd0594aa3f3d84c7d4250149d3a0a3f186cefdb445f7281c37e34e89177e8e2226e8dd4bb88aaf83b6f96faa484e6f6816f44 EBUILD gstreamermm-1.4.3.ebuild 1493 SHA256 b5cdd9cbc50c126dba40c9102d639b4400c195f83ddaa9d040c4924005d8bec1 SHA512 376d884f68652fb8103a4b44aabd44fbdcee6fd51e6ad973e9a055fea625a220061a7565d8566d0388b74bc9aae25dc1379a53486cd9f4db5d685fbf0809f6a6 WHIRLPOOL 3e7fb14e4b115cfe653e4534eebe04cd736ff9f46f3e80583cad83cfaa29b14d2d69b02d01398127a3ccb9af3e8b2bb9a58046fe9ddf7a7f95a8f9321fc7d104 -EBUILD gstreamermm-1.8.0.ebuild 1736 SHA256 499604b5c86c5c88fb527ef956376f0888d4a06254dd9060c87f5b109cad8c1a SHA512 1f5bcdfa193c0599ede254530230b1699faa9ea77652a3ffda092f586536e9f69f322ab9b45ee707c326f0313b2be4cc8687ec270422dcda91ad599b71a86bc6 WHIRLPOOL f48a5d62ba6b9e0fa3b3592f23b6be321807ea94b263b45b635f0e5505febe1b54e1308088c152ab7ece33bead600d7766706c2f4a6e0f807322c7fd6d6ce901 MISC ChangeLog 4215 SHA256 51429323e152e736515e84961a6f744128224330f7f8ce94c9c9b5c4fc0acc78 SHA512 7654b35b150b4642d967195916881f516103ee129198ca06f10bcf952b09b5784731a328e04d4730d95a2077ed1a9642eae81d547f9e77bb27a1d65d768f8364 WHIRLPOOL 5f2a63c54410b83c4a228e1734555e0ab4f7191eee084d6e6a4bacb62cd23df91807a76026b756f4684aebea82f46ab1d565c739ad121bdcb753e7105e5096b6 MISC ChangeLog-2015 5730 SHA256 efc48bd9bbb215ed8e9565dca50d265d00395708804ed0583de782b839252132 SHA512 c3c18d050aafe842205bc7650f1f8937df1cf2907e1804acb73300ea3718e8d9bb45ac976b23257849c2bbc847f081a3bafb11f4015d110a7bd88d833af2d40e WHIRLPOOL 1ce45383db8b37530ed939df48b8c23b31dbad417253bffcf2fdca2d13172dbec98fe5eeab8823e9a8fa5af607974f089dfd67de6a2d701ce7e00e39a1c53218 MISC metadata.xml 375 SHA256 20b538394afbd5634f28e4d04b8c1349b1d8033e6e4d04661390bc8c399c23a6 SHA512 3b44cf887272a8478662aeb995b97566cd109b3b134941c11f37ab38b648a58f91644f692440e8aafbc154e7acf85bf385771b008b17537848fa670d6fa1a62f WHIRLPOOL 53b26098970b9b5ae00b59a6beff5677bf4b53e725115f75d63637eef7ae192da8d36ce2940a3992ee06b717008c59e5fe2661cc7a78d75730f4bde8eb743921 diff --git a/dev-cpp/gstreamermm/files/1.8.0-add-missing-header.patch b/dev-cpp/gstreamermm/files/1.8.0-add-missing-header.patch deleted file mode 100644 index 1e8e5d43dde6..000000000000 --- a/dev-cpp/gstreamermm/files/1.8.0-add-missing-header.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 73b25333ca3778ccf4322f47abbcbc507c31890d Mon Sep 17 00:00:00 2001 -From: Marcin Kolny -Date: Wed, 12 Oct 2016 19:37:45 +0200 -Subject: [PATCH] Gst::Caps: include missing header - ---- - gstreamer/src/caps.ccg | 1 - - gstreamer/src/caps.hg | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gstreamer/src/caps.ccg b/gstreamer/src/caps.ccg -index 93acf7e..782f8e2 100644 ---- a/gstreamer/src/caps.ccg -+++ b/gstreamer/src/caps.ccg -@@ -17,7 +17,6 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include - #include - - namespace Gst -diff --git a/gstreamer/src/caps.hg b/gstreamer/src/caps.hg -index 7969cdc..bf0b950 100644 ---- a/gstreamer/src/caps.hg -+++ b/gstreamer/src/caps.hg -@@ -18,6 +18,7 @@ - */ - - #include -+#include - - _DEFS(gstreamermm,gst) - -@@ -28,7 +29,6 @@ _WRAP_ENUM(CapsIntersectMode, GstCapsIntersectMode, NO_GTYPE) - - _WRAP_ENUM(CapsFlags, GstCapsFlags) - --class Structure; - class CapsFeatures; - - /** Structure describing sets of media formats. diff --git a/dev-cpp/gstreamermm/files/1.8.0-fix-wrapping.patch b/dev-cpp/gstreamermm/files/1.8.0-fix-wrapping.patch deleted file mode 100644 index 9cb6bcaa87cb..000000000000 --- a/dev-cpp/gstreamermm/files/1.8.0-fix-wrapping.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3440f119a7d03d50688f303b3456695c4d8e5187 Mon Sep 17 00:00:00 2001 -From: Marcin Kolny -Date: Sun, 16 Oct 2016 22:20:42 +0200 -Subject: [PATCH] Gst::Pad: fix method wrapper - - * gstreamer/src/pad.hg: fix method proxy_query_accept_caps() ---- - gstreamer/src/pad.hg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstreamer/src/pad.hg b/gstreamer/src/pad.hg -index cf0d78e..f2ff258 100644 ---- a/gstreamer/src/pad.hg -+++ b/gstreamer/src/pad.hg -@@ -236,7 +236,7 @@ public: - - _WRAP_METHOD(bool query_accept_caps(const Glib::RefPtr& caps) const, gst_pad_query_accept_caps) - _WRAP_METHOD(bool proxy_query_caps(const Glib::RefPtr& query) const, gst_pad_proxy_query_caps) -- _WRAP_METHOD(bool proxy_query_accept_caps(const Glib::RefPtr& query) const, gst_pad_proxy_accept_caps) -+ _WRAP_METHOD(bool proxy_query_accept_caps(const Glib::RefPtr& query) const, gst_pad_proxy_query_accept_caps) - _WRAP_METHOD(bool peer_query_accept_caps(const Glib::RefPtr& caps) const, gst_pad_peer_query_accept_caps) - _WRAP_METHOD(bool peer_query_position(Gst::Format format, gint64& cur) const, gst_pad_peer_query_position) - _WRAP_METHOD(bool peer_query_duration(Gst::Format format, gint64& duration) const, gst_pad_peer_query_duration) diff --git a/dev-cpp/gstreamermm/files/1.8.0-gst-bad-pkgconfig-cflags.patch b/dev-cpp/gstreamermm/files/1.8.0-gst-bad-pkgconfig-cflags.patch deleted file mode 100644 index bac4fde587e8..000000000000 --- a/dev-cpp/gstreamermm/files/1.8.0-gst-bad-pkgconfig-cflags.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3a4698e1c6e2b2c6c703f07687cc485ada734d60 Mon Sep 17 00:00:00 2001 -From: Marcin Kolny -Date: Tue, 15 Nov 2016 21:57:57 +0100 -Subject: [PATCH] plugins-bad: use flags and libs from gstreamer-gl pkg config - file - ---- - examples/Makefile.am | 2 +- - gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index a08d446..200ab02 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -15,7 +15,7 @@ - - AUTOMAKE_OPTIONS = subdir-objects - --examples_cppflags = $(GSTREAMERMM_CFLAGS) -+examples_cppflags = $(GSTREAMERMM_CFLAGS) $(GSTREAMERMM_PLUGINS_BAD_CFLAGS) $(GSTREAMERMM_GL_CFLAGS) - gstreamermm_includes = -I$(top_builddir)/gstreamer $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer) - local_libgstreamermm = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GSTREAMERMM_API_VERSION).la - -diff --git a/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am b/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am -index eb46188..859f0ba 100644 ---- a/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am -+++ b/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am -@@ -23,11 +23,11 @@ include $(top_srcdir)/build/compile-binding.am - local_includes = -I$(top_builddir)/gstreamer $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer) - local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags) -DGSTREAMERMM_PLUGINS_BAD_BUILD=1 - --AM_CPPFLAGS = $(local_cppflags) $(GSTREAMERMM_PLUGINS_BAD_CFLAGS) $(GSTREAMERMM_CFLAGS) -+AM_CPPFLAGS = $(local_cppflags) $(GSTREAMERMM_PLUGINS_BAD_CFLAGS) $(GSTREAMERMM_CFLAGS) $(GSTREAMERMM_GL_CFLAGS) - AM_CXXFLAGS = $(GSTREAMERMM_WXXFLAGS) - - local_libadd = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GSTREAMERMM_API_VERSION).la - - libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_SOURCES = $(binding_sources) - libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(GSTREAMERMM_SO_VERSION) --libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(local_libadd) -+libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(GSTREAMERMM_GL_LIBS) $(local_libadd) diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild new file mode 100644 index 000000000000..23613926130b --- /dev/null +++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2 virtualx + +DESCRIPTION="C++ interface for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/bindings/cplusplus.html" + +LICENSE="LGPL-2.1" +SLOT="1.0/1" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc examples test" + +RDEPEND=" + >=media-libs/gstreamer-${PV}:1.0 + >=media-libs/gst-plugins-base-${PV}:1.0 + >=dev-cpp/glibmm-2.47.6:2 + >=dev-cpp/libxmlpp-2.14:2.6 + >=dev-libs/libsigc++-2:2 +" +DEPEND="${RDEPEND} + dev-cpp/mm-common + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz ) + test? ( + dev-cpp/gtest + >=media-libs/gst-plugins-base-${PV}:1.0[X,ogg,theora,vorbis] + >=media-libs/gst-plugins-good-${PV}:1.0 + >=media-plugins/gst-plugins-jpeg-${PV}:1.0 ) +" +# eautoreconf: +# dev-cpp/mm-common + +# Installs reference docs into /usr/share/doc/gstreamermm-1.0/ +# but that's okay, because the rest of dev-cpp/*mm stuff does the same + +src_prepare() { + if ! use examples; then + # don't waste time building examples + sed -e 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die + fi + + sed -e 's/ -Werror/ /' -i tests/Makefile.am tests/Makefile.in || die + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable doc documentation) \ + $(use_enable test unittests) +} + +src_test() { + # running tests in parallel fails + virtx emake -j1 check +} diff --git a/dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild deleted file mode 100644 index f2f2934ea4e8..000000000000 --- a/dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 virtualx - -DESCRIPTION="C++ interface for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/bindings/cplusplus.html" - -LICENSE="LGPL-2.1" -SLOT="1.0/1" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc examples test" - -# module is experimental: -# >=media-libs/gst-plugins-bad-${PV}:1.0[opengl?] -RDEPEND=" - >=media-libs/gstreamer-${PV}:1.0 - >=media-libs/gst-plugins-base-${PV}:1.0 - >=dev-cpp/glibmm-2.47.6:2 - >=dev-cpp/libxmlpp-2.14:2.6 - >=dev-libs/libsigc++-2:2 -" -DEPEND="${RDEPEND} - dev-cpp/mm-common - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz ) - test? ( - dev-cpp/gtest - >=media-libs/gst-plugins-base-${PV}:1.0[X,ogg,theora,vorbis] - >=media-libs/gst-plugins-good-${PV}:1.0 - >=media-plugins/gst-plugins-jpeg-${PV}:1.0 ) -" -# eautoreconf: -# dev-cpp/mm-common - -# Installs reference docs into /usr/share/doc/gstreamermm-1.0/ -# but that's okay, because the rest of dev-cpp/*mm stuff does the same - -PATCHES=( - # Upstream patches - "${FILESDIR}"/1.8.0-add-missing-header.patch - "${FILESDIR}"/1.8.0-gst-bad-pkgconfig-cflags.patch - "${FILESDIR}"/1.8.0-fix-wrapping.patch -) - -src_prepare() { - if ! use examples; then - # don't waste time building examples - sed -e 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die - fi - - sed -e 's/ -Werror/ /' -i tests/Makefile.am tests/Makefile.in || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-plugins-bad \ - $(use_enable doc documentation) \ - $(use_enable test unittests) -} - -src_test() { - # running tests in parallel fails - virtx emake -j1 check -} -- cgit v1.2.3