Build against gupnp-1.2 and gssdp-1.2

3 files changed, 49 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1437d5d32e2..5d47a13111be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librm
 	pkgdesc = Router Manager library
 	pkgver = 2.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.tabos.org/
 	arch = i686
 	arch = x86_64
@@ -17,15 +17,17 @@ pkgbase = librm
 	depends = spandsp
 	depends = json-glib
 	depends = libsndfile
-	depends = gupnp-1.0
-	depends = gssdp-1.0
+	depends = gupnp
+	depends = gssdp
 	depends = gstreamer
 	depends = gst-plugins-base
 	depends = isdn4k-utils
 	depends = libsecret
 	options = !emptydirs
 	source = git+https://gitlab.com/tabos/librm.git#tag=v2.1.0
+	source = gupnp-gssdp-1.2.patch
 	sha512sums = SKIP
+	sha512sums = ff00431718e9cb6aaa0f28c910c4409bbcd792a6916a2192c8d62056eb7457ef8a6932deb9fb35d939d6ee52e024805214d04372c70b8deee59c041eea52e404
 
 pkgname = librm
 
diff --git a/PKGBUILD b/PKGBUILD
index cd76fe84283c..a6a37c71c2bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,36 @@
 
 pkgname=librm
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Router Manager library"
 arch=('i686' 'x86_64')
 url="https://www.tabos.org/"
 license=('GPL2')
 
-depends=(glib2 gdk-pixbuf2 libsoup speex libxml2 libtiff spandsp json-glib libsndfile gupnp-1.0 gssdp-1.0 gstreamer gst-plugins-base isdn4k-utils libsecret)
+depends=(glib2 gdk-pixbuf2 libsoup speex libxml2 libtiff spandsp json-glib libsndfile gupnp gssdp gstreamer gst-plugins-base isdn4k-utils libsecret)
 makedepends=(meson git)
 
 options=('!emptydirs')
 # source=("git+https://git.krueger-it.net/tabos.org/${pkgname}.git#tag=v${pkgver}")
-source=("git+https://gitlab.com/tabos/${pkgname}.git#tag=v${pkgver}")
-sha512sums=('SKIP')
+source=(
+  "git+https://gitlab.com/tabos/${pkgname}.git#tag=v${pkgver}"
+  "gupnp-gssdp-1.2.patch"
+)
+sha512sums=(
+  'SKIP'
+  'ff00431718e9cb6aaa0f28c910c4409bbcd792a6916a2192c8d62056eb7457ef8a6932deb9fb35d939d6ee52e024805214d04372c70b8deee59c041eea52e404'
+)
 
 pkgver() {
-  cd $pkgname
+  cd "${srcdir}/${pkgname}"
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
+prepare() {
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i "${srcdir}/gupnp-gssdp-1.2.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}"
   meson --prefix /usr --buildtype=plain "builddir"
diff --git a/gupnp-gssdp-1.2.patch b/gupnp-gssdp-1.2.patch
new file mode 100644
index 000000000000..384038d7b6da
--- /dev/null
+++ b/gupnp-gssdp-1.2.patch
@@ -0,0 +1,28 @@
+diff --git a/meson.build b/meson.build
+index be8a56c..003e4ef 100644
+--- a/meson.build
++++ b/meson.build
+@@ -50,8 +50,8 @@ rm_dep += dependency('spandsp')
+ rm_dep += dependency('json-glib-1.0')
+ rm_dep += dependency('gmodule-2.0')
+ rm_dep += dependency('sndfile')
+-rm_dep += dependency('gupnp-1.0')
+-rm_dep += dependency('gssdp-1.0')
++rm_dep += dependency('gupnp-1.2')
++rm_dep += dependency('gssdp-1.2')
+ 
+ # Include GTK integration libs for OS X
+ if os_darwin
+diff --git a/rm/rmssdp.c b/rm/rmssdp.c
+index 912c563..c6f0de0 100644
+--- a/rm/rmssdp.c
++++ b/rm/rmssdp.c
+@@ -129,7 +129,7 @@ static void rm_on_context_available(GUPnPContextManager *manager, GUPnPContext *
+ void rm_ssdp_init(void)
+ {
+ 	g_debug("%s(): Initialize upnp context manager", __FUNCTION__);
+-	rm_context_manager = gupnp_context_manager_new(NULL, 1900);
++	rm_context_manager = gupnp_context_manager_create(1900);
+ 
+ 	g_signal_connect(rm_context_manager, "context-available", G_CALLBACK(rm_on_context_available), NULL);
+ }