media-plugins/gst-plugins-libnice: fix DuplicateFiles

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 1 insertions, 60 deletions

diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
deleted file mode 100644
index 1b0782e00d6e..000000000000
--- a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Carve out everything but gstreamer plugin part, libnice-0.1.18
-
-Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-
-diff -udBbr libnice-0.1.18-original/gst/meson.build libnice-0.1.18/gst/meson.build
---- libnice-0.1.18-original/gst/meson.build	2020-10-21 04:03:07.271845300 +0300
-+++ libnice-0.1.18/gst/meson.build	2022-03-20 23:38:28.826178730 +0300
-@@ -12,8 +12,7 @@
-   gst_nice_sources,
-   c_args : gst_nice_args,
-   include_directories: nice_incs,
--  dependencies: [nice_deps, gst_dep],
--  link_with: libnice,
-+  dependencies: [libnice_dep, gst_dep],
-   install_dir: gst_plugins_install_dir,
-   install: true)
- 
-diff -udBbr libnice-0.1.18-original/meson.build libnice-0.1.18/meson.build
---- libnice-0.1.18-original/meson.build	2020-10-21 04:03:07.272845300 +0300
-+++ libnice-0.1.18/meson.build	2022-03-20 23:38:05.116302874 +0300
-@@ -263,9 +263,7 @@
- 
- libm = cc.find_library('m', required: false)
- 
--nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
--
--nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
-+nice_incs = include_directories('.')
- 
- ignored_iface_prefix = get_option('ignored-network-interface-prefix')
- if ignored_iface_prefix != []
-@@ -278,11 +276,7 @@
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- 
--subdir('agent')
--subdir('stun')
--subdir('socket')
--subdir('random')
--subdir('nice')
-+libnice_dep = dependency('nice', version: nice_version, required: true)
- 
- if gst_dep.found()
-   subdir('gst')
-@@ -298,14 +292,6 @@
-   endif
- endif
- 
--if not get_option('tests').disabled()
--  subdir('tests')
--endif
--
--if not get_option('examples').disabled()
--  subdir('examples')
--endif
--
- add_test_setup('valgrind',
- 	       exe_wrapper: ['valgrind',
- 			     '--leak-check=full',
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
index 99b81c3f7797..d232cc42b1a5 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/gst-plugins-libnice-${PV}-use-installed-libnice.patch
+	"${FILESDIR}"/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
 )
 
 S=${WORKDIR}/${MY_P}