From 65a2292ccf0dfd6cf2687b1282eb17d02207e08c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:17:29 +0100 Subject: [PATCH 01/13] gssdp: update to 1.6.2. --- common/shlibs | 2 +- srcpkgs/gssdp/template | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 538ff08ce5ff15..2a4517dc0cbac1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -759,7 +759,7 @@ libtotem-plparser.so.18 totem-pl-parser-3.26.1_1 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 libgladeui-2.so.13 libgladeui3-3.38.0_1 libtdb.so.1 libtdb-1.2.2_1 -libgssdp-1.2.so.0 gssdp-1.2.0_1 +libgssdp-1.6.so.0 gssdp-1.6.0_1 libgupnp-1.2.so.0 gupnp-1.2.0_1 libsamplerate.so.0 libsamplerate-0.1.7_1 libmms.so.0 libmms-0.6_1 diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template index 65f039488053ff..a87b88027c449f 100644 --- a/srcpkgs/gssdp/template +++ b/srcpkgs/gssdp/template @@ -1,25 +1,36 @@ # Template file for 'gssdp' pkgname=gssdp -version=1.4.0.1 +version=1.6.2 revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir vapi) $(vopt_bool gir introspection) - -Dexamples=false" + -Dexamples=false -Dgtk_doc=false" hostmakedepends="pkg-config glib-devel $(vopt_if gir vala)" -makedepends="gtk4-devel libsoup-devel libglib-devel" +makedepends="gtk4-devel libsoup3-devel libglib-devel" short_desc="GObject-based library for SSDP" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/action/show/Projects/GUPnP" -distfiles="${GNOME_SITE}/gssdp/${version%.*.*}/gssdp-${version}.tar.xz" -checksum=8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 +distfiles="${GNOME_SITE}/gssdp/${version%.*}/gssdp-${version}.tar.xz" +checksum=410b376deeced9836b57f488f80052fe4a14f89e075b1ceccf28e51f490f9fb9 +# test_client_creation: assertion failed (error == NULL): No default route? (gssdp-error, 1) +make_check=ci-skip -build_options="gir" +build_options="gir man" build_options_default="gir" +case "$XBPS_MACHINE" in + x86_64*|i686|ppc64le*|ppc64) build_options_default+=" man" ;; +esac + +if [ $build_option_man ]; then + configure_args=" -Dmanpages=true" + hostmakedepends+=" pandoc" +fi + gssdp-devel_package() { - depends="libsoup-devel gssdp>=${version}_${revision}" + depends="libsoup3-devel gssdp>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 5fd3be5a9fbddb3a263ad7f58d4939ba16b93fb0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:27:30 +0100 Subject: [PATCH 02/13] gupnp: update to 1.6.3. --- common/shlibs | 2 +- srcpkgs/gupnp/template | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2a4517dc0cbac1..de511fd9e0dafc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -760,7 +760,7 @@ libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 libgladeui-2.so.13 libgladeui3-3.38.0_1 libtdb.so.1 libtdb-1.2.2_1 libgssdp-1.6.so.0 gssdp-1.6.0_1 -libgupnp-1.2.so.0 gupnp-1.2.0_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 libsmbios.so.2 libsmbios-2.2.28_1 diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template index df049998718733..e7d30e366b105c 100644 --- a/srcpkgs/gupnp/template +++ b/srcpkgs/gupnp/template @@ -1,20 +1,19 @@ # Template file for 'gupnp' pkgname=gupnp -version=1.2.4 -revision=3 +version=1.6.3 +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 gssdp-devel - libsoup-devel" +makedepends="libglib-devel libxml2-devel gssdp-devel libsoup3-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 +checksum=4f4f418b07b81164df1f7ab612e28e4c016c2d085b8a4f39f97945f8b15ee248 build_options="gir" build_options_default="gir" From 615a0549ec2cb1d238f06389ff18ccb1221469f7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:42:39 +0100 Subject: [PATCH 03/13] gupnp-tools: update to 0.12.0. --- srcpkgs/gupnp-tools/patches/fix-ftbfs.patch | 29 --------------------- srcpkgs/gupnp-tools/template | 9 ++++--- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/gupnp-tools/patches/fix-ftbfs.patch diff --git a/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch b/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch deleted file mode 100644 index 0bf80fb5cd8459..00000000000000 --- a/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ecebb21e9d64081ca436aebcdb32ba0960ac8a60 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Thu, 4 Apr 2019 20:28:07 +0200 -Subject: [PATCH] build: Properly export common resources - -Fixes #3 ---- - src/common/meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/common/meson.build b/src/common/meson.build -index 68b1ca5..75b82db 100644 ---- a/src/common/meson.build -+++ b/src/common/meson.build -@@ -1,7 +1,9 @@ - util_resource = gnome.compile_resources('common-resource', - join_paths(resource_data, 'org.gupnp.Tools.Common.gresource.xml'), -+ c_name : 'gupnp_tools_common', -+ export : true, - source_dir : resource_data, -- extra_args : ['--manual-register', '--c-name', 'gupnp_tools_common'] -+ extra_args : ['--manual-register'] - ) - - libutil = static_library('util', ['icons.c', 'icons.h', 'pretty-print.c', 'pretty-print.h'] + util_resource, --- -2.18.1 - - diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template index cad194d50f8682..8dc5214831f5ed 100644 --- a/srcpkgs/gupnp-tools/template +++ b/srcpkgs/gupnp-tools/template @@ -1,14 +1,15 @@ # Template file for 'gupnp-tools' pkgname=gupnp-tools -version=0.10.0 -revision=2 +version=0.12.0 +revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gobject-introspection gettext" makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel - libxml2-devel libsoup-devel" + libxml2-devel libsoup3-devel" short_desc="Free replacements of Intel UPnP tools that use GUPnP" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://gupnp.org/" +changelog="https://gitlab.gnome.org/GNOME/gupnp-tools/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz" -checksum=41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d +checksum=5ea7607ee365642c555927fedc5b5e1fe08e74f061d0c3eb08bd901b5eb20082 From 6b05f22b22de2e52fd3e7dbd47b13d05f41da69e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:58:59 +0100 Subject: [PATCH 04/13] gupnp-dlna: update to 0.12.0. --- common/shlibs | 5 ++--- srcpkgs/gupnp-dlna/template | 20 ++++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/common/shlibs b/common/shlibs index de511fd9e0dafc..e5fbe7f9c8b0a2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -899,9 +899,8 @@ libgrlpls-0.3.so.0 grilo-0.3.2_1 libquvi.so.7 libquvi-0.4.0_1 libepc-1.0.so.3 libepc-0.4.1_1 libepc-ui-1.0.so.3 libepc-0.4.1_1 -libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1 -libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1 -libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1 +libgupnp-dlna-2.0.so.4 gupnp-dlna-0.12.0_1 +libgupnp-dlna-gst-2.0.so.4 gupnp-dlna-0.12.0_1 libfm.so.4 libfm-1.2.3_3 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2 libfm-extra.so.4 libfm-extra-1.2.3_3 diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template index 7f3a62ebd7825c..0397b0bb09f4fe 100644 --- a/srcpkgs/gupnp-dlna/template +++ b/srcpkgs/gupnp-dlna/template @@ -1,33 +1,29 @@ # Template file for 'gupnp-dlna' pkgname=gupnp-dlna -version=0.10.5 -revision=3 -build_style=gnu-configure +version=0.12.0 +revision=1 +build_style=meson build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="automake libtool pkg-config $(vopt_if vala vala) gtk-doc" +configure_args="$(vopt_bool gir introspection)" +hostmakedepends="pkg-config $(vopt_if vala vala)" makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)" short_desc="GUPnP DLNA" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://gupnp.org/" -distfiles="${GNOME_SITE}/${pkgname}/0.10/${pkgname}-${version}.tar.xz" -checksum=123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a +changelog="https://gitlab.gnome.org/GNOME/gupnp-dlna/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gupnp-dlna/${version%.*}/gupnp-dlna-${version}.tar.xz" +checksum=3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6 # Package build options build_options="gir vala" build_options_default="gir vala" -pre_configure() { - autoreconf -fi -} - gupnp-dlna-devel_package() { depends="gst-plugins-base1-devel ${sourcepkg}>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/gtk-doc vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 From d73bb30176389fb07b0998f06795280cd8347102 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:59:25 +0100 Subject: [PATCH 05/13] gupnp-av: update to 0.14.1. --- common/shlibs | 2 +- srcpkgs/gupnp-av/template | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index e5fbe7f9c8b0a2..eb25d168f46342 100644 --- a/common/shlibs +++ b/common/shlibs @@ -892,7 +892,7 @@ liblcms2.so.2 lcms2-2.2_1 libcolord.so.2 libcolord-1.1.7_1 libcolordprivate.so.2 libcolord-1.1.7_1 libcolorhug.so.2 libcolord-1.1.7_1 -libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 +libgupnp-av-1.0.so.3 gupnp-av-0.14.0_1 libgrilo-0.3.so.0 grilo-0.3.2_1 libgrlnet-0.3.so.0 grilo-0.3.2_1 libgrlpls-0.3.so.0 grilo-0.3.2_1 diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template index 23a784cef33851..693bfa2b13142a 100644 --- a/srcpkgs/gupnp-av/template +++ b/srcpkgs/gupnp-av/template @@ -1,18 +1,19 @@ # Template file for 'gupnp-av' pkgname=gupnp-av -version=0.12.11 -revision=4 -build_style=gnu-configure +version=0.14.1 +revision=1 +build_style=meson build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="pkg-config $(vopt_if vala vala)" +configure_args="$(vopt_bool gir introspection)" +hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)" makedepends="gupnp-devel $(vopt_if vala vala)" short_desc="Library to ease handling and implementation of UPnP A/V profiles" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://gupnp.org/" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc +changelog="https://gitlab.gnome.org/GNOME/gupnp-av/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gupnp-av/${version%.*}/gupnp-av-${version}.tar.xz" +checksum=b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f # Package build options build_options="gir vala" @@ -25,7 +26,6 @@ gupnp-av-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From 61dce050a518aa250bdba8da405469ce3c4b24c9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:38:48 +0100 Subject: [PATCH 06/13] gupnp-igd: update to 1.4.0. --- common/shlibs | 2 +- .../port-to-new-gssdp-and-gupnp-api.patch | 100 ------------------ srcpkgs/gupnp-igd/template | 21 ++-- 3 files changed, 11 insertions(+), 112 deletions(-) delete mode 100644 srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch diff --git a/common/shlibs b/common/shlibs index eb25d168f46342..43287e8f5e529c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -820,7 +820,7 @@ 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 gupnp-igd-0.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 libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 diff --git a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch b/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch deleted file mode 100644 index 248e9704f8c8ae..00000000000000 --- a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 1 Dec 2018 21:33:21 +0100 -Subject: [PATCH] Swtich to new GUPnP API - ---- - configure.ac | 2 +- - gupnp-igd-1.0-uninstalled.pc.in | 2 +- - gupnp-igd-1.0.pc.in | 2 +- - libgupnp-igd/Makefile.am | 2 +- - tests/gtest/gupnp-simple-igd.c | 6 ++++-- - 5 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f03921f..aa7f0ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_STDC_HEADERS - AC_PROG_LIBTOOL - AC_FUNC_MMAP - --PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) -+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) - - # glib-genmarshal - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in -index 483956f..6db3bee 100644 ---- a/gupnp-igd-1.0-uninstalled.pc.in -+++ b/gupnp-igd-1.0-uninstalled.pc.in -@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: ${libdir}/libgupnp-av-1.0.la - Cflags: -I${includedir} -diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in -index 6660d63..aa74ed3 100644 ---- a/gupnp-igd-1.0.pc.in -+++ b/gupnp-igd-1.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-igd-1.0 - Cflags: -I${includedir}/gupnp-igd-1.0 -diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am -index fe020b5..e10d857 100644 ---- a/libgupnp-igd/Makefile.am -+++ b/libgupnp-igd/Makefile.am -@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 - GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) - GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) - GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 --GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 -+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 - GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) - - if HAVE_INTROSPECTION -diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c -index 9b32b2a..d051d13 100644 ---- a/tests/gtest/gupnp-simple-igd.c -+++ b/tests/gtest/gupnp-simple-igd.c -@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - GUPnPDeviceInfo *subdev1; - GUPnPDeviceInfo *subdev2; - const gchar *xml_path = "."; -+ GError *error = NULL; - - g_signal_connect (igd, "context-available", - G_CALLBACK (ignore_non_localhost), NULL); - - if (mainctx) - g_main_context_push_thread_default (mainctx); -- context = gupnp_context_new (NULL, "lo", 0, NULL); -+ context = gupnp_context_new ("lo", 0, NULL); - g_assert (context); - - if (g_getenv ("XML_PATH")) -@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); - */ - -- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); -+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); - g_assert (dev); -+ g_assert (error == NULL); - - subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), - "urn:schemas-upnp-org:device:WANDevice:1"); --- -2.18.1 - - diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template index 17a80d67b9a0fd..3fab6566e01e11 100644 --- a/srcpkgs/gupnp-igd/template +++ b/srcpkgs/gupnp-igd/template @@ -1,27 +1,26 @@ # Template file for 'gupnp-igd' pkgname=gupnp-igd -version=0.2.5 -revision=3 -build_style=gnu-configure +version=1.4.0 +revision=1 +_commit=a10bc3732e978f364319cbf7e67b71efa6b0b504 +build_style=meson build_helper="gir" -configure_args="--disable-python --disable-static $(vopt_enable gir introspection)" -hostmakedepends="automake pkg-config glib-devel libtool gobject-introspection gtk-doc" +configure_args="$(vopt_bool gir introspection)" +hostmakedepends="pkg-config glib-devel" makedepends="libglib-devel libxml2-devel libsoup-devel gssdp-devel gupnp-devel" short_desc="Library to handle UPnP IGD port mapping" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://gupnp.org" -distfiles="${GNOME_SITE}/${pkgname}/0.2/${pkgname}-${version}.tar.xz" -checksum=8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20 +changelog="https://gitlab.gnome.org/GNOME/gupnp-igd/-/raw/master/NEWS" +#distfiles="${GNOME_SITE}/gupnp-igd/${version%.*}/gupnp-igd-${version}.tar.xz" +distfiles="https://gitlab.gnome.org/GNOME/gupnp-igd/-/archive/$_commit/gupnp-igd-$_commit.tar.gz" +checksum=6dcfef6298bd2fceed36393b43cb46254b22bded577bad244f8b043210e98b5f # Package build options build_options="gir" build_options_default="gir" -pre_configure() { - autoreconf -fi -} - gupnp-igd-devel_package() { depends="gupnp-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From fdd030b99eb5c6756ba657c01fe1a26d60d90317 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 12:25:17 +0100 Subject: [PATCH 07/13] pragha: remove rygel build dep doesn't support rygel-server 2.8, revbump is not necessary because this was already broken, so the resulting package doesn't change --- srcpkgs/pragha/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index 9c5c08944aef91..9624f0bd5bcd58 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -9,7 +9,7 @@ makedepends=" gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel - libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel + libkeybinder3-devel glyr-devel grilo-devel libgudev-devel libmtp-devel libsoup-devel" short_desc="Lightweight Music Player for GNU/Linux" maintainer="VargMon " @@ -19,7 +19,6 @@ distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8 do_configure() { - CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)" CPP=$CPP ./autogen.sh \ $configure_args \ --disable-maintainer-mode \ From 6ad7c8d7326ff376a0c0da975b0534379d25329b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 12:02:58 +0100 Subject: [PATCH 08/13] rygel: update to 0.42.0. --- common/shlibs | 12 ++++++------ srcpkgs/rygel/template | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 43287e8f5e529c..45e205dda42032 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1157,12 +1157,12 @@ libcheese.so.8 libcheese-3.17.90_1 libcheese-gtk.so.25 libcheese-3.17.90_1 libSoundTouch.so.1 soundtouch-1.9.2_1 libmusicbrainz5.so.1 libmusicbrainz5-5.1.0_1 -librygel-core-2.6.so.2 librygel-0.26.0_1 -librygel-renderer-2.6.so.2 librygel-0.26.0_1 -librygel-renderer-gst-2.6.so.2 librygel-0.26.0_1 -librygel-ruih-2.0.so.1 librygel-0.26.0_1 -librygel-server-2.6.so.2 librygel-0.26.0_1 -librygel-db-2.6.so.2 librygel-0.28.0_1 +librygel-core-2.8.so.0 librygel-0.42.0_1 +librygel-renderer-2.8.so.0 librygel-0.42.0_1 +librygel-renderer-gst-2.8.so.0 librygel-0.42.0_1 +librygel-ruih-2.8.so.0 librygel-0.42.0_1 +librygel-server-2.8.so.0 librygel-0.42.0_1 +librygel-db-2.8.so.0 librygel-0.42.0_1 libharfbuzz.so.0 libharfbuzz-5.1.0_1 libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1 libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1 diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 168fb3fb9324f6..475b5a35a3d348 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -1,26 +1,26 @@ # Template file for 'rygel' pkgname=rygel -version=0.40.2 -revision=3 +version=0.42.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dexamples=false -Dtests=false" hostmakedepends="pkg-config glib-devel vala docbook2x gettext" -makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel - gupnp-av-devel gupnp-dlna-devel tracker3-devel +makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel + gupnp-av-devel gupnp-dlna-devel tracker-devel libmediaart-devel gssdp-devel gst1-editing-services-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME home media solution" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Rygel" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697 +distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz" +checksum=006da78677df28caee287c44c29fcd9edcb1b2162423bc7f2dd2dc856b8e2bbb conf_files="/etc/rygel.conf" rygel-devel_package() { - depends="libgee08-devel gupnp-av-devel libuuid-devel + depends="libgee-devel gupnp-av-devel libuuid-devel libglib-devel librygel>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From 3e7dd93b3c675b609146cebbb7b1f1fb93524d74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 13:20:49 +0100 Subject: [PATCH 09/13] New package: gssdp1.2-1.4.0.1 --- common/shlibs | 1 + srcpkgs/gssdp1.2-devel | 1 + srcpkgs/gssdp1.2/template | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/gssdp1.2-devel create mode 100644 srcpkgs/gssdp1.2/template diff --git a/common/shlibs b/common/shlibs index 45e205dda42032..7479b1dfabde08 100644 --- a/common/shlibs +++ b/common/shlibs @@ -759,6 +759,7 @@ libtotem-plparser.so.18 totem-pl-parser-3.26.1_1 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 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.6.so.0 gupnp-1.6.0_1 libsamplerate.so.0 libsamplerate-0.1.7_1 diff --git a/srcpkgs/gssdp1.2-devel b/srcpkgs/gssdp1.2-devel new file mode 120000 index 00000000000000..ef356a28047b80 --- /dev/null +++ b/srcpkgs/gssdp1.2-devel @@ -0,0 +1 @@ +gssdp1.2 \ No newline at end of file diff --git a/srcpkgs/gssdp1.2/template b/srcpkgs/gssdp1.2/template new file mode 100644 index 00000000000000..2eaf1ff792cf27 --- /dev/null +++ b/srcpkgs/gssdp1.2/template @@ -0,0 +1,38 @@ +# Template file for 'gssdp1.2' +pkgname=gssdp1.2 +version=1.4.0.1 +revision=1 +build_style=meson +build_helper="gir" +configure_args="$(vopt_bool gir vapi) $(vopt_bool gir introspection) + -Dexamples=false" +hostmakedepends="pkg-config glib-devel $(vopt_if gir vala)" +makedepends="gtk4-devel libsoup-devel libglib-devel" +short_desc="GObject-based library for SSDP" +maintainer="Orphaned " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/action/show/Projects/GUPnP" +distfiles="${GNOME_SITE}/gssdp/${version%.*.*}/gssdp-${version}.tar.xz" +checksum=8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 + +build_options="gir" +build_options_default="gir" + +post_install() { + # conflicts with gssdp + rm ${DESTDIR}/usr/bin/gssdp-device-sniffer +} + +gssdp1.2-devel_package() { + depends="libsoup-devel ${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 + } +} From 17aaa22dafca468817823862b66bf3210802dbc2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 13:23:20 +0100 Subject: [PATCH 10/13] New package: gupnp1.2-1.2.4 --- common/shlibs | 1 + srcpkgs/gupnp1.2-devel | 1 + srcpkgs/gupnp1.2/template | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 120000 srcpkgs/gupnp1.2-devel create mode 100644 srcpkgs/gupnp1.2/template diff --git a/common/shlibs b/common/shlibs index 7479b1dfabde08..9a3a73ce38fbdb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -761,6 +761,7 @@ 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 new file mode 120000 index 00000000000000..47db9a589cd7d9 --- /dev/null +++ b/srcpkgs/gupnp1.2-devel @@ -0,0 +1 @@ +gupnp1.2 \ No newline at end of file diff --git a/srcpkgs/gupnp1.2/template b/srcpkgs/gupnp1.2/template new file mode 100644 index 00000000000000..74466be4eed360 --- /dev/null +++ b/srcpkgs/gupnp1.2/template @@ -0,0 +1,39 @@ +# 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 + } +} From 3a8350754d2a5a0e34baad260b848a59becc2807 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 13:38:48 +0100 Subject: [PATCH 11/13] New package: gupnp1.2-igd-1.2.0 --- common/shlibs | 1 + srcpkgs/gupnp1.2-igd-devel | 1 + srcpkgs/gupnp1.2-igd/template | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 120000 srcpkgs/gupnp1.2-igd-devel create mode 100644 srcpkgs/gupnp1.2-igd/template diff --git a/common/shlibs b/common/shlibs index 9a3a73ce38fbdb..574e61aa8edf69 100644 --- a/common/shlibs +++ b/common/shlibs @@ -822,6 +822,7 @@ 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 new file mode 120000 index 00000000000000..a82a041a66b784 --- /dev/null +++ b/srcpkgs/gupnp1.2-igd-devel @@ -0,0 +1 @@ +gupnp1.2-igd \ No newline at end of file diff --git a/srcpkgs/gupnp1.2-igd/template b/srcpkgs/gupnp1.2-igd/template new file mode 100644 index 00000000000000..10714647e7f1e0 --- /dev/null +++ b/srcpkgs/gupnp1.2-igd/template @@ -0,0 +1,31 @@ +# 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" + } +} From 45d67d910aba96ac621f4e8c9663dc3b1130ea01 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:28:07 +0100 Subject: [PATCH 12/13] caja-extensions: use gupnp 1.2 --- srcpkgs/caja-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template index 4860b1e049f2d4..e333e93762fbaa 100644 --- a/srcpkgs/caja-extensions/template +++ b/srcpkgs/caja-extensions/template @@ -1,11 +1,11 @@ # Template file for 'caja-extensions' pkgname=caja-extensions version=1.26.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gksu --disable-static" hostmakedepends="pkg-config intltool glib-devel libxml2" -makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel" +makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp1.2-devel" depends="caja" short_desc="Extensions for the MATE Caja file manager" maintainer="skmpz " From 6079246f3e51a4dc50917e84d2ffc994edf12912 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 22 Jan 2023 11:38:57 +0100 Subject: [PATCH 13/13] farstream: use gupnp 1.2 --- srcpkgs/farstream/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index e93c7a0c23bb53..45a5979e3e9e10 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -1,13 +1,13 @@ # Template file for 'farstream' pkgname=farstream version=0.2.9 -revision=2 +revision=3 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="gupnp-igd-devel libnice-devel gst-plugins-base1-devel" +makedepends="gupnp1.2-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"