From 71e1e1b1fec90319cb0bb868bf2ecf6982d5f90b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 2 Feb 2019 11:45:07 -0800 Subject: [PATCH] shairplay: Update to 2018-08-24 Switched to codeload for easier package bumping. Added PKG_BUILD_PARALLEL for faster compilation. Signed-off-by: Rosen Penev --- sound/shairplay/Makefile | 20 +++++++------- .../patches/002-libavahi-compat-dnssd.patch | 11 -------- ...heck-for-dns_sd.h-in-case-libdl-was-.patch | 26 +++++++++++++++++++ 3 files changed, 36 insertions(+), 21 deletions(-) delete mode 100644 sound/shairplay/patches/002-libavahi-compat-dnssd.patch create mode 100644 sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch diff --git a/sound/shairplay/Makefile b/sound/shairplay/Makefile index ebd2fc780..f5e97e97c 100644 --- a/sound/shairplay/Makefile +++ b/sound/shairplay/Makefile @@ -8,21 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shairplay -PKG_VERSION:=2016-01-01 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/juhovh/shairplay -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=ce80e005908f41d0e6fde1c4a21e9cb8ee54007b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=a77e42fcde7b0d023c94d748e62c100bb0bc06da2adc5d4aff19361e4f1a313d -PKG_MAINTAINER:=Álvaro Fernández Rojas +PKG_SOURCE_DATE:=2018-08-24 +PKG_SOURCE_VERSION:=096b61ad14c90169f438e690d096e3fcf87e504e +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/juhovh/shairplay/tar.gz/$(PKG_SOURCE_VERSION)? +PKG_HASH:=7e2b013ffe75ea2f13fb12b1aa38b8e2e8b1899ac292d57f05d7b352a3a181cf +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) +PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/sound/shairplay/patches/002-libavahi-compat-dnssd.patch b/sound/shairplay/patches/002-libavahi-compat-dnssd.patch deleted file mode 100644 index ff70e24a6..000000000 --- a/sound/shairplay/patches/002-libavahi-compat-dnssd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/lib/dnssd.c -+++ b/src/lib/dnssd.c -@@ -167,7 +167,7 @@ dnssd_init(int *error) - return NULL; - } - #elif USE_LIBDL -- dnssd->module = dlopen("libdns_sd.so", RTLD_LAZY); -+ dnssd->module = dlopen("libdns_sd.so.1", RTLD_LAZY); - if (!dnssd->module) { - if (error) *error = DNSSD_ERROR_LIBNOTFOUND; - free(dnssd); diff --git a/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch b/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch new file mode 100644 index 000000000..5aa5c5300 --- /dev/null +++ b/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch @@ -0,0 +1,26 @@ +From 031c3d802e51bbc233b1044f812402a66bfcf237 Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Fri, 21 Dec 2018 20:39:11 +0100 +Subject: [PATCH] [configure] - only check for dns_sd.h in case libdl was not + found + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5a4b8ad..682d74b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ LT_LIB_DLLOAD + + # Checks for header files. + AC_HEADER_STDC +-if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen" ++if test no = "$libltdl_cv_func_dlopen" && test no = "$libltdl_cv_lib_dl_dlopen" + then + AC_CHECK_HEADERS([dns_sd.h], [], + [AC_MSG_ERROR([Could not find dns_sd.h header, please install libavahi-compat-libdnssd-dev or equivalent.])]) +-- +2.17.1 +