Page MenuHomeFreeBSD
Files F109111579

D14243.diff
No OneTemporary
Actions

D14243.diff
View Options

Index: comms/gnuradio/Makefile
===================================================================
--- comms/gnuradio/Makefile
+++ comms/gnuradio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gnuradio
-PORTVERSION= 3.7.10.1
-PORTREVISION= 10
+PORTVERSION= 3.7.11
CATEGORIES= comms astro hamradio
MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
LOCAL/db
@@ -12,16 +11,17 @@
LICENSE= GPLv3
-BUILD_DEPENDS= sdl-config:devel/sdl12 \
- swig3.0:devel/swig30 \
- cheetah:devel/py-cheetah@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
- xdg-open:devel/xdg-utils \
- guile:lang/guile \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYNUMPY} \
+ ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \
aconnect:audio/alsa-utils \
+ cheetah:devel/py-cheetah@${PY_FLAVOR} \
git:devel/git \
- ${PYNUMPY} \
- ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR}
+ guile:lang/guile \
+ minixmlto:textproc/minixmlto \
+ sdl-config:devel/sdl12 \
+ swig3.0:devel/swig30 \
+ xdg-open:devel/xdg-utils
LIB_DEPENDS= libcppunit.so:devel/cppunit \
libcodec2.so:audio/codec2 \
libfftw3.so:math/fftw3 \
@@ -47,13 +47,14 @@
SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \
gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
-CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
- -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
- -DICONV_LIB:STRING="X${ICONV_LIB}" \
+CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
-DENABLE_GR_CTRLPORT="YES" \
+ -DICONV_LIB:STRING="X${ICONV_LIB}" \
+ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
-DLOCALBASE:STRING="${LOCALBASE}" \
-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
- -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}"
+ -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
+ -DXMLTO_EXECUTABLE:STRING=minixmlto
# for detailed debugging uncomment the next line
#CMAKE_ARGS+= --debug-output --trace
MAJOR_SUB_VER= ${PORTVERSION}
Index: comms/gnuradio/distinfo
===================================================================
--- comms/gnuradio/distinfo
+++ comms/gnuradio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482969389
-SHA256 (gnuradio-3.7.10.1.tar.gz) = 63d7b65cc4abe22f47b8f41caaf7370a0a502b91e36e29901ba03e8838ab4937
-SIZE (gnuradio-3.7.10.1.tar.gz) = 4272430
+TIMESTAMP = 1516377322
+SHA256 (gnuradio-3.7.11.tar.gz) = 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4
+SIZE (gnuradio-3.7.11.tar.gz) = 4357123
Index: comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
===================================================================
--- comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig 2016-09-02 04:16:13 UTC
-+++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
-@@ -42,7 +42,7 @@ namespace gr {
- d_p = p; d_m = m;
-
- //maximum number of elements in the GF(p^m)
-- int q = powl(p, m);
-+ int q = pow(p, m);
-
- d_gf_exp = new unsigned char[q];
- if (d_gf_exp == NULL) {
Index: comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
===================================================================
--- comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gr-fcd/lib/hid/hid-libusb.c.orig 2016-09-02 04:16:14 UTC
-+++ gr-fcd/lib/hid/hid-libusb.c
-@@ -250,8 +250,8 @@ static int get_usage(uint8_t *report_des
- }
- #endif /* INVASIVE_GET_USAGE */
-
--#ifdef __FreeBSD__
--/* The FreeBSD version of libusb doesn't have this funciton. In mainline
-+#ifndef HAVE_LIBUSB_GET_STRING_DESCRIPTOR
-+/* The FreeBSD version of libusb doesn't have this function. In mainline
- libusb, it's inlined in libusb.h. This function will bear a striking
- resemblence to that one, because there's about one way to code it.
-
-@@ -756,8 +756,12 @@ static void *read_thread(void *param)
- if no transfers are pending, but that's OK. */
- libusb_cancel_transfer(dev->transfer);
-
-+#if 0
- while (!dev->cancelled)
- libusb_handle_events_completed(usb_context, &dev->cancelled);
-+#endif
-+ while (!dev->cancelled)
-+ libusb_handle_events(NULL);
-
- /* Now that the read thread is stopping, Wake any threads which are
- waiting on data (in hid_read_timeout()). Do this under a mutex to

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 1, 10:53 PM (20 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16391841
Default Alt Text
D14243.diff (4 KB)

Event Timeline