Use "static inline" to fix build on osx

4 files changed, 56 insertions, 3 deletions

diff --git a/ham/rtl-sdr/Makefile b/ham/rtl-sdr/Makefile
index baa1b24671e..cb9499c9a8c 100644
--- a/ham/rtl-sdr/Makefile
+++ b/ham/rtl-sdr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/01/26 16:22:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/07 12:10:55 wiedi Exp $
 
 DISTNAME=		rtl-sdr-0.5.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		ham
 MASTER_SITES=		${MASTER_SITE_GITHUB:=steve-m/}
 GITHUB_PROJECT=		librtlsdr
diff --git a/ham/rtl-sdr/distinfo b/ham/rtl-sdr/distinfo
index a5ff5692ada..cb5e0f9128b 100644
--- a/ham/rtl-sdr/distinfo
+++ b/ham/rtl-sdr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/01/26 09:10:39 dbj Exp $
+$NetBSD: distinfo,v 1.6 2016/04/07 12:10:55 wiedi Exp $
 
 SHA1 (rtl-sdr-0.5.3.tar.gz) = f6f20f7b0562a6d3f7b9ff7bff38a15bff175982
 RMD160 (rtl-sdr-0.5.3.tar.gz) = 3b30938053870ed2d4b261ac9e27ad0863762ca4
@@ -6,5 +6,7 @@ SHA512 (rtl-sdr-0.5.3.tar.gz) = b2887b5df2728f8481b07fb4d8b9bee18b98c5c0ccd0c8e6
 Size (rtl-sdr-0.5.3.tar.gz) = 117414 bytes
 SHA1 (patch-cmake_Modules_FindLibUSB.cmake) = 95df1dd9ff3b9d5cf7afc55cc5f80cabe1d90491
 SHA1 (patch-src_librtlsdr.c) = 881418afaff87e98511e955cb0ed4d40fba19237
+SHA1 (patch-src_rtl__adsb.c) = 15cc0c9f2641523da0bb9ce7dd0d1bdc6b52252a
 SHA1 (patch-src_rtl__fm_c) = 04ec7142f38f26d2ed431765017f53e8e79a3a36
+SHA1 (patch-src_rtl__power.c) = 2b84120530ef384540ed84a5b55af96971e5f597
 SHA1 (patch-src_tuner__r82xx.c) = 54763a749eaa64e2c7f816cfe04df8b76eff93c9
diff --git a/ham/rtl-sdr/patches/patch-src_rtl__adsb.c b/ham/rtl-sdr/patches/patch-src_rtl__adsb.c
new file mode 100644
index 00000000000..d828998561d
--- /dev/null
+++ b/ham/rtl-sdr/patches/patch-src_rtl__adsb.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_rtl__adsb.c,v 1.1 2016/04/07 12:10:55 wiedi Exp $
+
+Use "static inline" to fix build on osx
+
+--- src/rtl_adsb.c.orig	2014-02-07 01:04:24.000000000 +0000
++++ src/rtl_adsb.c
+@@ -180,7 +180,7 @@ int magnitute(uint8_t *buf, int len)
+ 	return len/2;
+ }
+ 
+-inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
++static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
+ /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
+ {
+ 	int bit, bit_p;
+@@ -221,17 +221,17 @@ inline uint16_t single_manchester(uint16
+ 	return BADSAMPLE;
+ }
+ 
+-inline uint16_t min16(uint16_t a, uint16_t b)
++static inline uint16_t min16(uint16_t a, uint16_t b)
+ {
+ 	return a<b ? a : b;
+ }
+ 
+-inline uint16_t max16(uint16_t a, uint16_t b)
++static inline uint16_t max16(uint16_t a, uint16_t b)
+ {
+ 	return a>b ? a : b;
+ }
+ 
+-inline int preamble(uint16_t *buf, int i)
++static inline int preamble(uint16_t *buf, int i)
+ /* returns 0/1 for preamble at index i */
+ {
+ 	int i2;
diff --git a/ham/rtl-sdr/patches/patch-src_rtl__power.c b/ham/rtl-sdr/patches/patch-src_rtl__power.c
new file mode 100644
index 00000000000..a02c72adb15
--- /dev/null
+++ b/ham/rtl-sdr/patches/patch-src_rtl__power.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rtl__power.c,v 1.1 2016/04/07 12:10:55 wiedi Exp $
+
+Use "static inline" to fix build on osx
+
+--- src/rtl_power.c.orig	2014-02-07 01:04:24.000000000 +0000
++++ src/rtl_power.c
+@@ -249,7 +249,7 @@ void sine_table(int size)
+ 	}
+ }
+ 
+-inline int16_t FIX_MPY(int16_t a, int16_t b)
++static inline int16_t FIX_MPY(int16_t a, int16_t b)
+ /* fixed point multiply and scale */
+ {
+ 	int c = ((int)a * (int)b) >> 14;