From b924c3e001c95ce15bdf1a57b2bf5923e62ee51b Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 29 Dec 2019 13:28:34 +0200
Subject: [PATCH] gnunet: update to version 0.12.1

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 net/gnunet/Makefile                           |  7 +++-
 ...fix-opus-and-pulse-library-detection.patch | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 1381fc6aa9..e3504e4196 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
 
-PKG_VERSION:=0.12.0
+PKG_VERSION:=0.12.1
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=2184ace2960e4757969f3cd6bc0dba6f136871bf7bcca5d80a7147bde0d2e0af
+PKG_HASH:=5553014dfa8b9aefa96fe83c6a8b8a84a28b30655df0ce283fd3e44a5a1b1f7e
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
@@ -41,6 +41,9 @@ CONFIGURE_ARGS+= \
 	--with-libunistring-prefix=$(STAGING_DIR)/usr \
 	--with-microhttpd=$(STAGING_DIR)/usr
 
+# upstream now provides --with-pulseaudio but doesn't detect rpath
+TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
+
 define Package/gnunet/Default
   SECTION:=net
   CATEGORY:=Network
diff --git a/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch b/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch
new file mode 100644
index 0000000000..9b2743655b
--- /dev/null
+++ b/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch
@@ -0,0 +1,38 @@
+diff --git a/configure.ac b/configure.ac
+index e2c4dd39f..95053e672 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -803,10 +803,12 @@ AC_ARG_WITH(libpulse,
+             LDFLAGS="-L$with_libpulse/lib $LDFLAGS"
+             CPPFLAGS="-I$with_libpulse/include $CPPFLAGS"
+             AC_CHECK_HEADERS(pulse/simple.h,
+-                             AC_CHECK_LIB([pulse],
+-                                          [pa_stream_peek],
+-                                          EXT_LIB_PATH="-L$with_libpulse/lib $EXT_LIB_PATH"
+-                                          pulse=1))
++                             AC_CHECK_DECL([pa_stream_peek],
++                                       [pulse=1],
++                                       [],
++                                       [[
++                                       #include <pulse/stream.h>
++                                       ]]))
+         ])
+     ],
+     [AC_MSG_RESULT([--with-libpulse not specified])
+@@ -846,10 +848,12 @@ AC_ARG_WITH(libopus,
+         LDFLAGS="-L$with_libopus/lib $LDFLAGS"
+         CPPFLAGS="-I$with_libopus/include $CPPFLAGS"
+         AC_CHECK_HEADERS(opus/opus.h,
+-                         AC_CHECK_LIB([opus],
+-                                      [OPUS_SET_GAIN],
+-                                      EXT_LIB_PATH="-L$with_libopus/lib $EXT_LIB_PATH"
+-                                      opus=1))
++                         AC_CHECK_DECL([OPUS_SET_GAIN],
++                                       [opus=1],
++                                       [],
++                                       [[
++                                       #include <opus/opus.h>
++                                       ]]))
+       ])
+     ],
+     [AC_MSG_RESULT([--with-libopus not specified])
-- 
2.30.2