diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/jpeg-autoreconf.diff | 20 | ||||
| -rw-r--r-- | patches/libusb-timespec.diff | 18 | ||||
| -rw-r--r-- | patches/rtlsdr-flarm-android.diff | 47 |
3 files changed, 85 insertions, 0 deletions
diff --git a/patches/jpeg-autoreconf.diff b/patches/jpeg-autoreconf.diff new file mode 100644 index 0000000..3db5dfc --- /dev/null +++ b/patches/jpeg-autoreconf.diff @@ -0,0 +1,20 @@ +--- work/jpeg-8d/configure.ac.old 2014-09-14 23:30:41.358102354 +0200 ++++ work/jpeg-8d/configure.ac 2014-09-14 23:31:04.302216128 +0200 +@@ -21,15 +21,14 @@ + + # Initialize Automake + # Don't require all the GNU mandated files +-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign]) ++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign]) + + # Make --enable-silent-rules the default. + # To get verbose build output you may configure + # with --disable-silent-rules or use "make V=1". + AM_SILENT_RULES([yes]) + +-# This is required when using the de-ANSI-fication feature. +-AM_C_PROTOTYPES ++AM_PROG_AR + + # Add configure option --enable-maintainer-mode which enables + # dependency checking and generation useful to package maintainers. diff --git a/patches/libusb-timespec.diff b/patches/libusb-timespec.diff new file mode 100644 index 0000000..709daf0 --- /dev/null +++ b/patches/libusb-timespec.diff @@ -0,0 +1,18 @@ +--- work/libusb-1.0.9-orig/libusb/io.c 2014-09-14 23:33:05.286816058 +0200 ++++ work/libusb-1.0.9/libusb/io.c 2014-09-14 23:35:13.255450621 +0200 +@@ -1046,6 +1046,15 @@ + * give up the events lock if instructed. + */ + ++/* Android workaround */ ++#ifndef TIMESPEC_TO_TIMEVAL ++#define TIMESPEC_TO_TIMEVAL(tv, ts) \ ++ do { \ ++ (tv)->tv_sec = (ts)->tv_sec; \ ++ (tv)->tv_usec = (ts)->tv_nsec / 1000; \ ++ } while(0) ++#endif /* end of TIMESPEC_TO_TIMEVAL */ ++ + int usbi_io_init(struct libusb_context *ctx) + { + int r; diff --git a/patches/rtlsdr-flarm-android.diff b/patches/rtlsdr-flarm-android.diff new file mode 100644 index 0000000..65ee3a0 --- /dev/null +++ b/patches/rtlsdr-flarm-android.diff @@ -0,0 +1,47 @@ +--- /dev/null 2014-09-01 14:32:42.899820178 +0200 ++++ rtlsdr-flarm-0.1.2/Makefile.android 2014-09-15 01:07:11.454813894 +0200 +@@ -0,0 +1,24 @@ ++VERSION = 0.1.2 ++ ++CXX=../toolchain/arm-linux-androideabi/bin/g++ ++FLAGS = -O2 -DRTLSDR_FLARM_VERSION=$(VERSION) -I../toolchain/include -D__MACH__ ++FLAGS += -Wall ++FLAGS += -g ++ ++rtlsdr-flarm-android: rtlsdr-flarm-android.o ++ $(CXX) -o $@ $< \ ++ ../toolchain/lib/librtlsdr.a ../toolchain/lib/libfftw3.a ../toolchain/lib/libfftw3f.a \ ++ ../toolchain/lib/libusb-1.0.a ../toolchain/lib/libjpeg.a ../toolchain/lib/libconfig.a ++ ++rtlsdr-flarm-android.o: rtlsdr-flarm.cc rtlsdr.h thread.h fft.h buffer.h image.h aircraft.h flarmframe.h flarmdemod.h sysmon.h ++ $(CXX) $(FLAGS) -c rtlsdr-flarm.cc -o $@ ++ ++debug: ++ adb push rtlsdr-flarm-android /system/vendor/bin/ ++ adb push Example.conf /system/vendor/bin/rtlsdr-flarm.conf ++ adb shell chmod 777 /system/vendor/bin/rtlsdr-flarm-android ++ adb shell gdbserver 0.0.0.0:5000 /system/vendor/bin/rtlsdr-flarm-android /system/vendor/bin/rtlsdr-flarm.conf ++ ++ ++clean: ++ rm -vf rtlsdr-flarm-android.o rtlsdr-flarm-android +--- rtlsdr-flarm-0.1.2-orig/fft.h 2014-09-15 01:09:18.339443081 +0200 ++++ rtlsdr-flarm-0.1.2/fft.h 2014-09-15 01:04:38.710056473 +0200 +@@ -32,7 +32,7 @@ + { if( (Size==this->Size) && (Sign==this->Sign) ) return Size; + Free(); + Buffer = (std::complex<Float> *)fftw_malloc(Size*sizeof(std::complex<Float>)); if(Buffer==0) return -1; +- Plan = fftw_plan_dft_1d(Size, (fftw_complex *)Buffer, (fftw_complex *)Buffer, Sign, FFTW_MEASURE); ++ Plan = fftw_plan_dft_1d(Size, (fftw_complex *)Buffer, (fftw_complex *)Buffer, Sign, FFTW_ESTIMATE); + this->Size=Size; this->Sign=Sign; return Size; } + + int PresetForward(int Size) { return Preset(Size, FFTW_FORWARD); } +@@ -74,7 +74,7 @@ + { if( (Size==this->Size) && (Sign==this->Sign) ) return Size; + Free(); + Buffer = (std::complex<float> *)fftwf_malloc(Size*sizeof(std::complex<float>)); if(Buffer==0) return -1; +- Plan = fftwf_plan_dft_1d(Size, (fftwf_complex *)Buffer, (fftwf_complex *)Buffer, Sign, FFTW_MEASURE); ++ Plan = fftwf_plan_dft_1d(Size, (fftwf_complex *)Buffer, (fftwf_complex *)Buffer, Sign, FFTW_ESTIMATE); + this->Size=Size; this->Sign=Sign; return Size; } + + int PresetForward(int Size) { return Preset(Size, FFTW_FORWARD); } |