On 2016/09/09 10:19, Aaron Poffenberger wrote: > Hello ports@, > > Here is an upate to: comms/rtl-sdr > > Tested on: amd64 and bog-standard rtl-sdr device. > > -------- > > To build gr-osmosdr we need the newer version of rtl-sdr (mostly > definitions for newer devices). Upstream have not released a new > version since 2014. I've changed the Makefile to pull from a specific > github commit. > > Cheers, > Aaron > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/comms/rtl-sdr/Makefile,v > retrieving revision 1.4 > diff -u -p -u -r1.4 Makefile > --- Makefile 4 Mar 2016 10:11:21 -0000 1.4 > +++ Makefile 17 Aug 2016 19:11:39 -0000 > @@ -2,8 +2,12 @@ > > COMMENT= software to turn RTL2832U into an SDR > > -DISTNAME= rtl-sdr-0.20130412 > -REVISION= 1 > +DISTNAME= rtl-sdr-0.20150516 > +REVISION= 0
Remove REVISION > +GH_ACCOUNT = steve-m > +GH_PROJECT = librtlsdr > +GH_COMMIT = 8b4d755ba1b889510fba30f627ee08736203070d > > SHARED_LIBS= rtlsdr 0.0 Check if ABI changed and decide whether to bump minor, major or none - http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs > @@ -17,9 +21,6 @@ MAINTAINER= Stuart Henderson <sthen@open > PERMIT_PACKAGE_CDROM= Yes > > WANTLIB += c m pthread usb-1.0 > - > -# http://cgit.osmocom.org/rtl-sdr > -MASTER_SITES= http://spacehopper.org/mirrors/ > > MODULES= devel/cmake > LIB_DEPENDS= devel/libusb1 > Index: distinfo > =================================================================== > RCS file: /cvs/ports/comms/rtl-sdr/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -u -r1.1.1.1 distinfo > --- distinfo 21 Apr 2013 11:45:08 -0000 1.1.1.1 > +++ distinfo 17 Aug 2016 18:11:42 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (rtl-sdr-0.20130412.tar.gz) = > yziYeP445KTe5VWGCLV2QSRNjTryKrgk/qvSJyCdGKU= > -SIZE (rtl-sdr-0.20130412.tar.gz) = 112343 > +SHA256 (rtl-sdr-0.20150516.tar.gz) = > mwtz0Gn5ogxsS+tIB0xVvdFRuR7/c8vHcPMVfqlFxt4= > +SIZE (rtl-sdr-0.20150516.tar.gz) = 118734 > Index: patches/patch-src_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/comms/rtl-sdr/patches/patch-src_CMakeLists_txt,v > retrieving revision 1.1.1.1 > diff -u -p -u -r1.1.1.1 patch-src_CMakeLists_txt > --- patches/patch-src_CMakeLists_txt 21 Apr 2013 11:45:08 -0000 1.1.1.1 > +++ patches/patch-src_CMakeLists_txt 17 Aug 2016 19:08:36 -0000 > @@ -1,16 +1,15 @@ > -$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2013/04/21 11:45:08 sthen Exp $ > ---- src/CMakeLists.txt.orig Fri Apr 12 21:51:14 2013 > -+++ src/CMakeLists.txt Sun Apr 21 12:17:27 2013 > -@@ -101,12 +101,17 @@ target_link_libraries(rtl_adsb rtlsdr_shared > - if(UNIX) > +$OpenBSD$ > +--- src/CMakeLists.txt.orig Fri May 15 17:48:37 2015 > ++++ src/CMakeLists.txt Wed Aug 17 14:07:14 2016 > +@@ -125,11 +125,16 @@ if(UNIX) > target_link_libraries(rtl_fm m) > target_link_libraries(rtl_adsb m) > + target_link_libraries(rtl_power m) > -if(APPLE) > - target_link_libraries(rtl_test m) > -else() > - target_link_libraries(rtl_test m rt) > -endif() > --endif() > + > +include(CheckFunctionExists) > +check_function_exists(clock_gettime LIBRT_LIBC_HAS_CLOCK_GETTIME) > @@ -21,7 +20,6 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.1 > +endif(LIBRT_LIBC_HAS_CLOCK_GETTIME) > + > +target_link_libraries(rtl_test m ${LIBRT_LIBRARIES}) > -+endif(UNIX) > + endif() > > if(WIN32) > - target_link_libraries(rtl_sdr libgetopt_static) > Index: patches/patch-src_librtlsdr_c > =================================================================== > RCS file: /cvs/ports/comms/rtl-sdr/patches/patch-src_librtlsdr_c,v > retrieving revision 1.1.1.1 > diff -u -p -u -r1.1.1.1 patch-src_librtlsdr_c > --- patches/patch-src_librtlsdr_c 21 Apr 2013 11:45:08 -0000 1.1.1.1 > +++ patches/patch-src_librtlsdr_c 17 Aug 2016 19:07:45 -0000 > @@ -1,7 +1,7 @@ > -$OpenBSD: patch-src_librtlsdr_c,v 1.1.1.1 2013/04/21 11:45:08 sthen Exp $ > ---- src/librtlsdr.c.orig Sat Apr 13 15:00:44 2013 > -+++ src/librtlsdr.c Sat Apr 13 15:00:50 2013 > -@@ -1340,10 +1340,12 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t > index > +$OpenBSD$ > +--- src/librtlsdr.c.orig Fri May 15 17:48:37 2015 > ++++ src/librtlsdr.c Wed Aug 17 13:11:47 2016 > +@@ -1476,10 +1476,12 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t > index > r = libusb_open(device, &dev->devh); > if (r < 0) { > libusb_free_device_list(list, 1); > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/comms/rtl-sdr/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -u -r1.3 PLIST > --- pkg/PLIST 22 May 2015 11:31:11 -0000 1.3 > +++ pkg/PLIST 17 Aug 2016 19:08:59 -0000 > @@ -1,6 +1,7 @@ > @comment $OpenBSD: PLIST,v 1.3 2015/05/22 11:31:11 ajacoutot Exp $ > @bin bin/rtl_eeprom > @bin bin/rtl_fm > +@bin bin/rtl_power > @bin bin/rtl_sdr > @bin bin/rtl_test > include/rtl-sdr.h >
