summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2021-07-03 20:55:52 +0300
committerSam James <sam@gentoo.org>2021-07-10 18:28:32 +0100
commit721d7d34e7550a38ab38c7185e04e22427291aa9 (patch)
treea33c31888f842352b17614ff1987e30f8dc8a578
parentmedia-plugins/gst-plugins-dvb: Build with installed deps, 1.18.4 (diff)
downloadgentoo-721d7d34e7550a38ab38c7185e04e22427291aa9.tar.gz
gentoo-721d7d34e7550a38ab38c7185e04e22427291aa9.tar.bz2
gentoo-721d7d34e7550a38ab38c7185e04e22427291aa9.zip
media-plugins/gst-plugins-hls: Build with installed deps, 1.18.4
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch24
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild13
2 files changed, 37 insertions, 0 deletions
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 <igor.v.kovalenko@gmail.com>
+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 <igor.v.kovalenko@gmail.com>
+
+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