Merge pull request #12766 from flyn-org/master

Update dmapd and libdmapsharing

libs/libdmapsharing/Makefile

@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdmapsharing
-PKG_VERSION:=3.9.8
+PKG_VERSION:=3.9.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/libdmapsharing/
-PKG_HASH:=66f154602cf4f444ff3de70be74ae75b932f512c031d21374257d349f11f9710
+PKG_HASH:=e216425d61a109f08f0ac93065f4603d1e61ebd85c09802c03a9ecce5bb35094
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -42,7 +42,7 @@ define Package/libdmapsharing/decription
 endef
 
 CONFIGURE_ARGS += \
-	--disable-check \
+	--disable-tests \
 	--disable-gtk-doc \
 	--disable-introspection
 

libs/libdmapsharing/patches/001-disable_pixbuf.patch

@@ -1,18 +1,16 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,18 +126,7 @@ dnl make GOBJECT_CFLAGS and GOBJECT_LIBS
+diff -u --recursive libdmapsharing-3.9.10-vanilla/configure.ac libdmapsharing-3.9.10/configure.ac
+--- libdmapsharing-3.9.10-vanilla/configure.ac	2020-07-08 08:04:40.000000000 -0400
++++ libdmapsharing-3.9.10/configure.ac	2020-07-08 21:34:56.960942899 -0400
+@@ -125,15 +125,7 @@
  AC_SUBST(GOBJECT_CFLAGS)
  AC_SUBST(GOBJECT_LIBS)
  
--dnl Check for gdk-pixbuf, needed for DACP Now Playing Artwork
--PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0,
--  HAVE_GDKPIXBUF=yes,
--  HAVE_GDKPIXBUF=no)
--
+-# Have gdkpixbuf?
+-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, HAVE_GDKPIXBUF=yes, HAVE_GDKPIXBUF=no)
 -if test x"$HAVE_GDKPIXBUF" = "xyes"; then
--  AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
+-	AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
 -else
--  AC_WARN(Gdk-pixbuf library not present, Now Playing artwork might be affected.)
+-	AC_MSG_WARN([Gdk-pixbuf library not present; now-playing artwork might be affected])
 -fi
 -
 -AM_CONDITIONAL(USE_GDKPIXBUF, test x"$HAVE_GDKPIXBUF" = "xyes")

libs/libdmapsharing/patches/002-disable_tests.patch

@@ -1,8 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = libdmapsharing vala tests doc
-+SUBDIRS = libdmapsharing vala doc
- DIST_SUBDIRS = $(SUBDIRS) m4 media
- 
- # pcfiles = libdmapsharing-@LIBDMAPSHARING_MAJORMINOR@.pc

net/dmapd/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dmapd
-PKG_VERSION:=0.0.84
+PKG_VERSION:=0.0.85
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/dmapd
-PKG_HASH:=96d134e7c6d8e0394ee654903a184bfc200a3139692d124e7b11a3400138c8b2
+PKG_HASH:=69800cb96c91f6362432ec50df8f810e0ca1c499c6468e84c30731ea3b67dd78
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1