mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
media-plugins/gst-plugins-libnice: drop 0.1.21
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
parent
635f6bf679
commit
b0e29c969b
@ -1,2 +1 @@
|
||||
DIST libnice-0.1.21.tar.gz 460086 BLAKE2B 61f0807ad0d959ffbaf8dce7b0321a19ae42e4c57cc6ac9b8f39bd27645ef60bb342f4105b6ce4c4c82573592a52388888d72031033e9e7368f8b5d53afa37d6 SHA512 acbd1e0e8aacb0a65cad5b70b470a74a7c4a4f1306bc4e17cd4fd899f2fae2bb538bd099e6c0f9cba6bb9a38e95bc14087aa4f77f6aa5b70d6398179783c6e26
|
||||
DIST libnice-0.1.22.tar.gz 460696 BLAKE2B ebc4877664568e9a93bd3eeb93c1e6fd067df81596cff2d4ca74fc8e30c7b3af0eb0dd98e605f58161d6f002a5b91b13237ae63fd719d37ad3126a2bc3f0a7e7 SHA512 c3aae2d36d2cec8654b87ecc464296711a4a64335052dfc1477f43f59e90341f7a6a01ebd4edf91a72d9ec425440e6dd0bd8f817c77e03578854e70193b3306b
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
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
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit meson-multilib
|
||||
|
||||
DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
|
||||
HOMEPAGE="https://libnice.freedesktop.org/"
|
||||
MY_P=libnice-${PV}
|
||||
SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
|
||||
SLOT="1.0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
|
||||
media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
|
||||
media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/gst-plugins-libnice-0.1.21-no-install-version.patch
|
||||
"${FILESDIR}"/gst-plugins-libnice-0.1.21-use-installed-libnice.patch
|
||||
)
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
multilib_src_configure() {
|
||||
# gnutls vs openssl left intentionally automagic here - the chosen USE flag configuration of libnice will ensure
|
||||
# one of them is present, configure will be happy, but gstreamer bits don't use it, so it doesn't matter.
|
||||
# gupnp is not used in the gst plugin.
|
||||
local emesonargs=(
|
||||
-Dgstreamer=enabled
|
||||
-Dcrypto-library=auto
|
||||
-Dintrospection=disabled
|
||||
-Dgupnp=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user