Attachment #176301 for bug #213911

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




# $FreeBSD$

PORTNAME=	raspberrypi-userland
PORTVERSION=	20161026
CATEGORIES=	misc

MAINTAINER=	mikael.urankar@gmail.com

USE_GITHUB=	yes
GH_ACCOUNT=	gonzoua
GH_PROJECT=	userland
GH_TAGNAME=	e143b48

USE_LDCONFIG=	yes

USES=		cmake:outsource pkgconfig shebangfix
CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX} \
		-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake
SHEBANG_FILES=	host_applications/linux/apps/dtoverlay/dtoverlay-post \
		host_applications/linux/apps/dtoverlay/dtoverlay-pre

OPTIONS_DEFINE=	EXAMPLES DEBUG
EXAMPLES_DESC=	Install test applications source code (hello_pi)

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (gonzoua-userland-20160306-c702cd3_GH0.tar.gz) = 2b0864427414742778c7df81e177053ca15df508e79cdd6b4629f8f89cb90a34	1	TIMESTAMP = 1477482408
2	SIZE (gonzoua-userland-20160306-c702cd3_GH0.tar.gz) = 32888794	2	SHA256 (gonzoua-userland-20161026-e143b48_GH0.tar.gz) = 488fed2e3adcc761cae10288eb7af95d1cda762f4be3562a85c2b22f50631175
		3	SIZE (gonzoua-userland-20161026-e143b48_GH0.tar.gz) = 32906666

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2016-10-30 UTC
	2	+++ CMakeLists.txt
	3	@@ -116,7 +116,7 @@ if(PKG_CONFIG_FOUND)
	4	foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc brcmegl.pc brcmglesv2.pc brcmvg.pc )
	5	configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
	6	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
	7	- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
	8	+ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
	9	endforeach()
	10	endif()
	11	# Remove cache entry, if one added by command line




--- host_applications/linux/apps/dtoverlay/CMakeLists.txt.orig	2016-10-30 UTC
+++ host_applications/linux/apps/dtoverlay/CMakeLists.txt
@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
 
 set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
-foreach(_script ${DTOVERLAY_SCRIPTS})
-   add_custom_command(
-     TARGET dtoverlay
-     COMMAND ${CMAKE_COMMAND}
-     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
-     ${CMAKE_BINARY_DIR}/../../bin/${_script}
-   )
-endforeach()
 install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)

Lines 4-11 Link Here

(-)files/patch-host__applications_linux_apps_hello__pi_Makefile.include (-2 / +2 lines)
4		4
5	LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lGLESv2 -lEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont	5	LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lGLESv2 -lEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont
6		6
7	-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont	7	-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont
8	+INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont -ILOCALBASE/include/freetype2/	8	+INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -ILOCALBASE/include/freetype2
9		9
10	all: $(BIN) $(LIB)	10	all: $(BIN) $(LIB)
11		11

Lines 9-14 Link Here

(-)pkg-plist (-4 / +20 lines)
9	bin/containers_test_bits	9	bin/containers_test_bits
10	bin/containers_test_uri	10	bin/containers_test_uri
11	bin/containers_uri_pipe	11	bin/containers_uri_pipe
		12	bin/dtmerge
		13	bin/dtoverlay
		14	bin/dtoverlay-post
		15	bin/dtoverlay-pre
		16	bin/dtparam
12	bin/mmal_vc_diag	17	bin/mmal_vc_diag
13	bin/raspistill	18	bin/raspistill
14	bin/raspivid	19	bin/raspivid
Lines 189-195 Link Here
189	include/interface/vmcs_host/vc_gencmd_defs.h	194	include/interface/vmcs_host/vc_gencmd_defs.h
190	include/interface/vmcs_host/vc_hdmi.h	195	include/interface/vmcs_host/vc_hdmi.h
191	include/interface/vmcs_host/vc_hdmi_property.h	196	include/interface/vmcs_host/vc_hdmi_property.h
192	include/interface/vmcs_host/vc_hostreq_defs.h
193	include/interface/vmcs_host/vc_ilcs_defs.h	197	include/interface/vmcs_host/vc_ilcs_defs.h
194	include/interface/vmcs_host/vc_imageconv_defs.h	198	include/interface/vmcs_host/vc_imageconv_defs.h
195	include/interface/vmcs_host/vc_sdtv.h	199	include/interface/vmcs_host/vc_sdtv.h
Lines 207-213 Link Here
207	include/interface/vmcs_host/vcfilesys_defs.h	211	include/interface/vmcs_host/vcfilesys_defs.h
208	include/interface/vmcs_host/vcgencmd.h	212	include/interface/vmcs_host/vcgencmd.h
209	include/interface/vmcs_host/vchost.h	213	include/interface/vmcs_host/vchost.h
210	include/interface/vmcs_host/vchostreq.h	214	include/interface/vmcs_host/vchost_platform_config.h
211	include/interface/vmcs_host/vcilcs.h	215	include/interface/vmcs_host/vcilcs.h
212	include/interface/vmcs_host/vcilcs_common.h	216	include/interface/vmcs_host/vcilcs_common.h
213	include/vcinclude/common.h	217	include/vcinclude/common.h
Lines 220-228 Link Here
220	lib/libOpenVG.so	224	lib/libOpenVG.so
221	lib/libWFC.so	225	lib/libWFC.so
222	lib/libbcm_host.so	226	lib/libbcm_host.so
		227	lib/libbrcmEGL.so
		228	lib/libbrcmGLESv2.so
		229	lib/libbrcmOpenVG.so
		230	lib/libbrcmWFC.so
223	lib/libcontainers.so	231	lib/libcontainers.so
224	lib/libdebug_sym.so	232	lib/libdebug_sym.so
225	lib/libdebug_sym_static.a	233	lib/libdebug_sym_static.a
		234	lib/libdtovl.so
226	lib/libkhrn_client.a	235	lib/libkhrn_client.a
227	lib/libkhrn_static.a	236	lib/libkhrn_static.a
228	lib/libmmal.so	237	lib/libmmal.so
Lines 261-266 Link Here
261	lib/plugins/writer_mp4.so	270	lib/plugins/writer_mp4.so
262	lib/plugins/writer_raw_video.so	271	lib/plugins/writer_raw_video.so
263	lib/plugins/writer_simple.so	272	lib/plugins/writer_simple.so
		273	libdata/pkgconfig/bcm_host.pc
		274	libdata/pkgconfig/brcmegl.pc
		275	libdata/pkgconfig/brcmglesv2.pc
		276	libdata/pkgconfig/brcmvg.pc
		277	libdata/pkgconfig/egl.pc
		278	libdata/pkgconfig/glesv2.pc
		279	libdata/pkgconfig/vg.pc
264	sbin/vcfiled	280	sbin/vcfiled
265	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt	281	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt
266	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/Makefile.include	282	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/Makefile.include
Lines 287-293 Link Here
287	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft.c	303	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft.c
288	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d.c	304	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d.c
289	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d_bitmap.h	305	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d_bitmap.h
290	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4096k.hex
291	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_1024k.hex	306	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_1024k.hex
292	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_128k.hex	307	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_128k.hex
293	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_16k.hex	308	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_16k.hex
Lines 297-302 Link Here
297	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_256k.hex	312	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_256k.hex
298	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_2k.hex	313	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_2k.hex
299	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_32k.hex	314	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_32k.hex
		315	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4096k.hex
300	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4k.hex	316	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4k.hex
301	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512.hex	317	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512.hex
302	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512k.hex	318	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512k.hex
Lines 307-313 Link Here
307	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/mailbox.h	323	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/mailbox.h
308	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/makefile	324	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/makefile
309	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft.qinc	325	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft.qinc
310	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4096k.qasm
311	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_1024k.qasm	326	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_1024k.qasm
312	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_128k.qasm	327	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_128k.qasm
313	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_16k.qasm	328	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_16k.qasm
Lines 318-323 Link Here
318	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_256k.qasm	333	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_256k.qasm
319	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_2k.qasm	334	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_2k.qasm
320	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_32k.qasm	335	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_32k.qasm
		336	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4096k.qasm
321	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4k.qasm	337	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4k.qasm
322	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512.qasm	338	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512.qasm
323	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512k.qasm	339	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512k.qasm

Return to bug 213911

Lines 2-8 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= raspberrypi-userland	4	PORTNAME= raspberrypi-userland
5	PORTVERSION= 20160306	5	PORTVERSION= 20161026
6	CATEGORIES= misc	6	CATEGORIES= misc
7		7
8	MAINTAINER= mikael.urankar@gmail.com	8	MAINTAINER= mikael.urankar@gmail.com
Lines 17-29 Link Here
17	USE_GITHUB= yes	17	USE_GITHUB= yes
18	GH_ACCOUNT= gonzoua	18	GH_ACCOUNT= gonzoua
19	GH_PROJECT= userland	19	GH_PROJECT= userland
20	GH_TAGNAME= c702cd3	20	GH_TAGNAME= e143b48
21		21
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23		23
24	USES= cmake:outsource	24	USES= cmake:outsource pkgconfig shebangfix
25	CMAKE_ARGS+= -DVMCS_INSTALL_PREFIX=${PREFIX} \	25	CMAKE_ARGS+= -DVMCS_INSTALL_PREFIX=${PREFIX} \
26	-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake	26	-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake
		27	SHEBANG_FILES= host_applications/linux/apps/dtoverlay/dtoverlay-post \
		28	host_applications/linux/apps/dtoverlay/dtoverlay-pre
27		29
28	OPTIONS_DEFINE= EXAMPLES DEBUG	30	OPTIONS_DEFINE= EXAMPLES DEBUG
29	EXAMPLES_DESC= Install test applications source code (hello_pi)	31	EXAMPLES_DESC= Install test applications source code (hello_pi)

Line 0 Link Here

(-)files/patch-host__applications_linux_apps_dtoverlay_CMakeLists.txt (+15 lines)
	1	--- host_applications/linux/apps/dtoverlay/CMakeLists.txt.orig 2016-10-30 UTC
	2	+++ host_applications/linux/apps/dtoverlay/CMakeLists.txt
	3	@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST
	4	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
	5
	6	set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
	7	-foreach(_script ${DTOVERLAY_SCRIPTS})
	8	- add_custom_command(
	9	- TARGET dtoverlay
	10	- COMMAND ${CMAKE_COMMAND}
	11	- -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
	12	- ${CMAKE_BINARY_DIR}/../../bin/${_script}
	13	- )
	14	-endforeach()
	15	install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)