diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-07-28 04:35:59 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-28 04:35:59 +0100 |
commit | 2130804eda00268ce2a34eb936167bcfeb4281a0 (patch) | |
tree | eea3135d689247ef9c9f3afafb362d0e26f9ed1d /media-plugins/gst-plugins-libnice/files | |
parent | ebac931cc23ca55abe982e67b9a4f06f748d0bef (diff) |
gentoo auto-resync : 28:07:2023 - 04:35:59
Diffstat (limited to 'media-plugins/gst-plugins-libnice/files')
2 files changed, 130 insertions, 0 deletions
diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-no-install-version.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-no-install-version.patch new file mode 100644 index 000000000000..2602a31f97dd --- /dev/null +++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-no-install-version.patch @@ -0,0 +1,84 @@ +https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/259 + +From a34623e08e368d56fe6c7fcb7a1f87ea59ad5094 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Wed, 31 May 2023 18:34:11 +0530 +Subject: [PATCH] meson: Generate nice-version.h in the right builddir + +We want it in the `nice/` subdir so that it gets picked up correctly +during uninstalled builds, such as in the gstreamer monorepo. + +The `NICE_CHECK_VERSION` macro was non-functional in the monorepo +because of this. +--- + gst/meson.build | 3 +-- + meson.build | 9 --------- + nice/meson.build | 12 +++++++++++- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/gst/meson.build b/gst/meson.build +index 572c6abc..4ed4794f 100644 +--- a/gst/meson.build ++++ b/gst/meson.build +@@ -12,8 +12,7 @@ libgstnice = library('gstnice', + 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) + plugins = [libgstnice] +diff --git a/meson.build b/meson.build +index 6a733b73..4faffb40 100644 +--- a/meson.build ++++ b/meson.build +@@ -85,15 +85,6 @@ add_project_arguments('-D_GNU_SOURCE', + '-DNICE_VERSION_NANO=' + version_nano, + language: 'c') + +-version_conf = configuration_data() +-version_conf.set('NICE_VERSION_MAJOR', version_major) +-version_conf.set('NICE_VERSION_MINOR', version_minor) +-version_conf.set('NICE_VERSION_MICRO', version_micro) +-version_conf.set('NICE_VERSION_NANO', version_nano) +-nice_version_h = configure_file(output: 'nice-version.h', +- install_dir: get_option('includedir') / 'nice', +- configuration: version_conf) +- + cdata = configuration_data() + + cdata.set_quoted('PACKAGE_STRING', meson.project_name()) +diff --git a/nice/meson.build b/nice/meson.build +index 6916781d..4f826d81 100644 +--- a/nice/meson.build ++++ b/nice/meson.build +@@ -1,4 +1,3 @@ +-nice_gen_sources = [nice_version_h] + nice_link_args = [] + + # libnice.def +@@ -31,9 +30,20 @@ libnice = library('nice', + link_depends: mapfile, + install: true) + ++version_conf = configuration_data() ++version_conf.set('NICE_VERSION_MAJOR', version_major) ++version_conf.set('NICE_VERSION_MINOR', version_minor) ++version_conf.set('NICE_VERSION_MICRO', version_micro) ++version_conf.set('NICE_VERSION_NANO', version_nano) ++nice_version_h = configure_file(output: 'nice-version.h', ++ install_dir: get_option('includedir') / 'nice', ++ configuration: version_conf) ++ + install_headers('nice.h', subdir: 'nice') + nice_include = include_directories('.') + ++nice_gen_sources = [nice_version_h] ++ + # introspection + build_gir = gir.found() and not get_option('introspection').disabled() + if build_gir +-- +GitLab diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-use-installed-libnice.patch new file mode 100644 index 000000000000..1f8adae219ec --- /dev/null +++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.21-use-installed-libnice.patch @@ -0,0 +1,46 @@ +Carve out everything but gstreamer plugin part, libnice-0.1.21 + +Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> + +diff -udBbr libnice-0.1.21-original/meson.build libnice-0.1.21/meson.build +--- libnice-0.1.21-original/meson.build 2020-10-21 04:03:07.272845300 +0300 ++++ libnice-0.1.21/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', |