rtl-sdr: build fix

too much static is ironic in a radio package ...

3 files changed, 54 insertions, 1 deletions

diff --git a/ham/rtl-sdr/distinfo b/ham/rtl-sdr/distinfo
index f92a71ae1dd..f8922200ca3 100644
--- a/ham/rtl-sdr/distinfo
+++ b/ham/rtl-sdr/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.9 2019/02/02 14:35:15 tnn Exp $
+$NetBSD: distinfo,v 1.10 2019/02/03 10:42:19 tnn Exp $
 
 SHA1 (rtl-sdr-0.6.0.tar.gz) = 91a4499110ab27fe4e15e9425ab95145342cdd82
 RMD160 (rtl-sdr-0.6.0.tar.gz) = f02dfa2079f924967e2ee22b2e424e7d4a0ec521
 SHA512 (rtl-sdr-0.6.0.tar.gz) = a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
 Size (rtl-sdr-0.6.0.tar.gz) = 134289 bytes
 SHA1 (patch-cmake_Modules_FindLibUSB.cmake) = 95df1dd9ff3b9d5cf7afc55cc5f80cabe1d90491
+SHA1 (patch-src_rtl__adsb.c) = 412c948ad89f0af97dddbccdd5c288cf51afcee5
 SHA1 (patch-src_rtl__fm_c) = 04ec7142f38f26d2ed431765017f53e8e79a3a36
+SHA1 (patch-src_rtl__power.c) = 3d1244b58b75ab56fcbdf619adbc52b1cbd769e6
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..e1add2e0b57
--- /dev/null
+++ b/ham/rtl-sdr/patches/patch-src_rtl__adsb.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_rtl__adsb.c,v 1.3 2019/02/03 10:42:19 tnn Exp $
+
+GCC does not like duplicate static keyword
+
+--- src/rtl_adsb.c.orig	2019-02-03 09:38:28.472977070 +0000
++++ src/rtl_adsb.c
+@@ -183,7 +183,7 @@ int magnitute(uint8_t *buf, int len)
+ 	return len/2;
+ }
+ 
+-static static 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;
+@@ -224,17 +224,17 @@ static static inline uint16_t single_man
+ 	return BADSAMPLE;
+ }
+ 
+-static static 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;
+ }
+ 
+-static static 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;
+ }
+ 
+-static static 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..21bb2aa9ee4
--- /dev/null
+++ b/ham/rtl-sdr/patches/patch-src_rtl__power.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rtl__power.c,v 1.3 2019/02/03 10:42:19 tnn Exp $
+
+GCC does not like duplicate static keyword
+
+--- src/rtl_power.c.orig	2019-02-03 09:38:28.488240147 +0000
++++ src/rtl_power.c
+@@ -250,7 +250,7 @@ void sine_table(int size)
+ 	}
+ }
+ 
+-static static 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;