diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-09 22:44:03 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-09 22:44:03 +0000 |
| commit | f8564e126122defc357e60a13cbe7452d2336d76 (patch) | |
| tree | 52dacea8e22f24fd85755b6dc34b39b6e4378b01 /media-plugins/gst-plugins-hls | |
| parent | games-sports/skatebird: New package (diff) | |
| download | gentoo-f8564e126122defc357e60a13cbe7452d2336d76.tar.gz gentoo-f8564e126122defc357e60a13cbe7452d2336d76.tar.bz2 gentoo-f8564e126122defc357e60a13cbe7452d2336d76.zip | |
media-plugins/gst-plugins-hls: fix DuplicateFiles
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-plugins/gst-plugins-hls')
| -rw-r--r-- | media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.20.0-use-system-libs-hls.patch | 24 | ||||
| -rw-r--r-- | media-plugins/gst-plugins-hls/gst-plugins-hls-1.20.0.ebuild | 2 |
2 files changed, 1 insertions, 25 deletions
diff --git a/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.20.0-use-system-libs-hls.patch b/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.20.0-use-system-libs-hls.patch deleted file mode 100644 index f1c1b7fb5fcc..000000000000 --- a/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.20.0-use-system-libs-hls.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.20.0.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.20.0.ebuild index 9c95c2aa9b36..637be85238d5 100644 --- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.20.0.ebuild +++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.20.0.ebuild @@ -15,7 +15,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-hls.patch + "${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-hls.patch ) src_prepare() { |