From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- media-plugins/gst-plugins-hls/Manifest | 3 ++- ...st-plugins-bad-1.18.4-use-system-libs-hls.patch | 24 ++++++++++++++++++++++ .../gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild | 13 ++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch (limited to 'media-plugins/gst-plugins-hls') diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest index 95f32b768021..dc27918f81b0 100644 --- a/media-plugins/gst-plugins-hls/Manifest +++ b/media-plugins/gst-plugins-hls/Manifest @@ -1,5 +1,6 @@ +AUX gst-plugins-bad-1.18.4-use-system-libs-hls.patch 1000 BLAKE2B 6e992199308ff8afdebc47dd5fc0902495ff095f8e87cea96b0a3f9d7dd6644bd677a7d1753fa9c7b1a2dd5cefe5585b23029367535e8ad7df44dcd527774ded SHA512 4e7ec1a36c158334ffdb0f9e1db7b67cfbf71932aa08748e6d33b3d576b1cd58ff7c889c6b092e12dadff2755045f852e1477409801d499a5eb87afd66056cbd DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125 EBUILD gst-plugins-hls-1.16.3.ebuild 1120 BLAKE2B 45e152ae24380ec9b4664fb87e7abe72051017264c3237e49e52d5b6afca7700e51c448f5c7acabc5f66ccaeb19f444593fc56a7d6083959fbf580b4078c2fd0 SHA512 84e0d86e5dfd528bb3976289ff7b045d0b056724b93286ac1dd49acfd58b7ec31beb9c31e43c2c978f579e681ee88e5419950df80dfddb27a891234804332a18 -EBUILD gst-plugins-hls-1.18.4.ebuild 438 BLAKE2B c1b809631dd673b4b71a7ea122ee63fdd2dbd3f5a9b75e07da9ddbb91781845b73e0e9a723bd9e4ff669c19952805542c7767d79984a7e240a10f6416ab61c83 SHA512 0530396585b232eff7b295273c2e66b2e02abb40d025a38dbda04f19ebd93a86d02a76c392425ed9535b483dc309c482c9ae6489b51adcd6d80492c11986a274 +EBUILD gst-plugins-hls-1.18.4.ebuild 826 BLAKE2B d1ee4d0d15375b78d35599c40b27de47e91832900a22345dc1191dbcb7162446209069e6f3ac5cf3b26ce9d6a49d0979b6e01927d05bb0825133ee52900f29f3 SHA512 e573c18e88fa70883fe6118e2b0bec5c734ec39331529d49b9ad0aa2d7d8979e18ef6ed5fa23bfd2f4c6e637564e18ba7fe079b42c3e0ce785360d8c7bc4c175 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 diff --git a/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch b/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch new file mode 100644 index 000000000000..f1c1b7fb5fcc --- /dev/null +++ b/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch @@ -0,0 +1,24 @@ +commit 761c367338adbd004f763c404e6e5d2aed90ecd7 +Author: Igor V. Kovalenko +Date: Sat Jul 3 19:10:06 2021 +0300 + + Patch gst-plugins-bad 1.18.4 to build hls plugin using installed libs + + Header gst/adaptivedemux/gstadaptivedemux.h is not installed by gst-plugins-bad, + fix include_directories to find it in gst-libs/gst/adaptivedemux via libsinc. + + Signed-off-by: Igor V. Kovalenko + +diff --git a/ext/hls/meson.build b/ext/hls/meson.build +index 3ef45ee03..98205e4b8 100644 +--- a/ext/hls/meson.build ++++ b/ext/hls/meson.build +@@ -55,7 +55,7 @@ gsthls = library('gsthls', + hls_sources, + c_args : gst_plugins_bad_args + hls_cargs, + link_args : noseh_link_args, +- include_directories : [configinc], ++ include_directories : [configinc, libsinc], + dependencies : [gstpbutils_dep, gsttag_dep, gstvideo_dep, + gstadaptivedemux_dep, gsturidownloader_dep, + hls_crypto_dep, gio_dep, libm], diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild index 71d8100cac5e..65695b4d3027 100644 --- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild +++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild @@ -15,6 +15,19 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-hls.patch +) + +src_prepare() { + default + gstreamer_system_library gstadaptivedemux_dep:gstadaptivedemux + gstreamer_system_package pbutils_dep:gstreamer-pbutils + gstreamer_system_package tag_dep:gstreamer-tag + gstreamer_system_package video_dep:gstreamer-video + gstreamer_system_library gsturidownloader_dep:gsturidownloader +} + multilib_src_configure() { local emesonargs=( -Dhls-crypto=nettle -- cgit v1.2.3