Attachment #161640 for bug #203500

View | Details | Raw Unified | Return to bug 203500
Collapse All | Expand All




# $FreeBSD: head/comms/gnuradio/Makefile 396889 2015-09-14 11:16:55Z amdmi3 $

PORTNAME=	gnuradio
PORTVERSION=	3.7.8
PORTREVISION=	1
CATEGORIES=	comms astro hamradio
MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
		LOCAL/db

		libgsl.so:${PORTSDIR}/math/gsl
RUN_DEPENDS:=	${BUILD_DEPENDS}

# USES=compiler:c11 is necessary because base GCC fails:
# volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
# volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
# volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
USES=		cmake:outsource compiler:c11 iconv perl5 python:2.7 shebangfix
SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \

		-DENABLE_GR_CTRLPORT="YES"
# for detailed debugging uncomment the next two lines as needed
#CMAKE_ARGS+=	--debug-output --trace
MAJOR_SUB_VER=	3.7.8
DOCSDIR=	share/doc/${PORTNAME}-${MAJOR_SUB_VER}
USE_GNOME=	pygtk2
USE_WX=		3.0+

USE_LDCONFIG=	yes
PLIST_SUB+=	MAJOR_VERSION="3"
PLIST_SUB+=	MAJOR_SUB_VER="${MAJOR_SUB_VER}"
LIBSTRIP_FILES=	analog atsc audio blocks channels digital dtv fcd fec fft\
		filter noaa pager pmt qtgui runtime trellis video-sdl\
		vocoder wavelet wxgui

OPTIONS_DEFINE=		USRP TESTING
# Unfortunately building docs on i386 fails

# Yay. building docs is broken on 10 and HEAD too so turn them all off
OPTIONS_EXCLUDE=	DOCS
OPTIONS_DEFAULT=	USRP
OPTIONS_SUB=		yes
USRP_DESC=	Include USRP support (UHD) from Ettus
TESTING_DESC=	Include testing support


TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
TESTING_BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MUSRP}
LIBSTRIP_FILES+=	uhd
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
USE_GCC=	yes
.endif

	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
		${WRKSRC}/cmake/Modules/FindPortaudio.cmake

post-install:
.for a in ${LIBSTRIP_FILES}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}
.endfor

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (gnuradio-3.7.7.1.tar.gz) = 2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e	1	SHA256 (gnuradio-3.7.8.tar.gz) = fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172
2	SIZE (gnuradio-3.7.7.1.tar.gz) = 3845988	2	SIZE (gnuradio-3.7.8.tar.gz) = 3990172

Lines 1-4 Link Here

(-)./files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2015-05-12 09:39:44 UTC	1	--- CMakeLists.txt.orig 2015-07-25 20:27:13 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)	3	@@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)
4	project(gnuradio CXX C)	4	project(gnuradio CXX C)
Lines 15-21 Link Here
15	@@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO	15	@@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
16	########################################################################	16	########################################################################
17	include(GrPlatform) #define LIB_SUFFIX	17	include(GrPlatform) #define LIB_SUFFIX
18	set(GR_RUNTIME_DIR bin)	18	set(GR_RUNTIME_DIR bin CACHE PATH "Path to install all binaries")
19	+########################################################################	19	+########################################################################
20	+# FreeBSD libdata vs. lib	20	+# FreeBSD libdata vs. lib
21	+#	21	+#
Lines 24-33 Link Here
24	+else()	24	+else()
25	+set(GR_PKGCONFIG_DIR lib${LIB_SUFFIX})	25	+set(GR_PKGCONFIG_DIR lib${LIB_SUFFIX})
26	+endif()	26	+endif()
27	set(GR_LIBRARY_DIR lib${LIB_SUFFIX})	27	set(GR_LIBRARY_DIR lib${LIB_SUFFIX} CACHE PATH "Path to install libraries")
28	set(GR_INCLUDE_DIR include)	28	set(GR_INCLUDE_DIR include CACHE PATH "Path to install header files")
29	set(GR_DATA_DIR share)	29	set(GR_DATA_DIR share CACHE PATH "Base location for data")
30	@@ -228,6 +241,42 @@ add_custom_target(uninstall	30	@@ -229,6 +242,42 @@ add_custom_target(uninstall
31	include(GrBoost)	31	include(GrBoost)
32		32
33	########################################################################	33	########################################################################
Lines 70-76 Link Here
70	# Enable python component	70	# Enable python component
71	########################################################################	71	########################################################################
72	find_package(PythonLibs 2)	72	find_package(PythonLibs 2)
73	@@ -353,11 +402,13 @@ GR_LOGGING()	73	@@ -354,11 +403,13 @@ GR_LOGGING()
74	########################################################################	74	########################################################################
75	# Distribute the README file	75	# Distribute the README file
76	########################################################################	76	########################################################################

Lines 5-11 Link Here

(-)./files/patch-docs_doxygen_Doxyfile.in (-1 / +1 lines)
5	# set the path where dot can find it.	5	# set the path where dot can find it.
6		6
7	-DOT_FONTPATH =	7	-DOT_FONTPATH =
8	+DOT_FONTPATH = /usr/local/share/fonts/freefont-ttf	8	+DOT_FONTPATH = %%PREFIX%%/share/fonts/freefont-ttf
9		9
10	# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen	10	# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
11	# will generate a graph for each documented class showing the direct and	11	# will generate a graph for each documented class showing the direct and

Line 0 Link Here

(-)./files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc (+11 lines)
	1	--- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig 2015-08-05 18:54:39 UTC
	2	+++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
	3	@@ -42,7 +42,7 @@ namespace gr {
	4	d_p = p; d_m = m;
	5
	6	//maximum number of elements in the GF(p^m)
	7	- int q = powl(p, m);
	8	+ int q = pow(p, m);
	9
	10	d_gf_exp = new unsigned char[q];
	11	if (d_gf_exp == NULL) {

Lines 1-10 Link Here

(-)./files/patch-volk_tmpl_volk__cpu.tmpl.c (-7 / +11 lines)
1	--- volk/tmpl/volk_cpu.tmpl.c.orig 2015-05-12 09:39:44 UTC	1	--- volk/tmpl/volk_cpu.tmpl.c.orig 2015-07-09 02:00:33 UTC
2	+++ volk/tmpl/volk_cpu.tmpl.c	2	+++ volk/tmpl/volk_cpu.tmpl.c
3	@@ -36,7 +36,31 @@ struct VOLK_CPU volk_cpu;	3	@@ -34,7 +34,35 @@ struct VOLK_CPU volk_cpu;
4	#if defined(HAVE_CPUID_H)	4
5	#include <cpuid.h>	5	//implement get cpuid for gcc compilers using a system or local copy of cpuid.h
6	#else	6	#if defined(__GNUC__)
7	- #include "gcc_x86_cpuid.h"	7	- #include <cpuid.h>
		8	+ #if defined(HAVE_CPUID_H)
		9	+ #include <cpuid.h>
		10	+ #else
8	+ #ifdef __FreeBSD__	11	+ #ifdef __FreeBSD__
9	+#if __i386__	12	+#if __i386__
10	+#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \	13	+#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \
Lines 30-35 Link Here
30	+ #else	33	+ #else
31	+ #include "gcc_x86_cpuid.h"	34	+ #include "gcc_x86_cpuid.h"
32	+ #endif	35	+ #endif
33	#endif	36	+ #endif
34	#define cpuid_x86(op, r) __get_cpuid(op, (unsigned int )r+0, (unsigned int )r+1, (unsigned int )r+2, (unsigned int )r+3)	37	#define cpuid_x86(op, r) __get_cpuid(op, (unsigned int )r+0, (unsigned int )r+1, (unsigned int )r+2, (unsigned int )r+3)
35		38
		39	/* Return Intel AVX extended CPU capabilities register.

Return to bug 203500

Lines 1-8 Link Here

(-)./Makefile (-6 / +21 lines)
1	# $FreeBSD: head/comms/gnuradio/Makefile 396889 2015-09-14 11:16:55Z amdmi3 $	1	# $FreeBSD: head/comms/gnuradio/Makefile 396889 2015-09-14 11:16:55Z amdmi3 $
2		2
3	PORTNAME= gnuradio	3	PORTNAME= gnuradio
4	PORTVERSION= 3.7.7.1	4	PORTVERSION= 3.7.8
5	PORTREVISION= 1
6	CATEGORIES= comms astro hamradio	5	CATEGORIES= comms astro hamradio
7	MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \	6	MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
8	LOCAL/db	7	LOCAL/db
Lines 34-40 LIB_DEPENDS= libcppunit.so:${PORTSDIR}/d Link Here
34	libgsl.so:${PORTSDIR}/math/gsl	33	libgsl.so:${PORTSDIR}/math/gsl
35	RUN_DEPENDS:= ${BUILD_DEPENDS}	34	RUN_DEPENDS:= ${BUILD_DEPENDS}
36		35
37	USES= cmake:outsource iconv perl5 python:2.7 shebangfix	36	# USES=compiler:c11 is necessary because base GCC fails:
		37	# volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
		38	# volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
		39	# volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
		40	USES= cmake:outsource compiler:c11 iconv perl5 python:2.7 shebangfix
38	SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in	41	SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in
39	CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"	42	CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
40	CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \	43	CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
Lines 42-48 CMAKE_ARGS+= -DICONV_PREFIX:STRING="${IC Link Here
42	-DENABLE_GR_CTRLPORT="YES"	45	-DENABLE_GR_CTRLPORT="YES"
43	# for detailed debugging uncomment the next two lines as needed	46	# for detailed debugging uncomment the next two lines as needed
44	#CMAKE_ARGS+= --debug-output --trace	47	#CMAKE_ARGS+= --debug-output --trace
45	MAJOR_SUB_VER= 3.7.7	48	MAJOR_SUB_VER= 3.7.8
46	DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER}	49	DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER}
47	USE_GNOME= pygtk2	50	USE_GNOME= pygtk2
48	USE_WX= 3.0+	51	USE_WX= 3.0+
Lines 51-56 WX_COMPS= wx wx:build wx:run python:buil Link Here
51	USE_LDCONFIG= yes	54	USE_LDCONFIG= yes
52	PLIST_SUB+= MAJOR_VERSION="3"	55	PLIST_SUB+= MAJOR_VERSION="3"
53	PLIST_SUB+= MAJOR_SUB_VER="${MAJOR_SUB_VER}"	56	PLIST_SUB+= MAJOR_SUB_VER="${MAJOR_SUB_VER}"
		57	LIBSTRIP_FILES= analog atsc audio blocks channels digital dtv fcd fec fft\
		58	filter noaa pager pmt qtgui runtime trellis video-sdl\
		59	vocoder wavelet wxgui
54		60
55	OPTIONS_DEFINE= USRP TESTING	61	OPTIONS_DEFINE= USRP TESTING
56	# Unfortunately building docs on i386 fails	62	# Unfortunately building docs on i386 fails
Lines 58-63 OPTIONS_DEFINE= USRP TESTING Link Here
58	# Yay. building docs is broken on 10 and HEAD too so turn them all off	64	# Yay. building docs is broken on 10 and HEAD too so turn them all off
59	OPTIONS_EXCLUDE= DOCS	65	OPTIONS_EXCLUDE= DOCS
60	OPTIONS_DEFAULT= USRP	66	OPTIONS_DEFAULT= USRP
		67	OPTIONS_SUB= yes
61	USRP_DESC= Include USRP support (UHD) from Ettus	68	USRP_DESC= Include USRP support (UHD) from Ettus
62	TESTING_DESC= Include testing support	69	TESTING_DESC= Include testing support
63		70
Lines 84-91 TESTING_CMAKE_ON= -DENABLE_TESTING:STRIN Link Here
84	TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF"	91	TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF"
85	TESTING_BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit	92	TESTING_BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit
86		93
87	.include <bsd.port.options.mk>	94	.include <bsd.port.pre.mk>
88		95
		96	.if ${PORT_OPTIONS:MUSRP}
		97	LIBSTRIP_FILES+= uhd
		98	.endif
89	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000	99	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
90	USE_GCC= yes	100	USE_GCC= yes
91	.endif	101	.endif
Lines 100-103 post-patch: Link Here
100	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \	110	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
101	${WRKSRC}/cmake/Modules/FindPortaudio.cmake	111	${WRKSRC}/cmake/Modules/FindPortaudio.cmake
102		112
103	.include <bsd.port.mk>	113	post-install:
		114	.for a in ${LIBSTRIP_FILES}
		115	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}
		116	.endfor
		117
		118	.include <bsd.port.post.mk>

Lines 1-8 Link Here

(-)./pkg-plist (-254 / +303 lines)
1	%%QT_BINDIR%%/gnuradio-companion	1	%%QT_BINDIR%%/gnuradio-companion
2	%%QT_BINDIR%%/gnuradio-config-info	2	%%QT_BINDIR%%/gnuradio-config-info
3	%%QT_BINDIR%%/gr_constellation_plot	3	%%QT_BINDIR%%/gr_constellation_plot
		4	%%QT_BINDIR%%/gr-ctrlport-monitor
		5	%%QT_BINDIR%%/gr-ctrlport-monitorc
		6	%%QT_BINDIR%%/gr-ctrlport-monitoro
4	%%QT_BINDIR%%/gr_filter_design	7	%%QT_BINDIR%%/gr_filter_design
5	%%QT_BINDIR%%/gr_modtool	8	%%QT_BINDIR%%/gr_modtool
		9	%%QT_BINDIR%%/gr-perf-monitorx
		10	%%QT_BINDIR%%/gr-perf-monitorxc
		11	%%QT_BINDIR%%/gr-perf-monitorxo
6	%%QT_BINDIR%%/gr_plot_char	12	%%QT_BINDIR%%/gr_plot_char
7	%%QT_BINDIR%%/gr_plot_const	13	%%QT_BINDIR%%/gr_plot_const
8	%%QT_BINDIR%%/gr_plot_fft	14	%%QT_BINDIR%%/gr_plot_fft
Lines 36-46 Link Here
36	%%QT_BINDIR%%/gr_time_raster_b	42	%%QT_BINDIR%%/gr_time_raster_b
37	%%QT_BINDIR%%/gr_time_raster_f	43	%%QT_BINDIR%%/gr_time_raster_f
38	%%QT_BINDIR%%/grcc	44	%%QT_BINDIR%%/grcc
39	%%QT_BINDIR%%/uhd_fft	45	%%USRP%%%%QT_BINDIR%%/uhd_fft
40	%%QT_BINDIR%%/uhd_rx_cfile	46	%%USRP%%%%QT_BINDIR%%/uhd_rx_cfile
41	%%QT_BINDIR%%/uhd_rx_nogui	47	%%USRP%%%%QT_BINDIR%%/uhd_rx_nogui
42	%%QT_BINDIR%%/uhd_siggen	48	%%USRP%%%%QT_BINDIR%%/uhd_siggen
43	%%QT_BINDIR%%/uhd_siggen_gui	49	%%USRP%%%%QT_BINDIR%%/uhd_siggen_gui
44	%%QT_BINDIR%%/usrp_flex	50	%%QT_BINDIR%%/usrp_flex
45	%%QT_BINDIR%%/usrp_flex_all	51	%%QT_BINDIR%%/usrp_flex_all
46	%%QT_BINDIR%%/usrp_flex_band	52	%%QT_BINDIR%%/usrp_flex_band
Lines 48-67 Link Here
48	%%QT_BINDIR%%/volk_modtool	54	%%QT_BINDIR%%/volk_modtool
49	%%QT_BINDIR%%/volk_profile	55	%%QT_BINDIR%%/volk_profile
50	%%ETCDIR%%/conf.d/gnuradio-runtime.conf	56	%%ETCDIR%%/conf.d/gnuradio-runtime.conf
51	%%ETCDIR%%/conf.d/gr-audio-alsa.conf.sample	57	@sample %%ETCDIR%%/conf.d/gr-audio-alsa.conf.sample
52	%%ETCDIR%%/conf.d/gr-audio-jack.conf.sample	58	@sample %%ETCDIR%%/conf.d/gr-audio-jack.conf.sample
53	%%ETCDIR%%/conf.d/gr-audio-oss.conf.sample	59	@sample %%ETCDIR%%/conf.d/gr-audio-oss.conf.sample
54	%%ETCDIR%%/conf.d/gr-audio-portaudio.conf.sample	60	@sample %%ETCDIR%%/conf.d/gr-audio-portaudio.conf.sample
55	%%ETCDIR%%/conf.d/gr-audio.conf.sample	61	@sample %%ETCDIR%%/conf.d/gr-audio.conf.sample
56	%%ETCDIR%%/conf.d/gr-qtgui.conf.sample	62	@sample %%ETCDIR%%/conf.d/gr-qtgui.conf.sample
57	%%ETCDIR%%/conf.d/gr-wxgui.conf.sample	63	@sample %%ETCDIR%%/conf.d/gr-wxgui.conf.sample
58	%%ETCDIR%%/conf.d/grc.conf.sample	64	@sample %%ETCDIR%%/conf.d/grc.conf.sample