From c75363315de1a69aa359306b8b4482e33dbb56ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Apr 2024 11:43:39 +0700 Subject: [PATCH 1/3] farstream: for new gupnp-igd drop libsoup-2.4 --- .../patches/fix-gst-glib-gen_mak.patch | 11 ------ ...s_with_gupnp_1.2.patch => gupnp-1.2.patch} | 0 srcpkgs/farstream/patches/gupnp-igd-1.6.patch | 21 ++++++++++ srcpkgs/farstream/patches/make-4.3.patch | 38 +++++++++++++++++++ srcpkgs/farstream/template | 4 +- 5 files changed, 61 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch rename srcpkgs/farstream/patches/{fix_tests_with_gupnp_1.2.patch => gupnp-1.2.patch} (100%) create mode 100644 srcpkgs/farstream/patches/gupnp-igd-1.6.patch create mode 100644 srcpkgs/farstream/patches/make-4.3.patch diff --git a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch deleted file mode 100644 index 6a674cd9f95269..00000000000000 --- a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/farstream/patches/fix_tests_with_gupnp_1.2.patch b/srcpkgs/farstream/patches/gupnp-1.2.patch similarity index 100% rename from srcpkgs/farstream/patches/fix_tests_with_gupnp_1.2.patch rename to srcpkgs/farstream/patches/gupnp-1.2.patch diff --git a/srcpkgs/farstream/patches/gupnp-igd-1.6.patch b/srcpkgs/farstream/patches/gupnp-igd-1.6.patch new file mode 100644 index 00000000000000..f914e151f374c7 --- /dev/null +++ b/srcpkgs/farstream/patches/gupnp-igd-1.6.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Jeremy_B=C3=ADcha?= +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 diff --git a/srcpkgs/farstream/patches/make-4.3.patch b/srcpkgs/farstream/patches/make-4.3.patch new file mode 100644 index 00000000000000..20a84f6e59d66b --- /dev/null +++ b/srcpkgs/farstream/patches/make-4.3.patch @@ -0,0 +1,38 @@ +From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +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 + diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index 45a5979e3e9e10..381dbd53ef1119 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -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" From 2ce214c629cc40ba4b1759ea38b439a5009eee43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Apr 2024 11:45:56 +0700 Subject: [PATCH 2/3] gupnp1.2-igd: remove --- common/shlibs | 1 - srcpkgs/gupnp1.2-igd-devel | 1 - srcpkgs/gupnp1.2-igd/template | 31 ------------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 120000 srcpkgs/gupnp1.2-igd-devel delete mode 100644 srcpkgs/gupnp1.2-igd/template diff --git a/common/shlibs b/common/shlibs index 8b03572fcedd32..59f919f5f64d9c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -820,7 +820,6 @@ libfolks-dummy.so.26 folks-0.15.0_1 libfolks-telepathy.so.26 folks-0.15.0_1 libfolks-eds.so.26 folks-0.15.0_1 libnice.so.10 libnice-0.1.18_3 -libgupnp-igd-1.0.so.4 gupnp1.2-igd-1.2.0_1 libgupnp-igd-1.6.so.0 gupnp-igd-1.4.0_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1 diff --git a/srcpkgs/gupnp1.2-igd-devel b/srcpkgs/gupnp1.2-igd-devel deleted file mode 120000 index a82a041a66b784..00000000000000 --- a/srcpkgs/gupnp1.2-igd-devel +++ /dev/null @@ -1 +0,0 @@ -gupnp1.2-igd \ No newline at end of file diff --git a/srcpkgs/gupnp1.2-igd/template b/srcpkgs/gupnp1.2-igd/template deleted file mode 100644 index 10714647e7f1e0..00000000000000 --- a/srcpkgs/gupnp1.2-igd/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'gupnp1.2-igd' -pkgname=gupnp1.2-igd -version=1.2.0 -revision=1 -build_style=meson -build_helper="gir" -configure_args="$(vopt_bool gir introspection)" -hostmakedepends="pkg-config glib-devel" -makedepends="libglib-devel libxml2-devel libsoup-devel gssdp1.2-devel gupnp1.2-devel" -short_desc="Library to handle UPnP IGD port mapping" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://gupnp.org" -changelog="https://gitlab.gnome.org/GNOME/gupnp-igd/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/gupnp-igd/${version%.*}/gupnp-igd-${version}.tar.xz" -checksum=4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1 - -# Package build options -build_options="gir" -build_options_default="gir" - -gupnp1.2-igd-devel_package() { - depends="gupnp1.2-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/share - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 580e5b3b7adce6..d24f52ba01ee37 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -185,6 +185,8 @@ replaces=" gtkhtml<=4.10.0_1 guile1.8-devel<=1.8.8_3 guile1.8<=1.8.8_3 + gupnp1.2-igd<=1.2.0_1 + gupnp1.2-igd-devel<=1.2.0_1 gwenhywfar-gtk<=5.6.0_1 gx-go<=1.9.0_1 gx<=0.14.3_1 From c901bc5eb250083450215cb2d54684dae04e637f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Apr 2024 11:46:55 +0700 Subject: [PATCH 3/3] gupnp1.2: remove package --- common/shlibs | 1 - srcpkgs/gupnp1.2-devel | 1 - srcpkgs/gupnp1.2/template | 39 ------------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 41 deletions(-) delete mode 120000 srcpkgs/gupnp1.2-devel delete mode 100644 srcpkgs/gupnp1.2/template diff --git a/common/shlibs b/common/shlibs index 59f919f5f64d9c..a9cf55debb1f40 100644 --- a/common/shlibs +++ b/common/shlibs @@ -758,7 +758,6 @@ libgladeui-2.so.13 libgladeui3-3.38.0_1 libtdb.so.1 libtdb-1.2.2_1 libgssdp-1.2.so.0 gssdp1.2-1.4.0.1_1 libgssdp-1.6.so.0 gssdp-1.6.0_1 -libgupnp-1.2.so.0 gupnp1.2-1.2.4_1 libgupnp-1.6.so.0 gupnp-1.6.0_1 libsamplerate.so.0 libsamplerate-0.1.7_1 libmms.so.0 libmms-0.6_1 diff --git a/srcpkgs/gupnp1.2-devel b/srcpkgs/gupnp1.2-devel deleted file mode 120000 index 47db9a589cd7d9..00000000000000 --- a/srcpkgs/gupnp1.2-devel +++ /dev/null @@ -1 +0,0 @@ -gupnp1.2 \ No newline at end of file diff --git a/srcpkgs/gupnp1.2/template b/srcpkgs/gupnp1.2/template deleted file mode 100644 index 74466be4eed360..00000000000000 --- a/srcpkgs/gupnp1.2/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'gupnp1.2' -pkgname=gupnp1.2 -version=1.2.4 -revision=1 -build_style=meson -build_helper="gir" -configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi) - -Dexamples=false" -hostmakedepends="pkg-config glib-devel libxslt docbook-xsl $(vopt_if gir vala)" -makedepends="libglib-devel libxml2-devel libuuid-devel gssdp1.2-devel - libsoup-devel" -short_desc="GObject-based library for UPnP" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Projects/GUPnP" -distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz" -checksum=f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1 - -build_options="gir" -build_options_default="gir" - -post_install() { - rm ${DESTDIR}/usr/bin/gupnp-binding-tool* - rm ${DESTDIR}/usr/share/man/man1/gupnp-binding-tool* -} - -gupnp1.2-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - vmove usr/share/vala - fi - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d24f52ba01ee37..0a0157d215d5f7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -185,6 +185,8 @@ replaces=" gtkhtml<=4.10.0_1 guile1.8-devel<=1.8.8_3 guile1.8<=1.8.8_3 + gupnp1.2<=1.2.4_1 + gupnp1.2-devel<=1.2.4_1 gupnp1.2-igd<=1.2.0_1 gupnp1.2-igd-devel<=1.2.0_1 gwenhywfar-gtk<=5.6.0_1