farstream: for new gupnp-igd

drop libsoup-2.4
This commit is contained in:
Đoàn Trần Công Danh 2024-04-21 11:43:39 +07:00 committed by Đoàn Trần Công Danh
parent ddf542ac59
commit ba142da001
5 changed files with 61 additions and 13 deletions

View file

@ -1,11 +0,0 @@
--- a/common-modified/gst-glib-gen.mak 2014-09-03 04:47:25.000000000 +0200
+++ b/common-modified/gst-glib-gen.mak 2020-01-27 14:47:28.704958877 +0100
@@ -6,7 +6,7 @@
#glib_gen_prefix=gst_color_balance
#glib_gen_basename=colorbalance
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
# these are all the rules generating the relevant files
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)

View file

@ -0,0 +1,21 @@
From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
Date: Thu, 6 Jul 2023 15:47:27 -0400
Subject: Build with gunp-igd 1.6
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a95a046..2a995ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ AC_ARG_ENABLE([gupnp],
HAVE_GUPNP=no
if test "x$WANT_GUPNP" != "xno"; then
- PKG_CHECK_MODULES(GUPNP, [ gupnp-igd-1.0 >= 0.2 ],
+ PKG_CHECK_MODULES(GUPNP, [ gupnp-igd-1.6 ],
[ HAVE_GUPNP=yes ],
[ HAVE_GUPNP=no ])
fi

View file

@ -0,0 +1,38 @@
From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@freedesktop.org>
Date: Thu, 12 Mar 2020 14:07:23 +0100
Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
GNU Make 4.3 has a backwards incompatible change affecting the use of
number signs or hashes (ie., #) inside function invocations. See:
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
argument to the foreach call to '\#', not '#'. This would lead to
spurious backslashes in front of the '#include' directives in the
generated fs-enumtypes.c file.
Spotted by Ernestas Kulik.
https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
---
common-modified/gst-glib-gen.mak | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
index 14f1ba37..2247a41c 100644
--- a/common-modified/gst-glib-gen.mak
+++ b/common-modified/gst-glib-gen.mak
@@ -6,7 +6,8 @@
#glib_gen_prefix=gst_color_balance
#glib_gen_basename=colorbalance
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+hash:=\#
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
# these are all the rules generating the relevant files
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
--
GitLab

View file

@ -1,13 +1,13 @@
# Template file for 'farstream'
pkgname=farstream
version=0.2.9
revision=3
revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-valgrind --disable-static $(vopt_enable gir introspection)"
hostmakedepends="automake libtool gettext pkg-config intltool
glib-devel $(vopt_if gir gobject-introspection) gtk-doc"
makedepends="gupnp1.2-igd-devel libnice-devel gst-plugins-base1-devel"
makedepends="gupnp-igd-devel libnice-devel gst-plugins-base1-devel"
depends="gst-plugins-good1 gst-plugins-bad1"
checkdepends="$depends"
short_desc="GStreamer modules and libraries for videoconferencing"