public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libnice/files/, media-plugins/gst-plugins-libnice/
Date: Sun, 20 Mar 2022 22:10:12 +0000 (UTC)	[thread overview]
Message-ID: <1647814200.ea5d653fc5784a724677e78b66872704ed3ff19d.sam@gentoo> (raw)

commit:     ea5d653fc5784a724677e78b66872704ed3ff19d
Author:     Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 20:55:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 22:10:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5d653f

media-plugins/gst-plugins-libnice: bump to 0.1.18

Bug: https://bugs.gentoo.org/835681
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24688
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/gst-plugins-libnice/Manifest         |  1 +
 ...gins-libnice-0.1.18-use-installed-libnice.patch | 59 ++++++++++++++++++++++
 .../gst-plugins-libnice-0.1.18.ebuild              | 43 ++++++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index dc6cbc3cb4de..9de362f71b3d 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1 +1,2 @@
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
+DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227

diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
new file mode 100644
index 000000000000..1b0782e00d6e
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
@@ -0,0 +1,59 @@
+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.18.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
new file mode 100644
index 000000000000..99b81c3f7797
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson-multilib
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+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 ~ia64 ~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-${PV}-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
+}


             reply	other threads:[~2022-03-20 22:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-20 22:10 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-08 19:02 [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libnice/files/, media-plugins/gst-plugins-libnice/ Matt Turner
2024-11-09 19:41 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1647814200.ea5d653fc5784a724677e78b66872704ed3ff19d.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox