Version bump. Many updates since 1.2.x series as this is a many months overdue next stable cycle upgrade. Includes new rtpstreampay, rtpstreamdepay and rtprtx* RTP elements.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 137 insertions, 30 deletions

diff --git a/media-libs/gst-plugins-good/ChangeLog b/media-libs/gst-plugins-good/ChangeLog
index 214b828c970f..fd745be06bac 100644
--- a/media-libs/gst-plugins-good/ChangeLog
+++ b/media-libs/gst-plugins-good/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/gst-plugins-good
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/ChangeLog,v 1.198 2014/10/11 12:43:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/ChangeLog,v 1.199 2014/12/30 21:46:43 leio Exp $
+
+*gst-plugins-good-1.4.5 (30 Dec 2014)
+
+  30 Dec 2014; Mart Raudsepp <leio@gentoo.org> -gst-plugins-good-1.2.4.ebuild,
+  +gst-plugins-good-1.4.5.ebuild,
+  +files/gst-plugins-good-1.4.5-rtp-test-fixes.patch:
+  Version bump. Many updates since 1.2.x series as this is a many months
+  overdue next stable cycle upgrade. Includes new rtpstreampay, rtpstreamdepay
+  and rtprtx* RTP elements.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org>
   gst-plugins-good-0.10.31-r1.ebuild:
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index a569163dbf72..c957f126e935 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX gst-plugins-good-1.4.5-rtp-test-fixes.patch 5092 SHA256 c27c4d37368120e3f029e47a3a483213ae5c86e18906e696f8867849d17548cd SHA512 b2a64cc6755fd24f0dc5fd2add9f244dc65efe3c5d69738630113664ac0028afe3f4a1d6122f5a91d6bdfbb5673f81252f21bef8e9c6996c53f7385098f311de WHIRLPOOL badcbedda22892651e8b04ff503bac3ff1e9a31babf4cc9a5ea2c3a3f0d4437637332b41169978da95c8d7591e1bc9348e79fe7dcebfdbc35eb1dc0ce69dc297
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.3.tar.xz 2878780 SHA256 bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470 SHA512 74203578c92c6979b76e6070fd976989b7b81d3fec4317037d04391cab8142738d7b443915bced1c77e97137ebd47728ef570a55b758a946fb5bc06b7c67b407 WHIRLPOOL 0b5a66751d6e966f4df7455b9227a8da07716a9111cf74bab75e0f3c0efdc8e1e872bb5b220a5ae1edf870c00f5677451f61fb198c709e51bb3f055ebf27669d
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
+DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
 EBUILD gst-plugins-good-0.10.31-r1.ebuild 1734 SHA256 312150a19b00fb095329dc2aabfdaeb372743db3db3ea6ba403439b6900cc095 SHA512 b0fb1f9a150f2284ef5f9664e54344cbca3f30015d001836bc9111d97b7e8dc98678132779645f469205e52b84ee383bd12236073ed5d8245cb12b6c8f34ac98 WHIRLPOOL c35e8b1e770c8435eb5c2d29c605bf8e79a08248c6f1366aed92378645ba659480b85395c6ed898b99eb066fdfcca77f110b53a8056c7f9aaffcf74b36fc3804
 EBUILD gst-plugins-good-0.10.31.ebuild 1572 SHA256 0289e351541962733cfb842524ab1185a7641c47949117cf639e0a8ad86ab0cc SHA512 80108dc8747b25b48fb07c99ed41fc0156b5fe97c91852cb03ef8666fd972aa4980d62dea97ec38ba163cc12a0a8b33c0acfd5c03e8a6b7b35fa8710d814d6fd WHIRLPOOL 8550af9b6f464f600a8e4201ec512d52b24a366a89e907a1b131ec17f4047bee621fb14de29284b5ed3c5192a6e0c821d67381f8bce9006de7992cfe638c3a79
 EBUILD gst-plugins-good-1.2.3.ebuild 1575 SHA256 a36f7d4eb53fe986d92f50ad6546999b1e61c9580028024ca92a9356d84f0e96 SHA512 c7e3d4eaf49108c869f2b761f424cb1dbd7d3fa4e7372624bc56df12adacf46975a93f5dc3382060199d38b456ff7f691a5be58f82501338ddadf50114fbf8ee WHIRLPOOL ea53e5619a9fce0111e1e9cd911e8c66bc46326a2e00e432d218d545a55167e7bd9684a929dd0ad6b7a71fd53282fb692ee9e5ea66296a38e8f08376b6319ee0
 EBUILD gst-plugins-good-1.2.4-r1.ebuild 1738 SHA256 824bc7f79686c0e77ad4dcb8d057485da77011e4b5ecf9783bfa4a8cc73bf9f6 SHA512 5df121581f6283dc836d2bf38e30939e7eefe0a838bfe9bff7e1a2379f422b2095c28fe293b0ce2b6f8c1c1b09a1328aacfc7f918234ece174fa765104716304 WHIRLPOOL 69dfcf6c73131cd8e3358834012a64b80190bb04d0b6baac853a39096d34973aea7e7cacb39808b795122aba151b72d22ff91f6b762bf79fc2fa804ee24749d0
-EBUILD gst-plugins-good-1.2.4.ebuild 1587 SHA256 f7ee47d5f3af03acc6ae0829206e2e2d5d58fe8bd238610732a070362a65c554 SHA512 c4d3e72049c565d74535c9b9454372a3fbb984d13111e95517e418e02165cc260328682f5f8e1f2e458506581568edeb6eb0bb0845e5763a955b7a87ef0553cd WHIRLPOOL 57c65324b673ddc9ce91954f58ffb0586742bac01953c3036bdc9e68157e5d1b289007c4b23f8a5d87c575915b357d2eacefd4b4574a7d71b0f03fd230685670
-MISC ChangeLog 29971 SHA256 952ab52eafa5bffb9940e2695faca98071fdd65a14c80df8a39ec6708819cc09 SHA512 2a294542b972cead93ffb5a28a7b7b34072197c09dc5da118a9fe79665446ecac1dde0063f9332860b9253de291bf75fffaa359233295826f55ad9228afdae7d WHIRLPOOL 8da69be66d261a77c2d8f6ac286f70e0b3d20b30378d0f230248b69943825cd51a71c67a35fd11be00ec8ffbb7653a4e38a759cacac70c6faf2aede7b66e4738
+EBUILD gst-plugins-good-1.4.5.ebuild 2057 SHA256 4ec436f7511c735f6eacd286885459fca8e283e77ec9a7317c22cd9bd87d90a8 SHA512 702aebc4ec47034e1b1ac8cfb460a0aa3383555ec39a066308771879052b26c65f1d8283856e0d2459e8c0b2b349f9241722ac76f9f9461598cb73e18fab8c2d WHIRLPOOL 7b6055264973fbb6155b097658860b1372e5bd8c23854b1c7fb117eace890e299fcbc4fef63bdf703399a929bd03de6613d0e3e86bc0af1888df9de5637dacac
+MISC ChangeLog 30356 SHA256 d62d7917330784de2ca3845cce3cdc7c220894c846594d4fe11f69182e34006e SHA512 3960d00c0be4b035eab118c740733fc1c6c0e8d2e38b29478a0a83a5fd12324257b5f941a03cce05df7e024cf0fdd487adfc6234380106c40f0979e026569cad WHIRLPOOL e7719d65b70934d6dd37a3bb0ad2e4804e7509f197b03fcd44af9195fd8d9e560722ad99796ea36151cd541f7b41a011c5baac10490503a26751f04708f26d3d
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQ5JdoACgkQkKaRLQcq0GJLiQCfXCatSOhxLElPTl7uVD9iBs9e
-SqUAn0jl9ikTcJbmXnPS3um3z0UesAqd
-=VnRZ
------END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.4.5-rtp-test-fixes.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.4.5-rtp-test-fixes.patch
new file mode 100644
index 000000000000..08f49f396476
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.4.5-rtp-test-fixes.patch
@@ -0,0 +1,98 @@
+Upstream commits d416336 and d67da4c
+
+diff --git a/tests/check/elements/rtpaux.c b/tests/check/elements/rtpaux.c
+index 1f410bf..729604a 100644
+--- a/tests/check/elements/rtpaux.c
++++ b/tests/check/elements/rtpaux.c
+@@ -218,8 +218,8 @@ GST_START_TEST (test_simple_rtpbin_aux)
+   rtpbinsend = gst_element_factory_make ("rtpbin", "rtpbinsend");
+   g_object_set (rtpbinsend, "latency", 200, "do-retransmission", TRUE, NULL);
+   src = gst_element_factory_make ("audiotestsrc", "src");
+-  encoder = gst_element_factory_make ("speexenc", "encoder");
+-  rtppayloader = gst_element_factory_make ("rtpspeexpay", "rtppayloader");
++  encoder = gst_element_factory_make ("alawenc", "encoder");
++  rtppayloader = gst_element_factory_make ("rtppcmapay", "rtppayloader");
+   rtprtxsend = gst_element_factory_make ("rtprtxsend", "rtprtxsend");
+   sendrtp_udpsink = gst_element_factory_make ("udpsink", "sendrtp_udpsink");
+   g_object_set (sendrtp_udpsink, "host", "127.0.0.1", NULL);
+@@ -238,7 +238,7 @@ GST_START_TEST (test_simple_rtpbin_aux)
+   g_object_set (recvrtp_udpsrc, "port", 5006, NULL);
+   rtpcaps =
+       gst_caps_from_string
+-      ("application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-name=(string)SPEEX,encoding-params=(string)1,octet-align=(string)1");
++      ("application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-name=(string)PCMA,payload=(int)8");
+   g_object_set (recvrtp_udpsrc, "caps", rtpcaps, NULL);
+   gst_caps_unref (rtpcaps);
+   recvrtcp_udpsrc = gst_element_factory_make ("udpsrc", "recvrtcp_udpsrc");
+@@ -249,8 +249,8 @@ GST_START_TEST (test_simple_rtpbin_aux)
+   g_object_set (recvrtcp_udpsink, "sync", FALSE, NULL);
+   g_object_set (recvrtcp_udpsink, "async", FALSE, NULL);
+   rtprtxreceive = gst_element_factory_make ("rtprtxreceive", "rtprtxreceive");
+-  rtpdepayloader = gst_element_factory_make ("rtpspeexdepay", "rtpdepayloader");
+-  decoder = gst_element_factory_make ("speexdec", "decoder");
++  rtpdepayloader = gst_element_factory_make ("rtppcmadepay", "rtpdepayloader");
++  decoder = gst_element_factory_make ("alawdec", "decoder");
+   converter = gst_element_factory_make ("identity", "converter");
+   sink = gst_element_factory_make ("fakesink", "sink");
+   g_object_set (sink, "sync", TRUE, NULL);
+diff --git a/tests/check/elements/rtpcollision.c b/tests/check/elements/rtpcollision.c
+index e9528f9..16f665f 100644
+--- a/tests/check/elements/rtpcollision.c
++++ b/tests/check/elements/rtpcollision.c
+@@ -156,7 +156,7 @@ fake_udp_sink_chain_func (GstPad * pad, GstObject * parent, GstBuffer * buffer)
+   return GST_FLOW_OK;
+ }
+ 
+-/* This test build the pipeline audiotestsrc ! speexenc ! rtpspeexpay ! \
++/* This test build the pipeline audiotestsrc ! alawenc ! rtppcmapay ! \
+  * rtpsession ! fakesink
+  * It manually pushs buffer into rtpsession with same ssrc but different
+  * ip so that collision can be detected
+@@ -186,9 +186,9 @@ GST_START_TEST (test_master_ssrc_collision)
+ 
+   src = gst_element_factory_make ("audiotestsrc", "src");
+   g_object_set (src, "num-buffers", 5, NULL);
+-  encoder = gst_element_factory_make ("speexenc", NULL);
+-  rtppayloader = gst_element_factory_make ("rtpspeexpay", NULL);
+-  g_object_set (rtppayloader, "pt", 96, NULL);
++  encoder = gst_element_factory_make ("alawenc", NULL);
++  rtppayloader = gst_element_factory_make ("rtppcmapay", NULL);
++  g_object_set (rtppayloader, "pt", 8, NULL);
+   rtpsession = gst_element_factory_make ("rtpsession", NULL);
+   sink = gst_element_factory_make ("fakesink", "sink");
+   gst_bin_add_many (GST_BIN (bin), src, encoder, rtppayloader,
+@@ -261,7 +261,7 @@ GST_START_TEST (test_master_ssrc_collision)
+   gst_object_unref (bin);
+ 
+   /* check results */
+-  fail_unless_equals_int (nb_ssrc_changes, 7);
++  fail_unless_equals_int (nb_ssrc_changes, 4);
+ }
+ 
+ GST_END_TEST;
+@@ -325,7 +325,7 @@ rtpsession_sinkpad_probe2 (GstPad * pad, GstPadProbeInfo * info,
+   return ret;
+ }
+ 
+-/* This test build the pipeline audiotestsrc ! speexenc ! rtpspeexpay ! \
++/* This test build the pipeline audiotestsrc ! alawenc ! rtppcmapay ! \
+  * rtprtxsend ! rtpsession ! fakesink
+  * It manually pushs buffer into rtpsession with same ssrc than rtx stream
+  * but different ip so that collision can be detected
+@@ -355,12 +355,12 @@ GST_START_TEST (test_rtx_ssrc_collision)
+ 
+   src = gst_element_factory_make ("audiotestsrc", "src");
+   g_object_set (src, "num-buffers", 5, NULL);
+-  encoder = gst_element_factory_make ("speexenc", NULL);
+-  rtppayloader = gst_element_factory_make ("rtpspeexpay", NULL);
+-  g_object_set (rtppayloader, "pt", 96, NULL);
++  encoder = gst_element_factory_make ("alawenc", NULL);
++  rtppayloader = gst_element_factory_make ("rtppcmapay", NULL);
++  g_object_set (rtppayloader, "pt", 8, NULL);
+   rtprtxsend = gst_element_factory_make ("rtprtxsend", NULL);
+   pt_map = gst_structure_new ("application/x-rtp-pt-map",
+-      "96", G_TYPE_UINT, 99, NULL);
++      "8", G_TYPE_UINT, 99, NULL);
+   g_object_set (rtprtxsend, "payload-type-map", pt_map, NULL);
+   gst_structure_free (pt_map);
+   rtpsession = gst_element_factory_make ("rtpsession", NULL);
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.2.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.4.5.ebuild
index 166c9a8b0c19..2cee84b1980a 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.2.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.4.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-1.2.4.ebuild,v 1.1 2014/05/31 14:08:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-1.4.5.ebuild,v 1.1 2014/12/30 21:46:43 leio Exp $
 
 EAPI="5"
 
-# order is important, gst-plugins10 after gst-plugins-good
-inherit eutils flag-o-matic gst-plugins-good gst-plugins10
+GST_ORG_MODULE="gst-plugins-good"
+inherit eutils flag-o-matic gstreamer
 
-DESCRIPTION="Basepack of plugins for gstreamer"
+DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
@@ -16,30 +16,42 @@ IUSE="+orc"
 
 # dtmf plugin moved from bad to good in 1.2
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-libs/gst-plugins-base-1.2.3:${SLOT}
-	>=media-libs/gstreamer-1.2.4:${SLOT}
-	app-arch/bzip2
-	sys-libs/zlib
-	orc? ( >=dev-lang/orc-0.4.17 )
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
 
 	!<media-libs/gst-plugins-bad-1.1:${SLOT}
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
+	sys-apps/sed
 "
 
+src_prepare() {
+	# video coders subtest uses jpeg and png unconditionally; fixed upstream, check on bump, remove sys-apps/sed bdep
+	sed -e '/tcase_add_test.*test_video_encoders_decoders/d' -i "${S}"/tests/check/pipelines/simple-launch-lines.c || die
+
+	epatch "${FILESDIR}/${P}-rtp-test-fixes.patch"
+}
+
 src_configure() {
 	# gst doesnt handle optimisations well
 	strip-flags
 	replace-flags "-O3" "-O2"
 	filter-flags "-fprefetch-loop-arrays" # see bug 22249
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# Always enable optional bz2 support for matroska
 	# Always enable optional zlib support for qtdemux and matroska
 	# Many media files require these to work, as some container headers are often
 	# compressed, bug #291154
-	gst-plugins10_src_configure \
+	gstreamer_multilib_src_configure \
 		--enable-bz2 \
 		--enable-zlib \
 		--disable-examples \
@@ -47,12 +59,8 @@ src_configure() {
 		--with-default-visualizer=goom
 }
 
-src_compile() {
-	default
-}
-
-src_install() {
+multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	default
+	einstalldocs
 	prune_libtool_files --modules
 }