diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /media-libs/gstreamer | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'media-libs/gstreamer')
-rw-r--r-- | media-libs/gstreamer/Manifest | 5 | ||||
-rw-r--r-- | media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch | 56 | ||||
-rw-r--r-- | media-libs/gstreamer/gstreamer-1.14.4.ebuild | 4 | ||||
-rw-r--r-- | media-libs/gstreamer/gstreamer-1.14.5.ebuild | 115 |
4 files changed, 179 insertions, 1 deletions
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest index f63fcf8acd80..954cd197dac4 100644 --- a/media-libs/gstreamer/Manifest +++ b/media-libs/gstreamer/Manifest @@ -1,3 +1,6 @@ +AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350 DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe -EBUILD gstreamer-1.14.4.ebuild 3395 BLAKE2B 49480169ecdbb0a596bb597f13b8de548bab1b4740cbc60b3d7d824151c05ccc744d969ed17a115d10b165ef7dea78d7bb2db0d09c93e0521c75282ee073fbf2 SHA512 c284e281626f657e3c32c3d96e4403c34efc46131455cabd4e0babd4cf3beddb3401654ddf0b78d427b2d6a490573a52ed7e8b381283d91e8b9c7f7e0db86701 +DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8 +EBUILD gstreamer-1.14.4.ebuild 3457 BLAKE2B 120784600fd144634542473b1e538a9209e0a851374620404160605ecc8922012136d6ce1d762d8600061d3564ef43b498a5671917d13773fff7074c6bb38ffe SHA512 346cf940cf8931f1cb41eda98ff700f5b7bc8aecc462d753af9456ea5f41ae742dac1d3fe20774653ae108b1e8dfe336d10bbbfb9f44ffa1362895a8a5489eed +EBUILD gstreamer-1.14.5.ebuild 3465 BLAKE2B ac4e74ddcbaac9b30728ba1a4593ae4a20407d3e2d0d413f0b96713cea178ad4dc2bb42b0779bea45ae2e1b8b26ebd80a81f49ef439c14e0c0419bd019715897 SHA512 8e548d5dc6df7b1363652e0d497c6c841a41410feeee095d7e9ac9843efb595b00f47fc7e8d6b4a076dac945b73b0dd08feb4a5a17f0c863928f51589e95a46f MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57 diff --git a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch new file mode 100644 index 000000000000..ca74bf0cc2e6 --- /dev/null +++ b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch @@ -0,0 +1,56 @@ +From 4a7739f4b6442814696bbd0706ab9a1ce1462d80 Mon Sep 17 00:00:00 2001 +From: Havard Graff <havard.graff@gmail.com> +Date: Wed, 31 Oct 2018 10:27:23 +0100 +Subject: [PATCH] tests/uri: fix test after GHashTable changes in GLib 2.59 + +Maybe the implementation should not be dependent on a "random" hash-table +ordering, but at least this shows the problem clearly. +--- + tests/check/gst/gsturi.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c +index ee623dbcf..fa87c7c77 100644 +--- a/tests/check/gst/gsturi.c ++++ b/tests/check/gst/gsturi.c +@@ -414,7 +414,11 @@ static const struct URITest url_presenting_tests[] = { + {.uri = {"scheme", "user:pass", "host", 1234, "/path/to/dir", + {{"query", NULL}, {"key", "value"}}, "fragment"}, + .str = ++#if GLIB_CHECK_VERSION(2, 59, 0) ++ "scheme://user:pass@host:1234/path/to/dir?key=value&query#fragment"}, ++#else + "scheme://user:pass@host:1234/path/to/dir?query&key=value#fragment"}, ++#endif + + /* IPv6 literal should render in square brackets */ + {.uri = {"scheme", "user:pass", "12:34:56:78:9a:bc:de:f0", 1234, +@@ -977,14 +981,24 @@ GST_START_TEST (test_url_get_set) + + fail_unless (gst_uri_set_query_value (url, "key", "value")); + tmp_str = gst_uri_to_string (url); ++#if GLIB_CHECK_VERSION(2, 59, 0) ++ fail_unless_equals_string (tmp_str, ++ "//example.com/path/to/file/there/segment?key=value&query#fragment"); ++#else + fail_unless_equals_string (tmp_str, +- "//example.com/path/to/file/there/segment?query&key=value#fragment"); ++ "//example.com/path/to/file/there/segment?query&key=value#fragment"); ++#endif + g_free (tmp_str); + + fail_unless (gst_uri_set_query_value (url, "key", NULL)); + tmp_str = gst_uri_to_string (url); ++#if GLIB_CHECK_VERSION(2, 59, 0) ++ fail_unless_equals_string (tmp_str, ++ "//example.com/path/to/file/there/segment?key&query#fragment"); ++#else + fail_unless_equals_string (tmp_str, + "//example.com/path/to/file/there/segment?query&key#fragment"); ++#endif + g_free (tmp_str); + + fail_unless (!gst_uri_set_query_value (NULL, "key", "value")); +-- +2.20.1 + diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild index 7bb095742b0f..19677ed3d4f0 100644 --- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild +++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild @@ -34,6 +34,10 @@ DEPEND="${RDEPEND} " # gtk-doc-am to install API docs +PATCHES=( + "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch +) + src_configure() { if [[ ${CHOST} == *-interix* ]] ; then export ac_cv_lib_dl_dladdr=no diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild new file mode 100644 index 000000000000..c57c39da037f --- /dev/null +++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 multilib-minimal pax-utils + +DESCRIPTION="Open source multimedia framework" +HOMEPAGE="https://gstreamer.freedesktop.org/" +SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps +introspection nls +orc test unwind" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + unwind? ( + >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}] + dev-libs/elfutils[${MULTILIB_USEDEP}] + ) + !<media-libs/gst-plugins-bad-1.13.1:1.0 +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.12 + sys-devel/bison + sys-devel/flex + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + nls? ( sys-devel/gettext ) +" +# gtk-doc-am to install API docs + +PATCHES=( + "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch +) + +src_configure() { + if [[ ${CHOST} == *-interix* ]] ; then + export ac_cv_lib_dl_dladdr=no + export ac_cv_func_poll=no + fi + if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then + # GCC groks this, but then refers to an implementation (___multi3, + # ___udivti3) that don't exist (at least I can't find it), so force + # this one to be off, such that we use 2x64bit emulation code. + export gst_cv_uint128_t=no + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local completiondir=$(get_bashcompdir) + # Set 'libexecdir' to ABI-specific location for the library spawns + # helpers from there. + # Disable static archives and examples to speed up build time + # Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo + local myconf=( + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + --disable-benchmarks + --disable-debug + --disable-examples + --disable-static + --disable-valgrind + --enable-check + $(use_with unwind) + $(use_with unwind dw) + $(multilib_native_use_enable introspection) + $(use_enable nls) + $(use_enable test tests) + --with-bash-completion-dir="${completiondir%/*}" + --with-package-name="GStreamer ebuild for Gentoo" + --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" + ) + + if use caps ; then + myconf+=( --with-ptp-helper-permissions=capabilities ) + else + myconf+=( + --with-ptp-helper-permissions=setuid-root + --with-ptp-helper-setuid-user=nobody + --with-ptp-helper-setuid-group=nobody + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if multilib_is_native_abi; then + local x + for x in gst libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_install() { + # can't do "default", we want to install docs in multilib_src_install_all + emake DESTDIR="${D}" install + + # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579 + use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner" +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE" + einstalldocs + find "${ED}" -name '*.la' -delete || die + + # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579 + use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}" +} |