Attachment #185044 for bug #220982

Lines 54-62 EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers Link Here

(-)graphics/mesa-dri/Makefile (-3 lines)
54	. endif	54	. endif
55	.elif ${ARCH} == armv6 \|\| ${ARCH} == aarch64	55	.elif ${ARCH} == armv6 \|\| ${ARCH} == aarch64
56	GALLIUM_DRIVERS+= FREEDRENO VC4	56	GALLIUM_DRIVERS+= FREEDRENO VC4
57	. if ${ARCH} == armv6
58	EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
59	. endif
60	.endif	57	.endif
61		58
62	CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \	59	CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \

Lines 14-22 Link Here

(-)graphics/mesa-dri/Makefile.common (-2 / +2 lines)
14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}	14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}	15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
16		16
17	MESABASEVERSION= 17.1.5	17	MESABASEVERSION= 17.2.0
18	# if there is a subversion, don't include the '-' between 7.11-rc2.	18	# if there is a subversion, don't include the '-' between 7.11-rc2.
19	MESASUBVERSION=	19	MESASUBVERSION= rc2
20		20
21	MASTER_SITES= https://mesa.freedesktop.org/archive/ \	21	MASTER_SITES= https://mesa.freedesktop.org/archive/ \
22	https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \	22	https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \

Lines 18-23 post-patch: Link Here

(-)graphics/mesa-dri/Makefile.targets (+4 lines)
18	. endif	18	. endif
19	. endif	19	. endif
20	.endif	20	.endif
		21	.if ${ARCH:Marm} && ! ${CFLAGS:M-march=} # ignore if CPUTYPE is defined
		22	@${ECHO_CMD} "vc4_tiling_lt_neon.lo: CFLAGS+=-march=armv7-a -mfpu=neon" \
		23	>>${WRKSRC}/src/gallium/drivers/vc4/Makefile.in
		24	.endif
21	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \	25	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \
22	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c	26	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
23		27

Lines 1-3 Link Here

(-)graphics/mesa-dri/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1500121822	1	TIMESTAMP = 1501498259
2	SHA256 (mesa-17.1.5.tar.xz) = 378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9	2	SHA256 (mesa-17.2.0-rc2.tar.xz) = 701f66bf22bcfc95fbb00e34d052dc8818296d5748aa9bb2f5dd19f3e164a175
3	SIZE (mesa-17.1.5.tar.xz) = 9901876	3	SIZE (mesa-17.2.0-rc2.tar.xz) = 10326168




# enable NEON instructions in the compiler when building the NEON codepath
#
--- src/gallium/drivers/vc4/Makefile.in.orig	2017-05-16 13:55:49 UTC
+++ src/gallium/drivers/vc4/Makefile.in
@@ -669,7 +669,7 @@ libvc4_la_SOURCES = $(C_SOURCES)
 libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) libvc4_neon.la
 libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
 libvc4_neon_la_SOURCES = vc4_tiling_lt.c
-libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON
+libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON -march=armv7-a -mfpu=neon
 EXTRA_DIST = kernel/README
 all: all-am
 




Force automake to use C++ compiler for linking by adding a
non-existent .cpp file to nodist_EXTRA_*_SOURCES.

./.libs/libEGL_common.a(libmesautil_la-string_to_uint_map.o):(.data.DW.ref.__gxx_personality_v0[DW.ref.__gxx_personality_v0]+0x0): undefined reference to `__gxx_personality_v0'
cc: error: linker command failed with exit code 1 (use -v to see invocation)

--- src/egl/Makefile.in.orig	2017-07-24 16:00:39 UTC
+++ src/egl/Makefile.in
@@ -197,9 +197,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
+libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
 @USE_LIBGLVND_FALSE@am_libEGL_la_rpath = -rpath $(libdir)
 am__DEPENDENCIES_1 =
 @HAVE_PLATFORM_X11_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -304,6 +304,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libEGL_la_SOURCES) $(libEGL_common_la_SOURCES) \
 	$(libEGL_mesa_la_SOURCES)
 DIST_SOURCES = $(libEGL_la_SOURCES) \
@@ -1014,7 +1032,7 @@ clean-noinstLTLIBRARIES:
 	}
 
 libEGL.la: $(libEGL_la_OBJECTS) $(libEGL_la_DEPENDENCIES) $(EXTRA_libEGL_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
 main/$(am__dirstamp):
 	@$(MKDIR_P) main
 	@: > main/$(am__dirstamp)




aarch64 always has NEON while FreeBSD armv6 doesn't have runtime detection

--- src/gallium/auxiliary/util/u_cpu_detect.c.orig	2017-07-31 10:50:59 UTC
+++ src/gallium/auxiliary/util/u_cpu_detect.c
@@ -300,7 +300,7 @@ PIPE_ALIGN_STACK static inline boolean sse2_has_daz(void)
 
 #endif /* X86 or X86_64 */
 
-#if defined(PIPE_ARCH_ARM)
+#if defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
 static void
 check_os_arm_support(void)
 {
@@ -311,7 +311,9 @@ check_os_arm_support(void)
     * used. Because of this we cannot use PIPE_OS_ANDROID here, but rather
     * have a separate macro that only gets enabled from respective Android.mk.
     */
-#if defined(HAS_ANDROID_CPUFEATURES)
+#if defined(__ARM_NEON)
+   util_cpu_caps.has_neon = 1;
+#elif defined(HAS_ANDROID_CPUFEATURES)
    AndroidCpuFamily cpu_family = android_getCpuFamily();
    uint64_t cpu_features = android_getCpuFeatures();
 
@@ -488,7 +490,7 @@ util_cpu_detect(void)
    }
 #endif /* PIPE_ARCH_X86 || PIPE_ARCH_X86_64 */
 
-#if defined(PIPE_ARCH_ARM)
+#if defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
    check_os_arm_support();
 #endif
 

Lines 14-19 OPTIONS_DEFINE= WAYLAND Link Here

(-)graphics/mesa-libs/Makefile (-1 / +2 lines)
14	OPTIONS_SUB= yes	14	OPTIONS_SUB= yes
15		15
16	WAYLAND_DESC= Enable support for the Wayland platform in EGL	16	WAYLAND_DESC= Enable support for the Wayland platform in EGL
		17	WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
17	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	18	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
18	libwayland-server.so:graphics/wayland	19	libwayland-server.so:graphics/wayland
19		20
Lines 42-48 MESA_BUILD_WRKSRC= src/mapi Link Here
42	MESA_INSTALL_WRKSRC= src/mapi	43	MESA_INSTALL_WRKSRC= src/mapi
43		44
44	.if ${PORT_OPTIONS:MWAYLAND}	45	.if ${PORT_OPTIONS:MWAYLAND}
45	MESA_BUILD_WRKSRC+= src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl	46	MESA_BUILD_WRKSRC+= src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
46	MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl	47	MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl
47	.endif	48	.endif
48		49

Return to bug 220982

Lines 1-13 Link Here

(-)graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in (-13 lines)
1	# enable NEON instructions in the compiler when building the NEON codepath
2	#
3	--- src/gallium/drivers/vc4/Makefile.in.orig 2017-05-16 13:55:49 UTC
4	+++ src/gallium/drivers/vc4/Makefile.in
5	@@ -669,7 +669,7 @@ libvc4_la_SOURCES = $(C_SOURCES)
6	libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) libvc4_neon.la
7	libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
8	libvc4_neon_la_SOURCES = vc4_tiling_lt.c
9	-libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON
10	+libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON -march=armv7-a -mfpu=neon
11	EXTRA_DIST = kernel/README
12	all: all-am
13

Line 0 Link Here

(-)graphics/mesa-dri/files/patch-src_egl_Makefile.in (+55 lines)
	1	Force automake to use C++ compiler for linking by adding a
	2	non-existent .cpp file to nodist_EXTRA_*_SOURCES.
	3
	4	./.libs/libEGL_common.a(libmesautil_la-string_to_uint_map.o):(.data.DW.ref.__gxx_personality_v0[DW.ref.__gxx_personality_v0]+0x0): undefined reference to `__gxx_personality_v0'
	5	cc: error: linker command failed with exit code 1 (use -v to see invocation)
	6
	7	--- src/egl/Makefile.in.orig 2017-07-24 16:00:39 UTC
	8	+++ src/egl/Makefile.in
	9	@@ -197,9 +197,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
	10	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
	11	am__v_lt_0 = --silent
	12	am__v_lt_1 =
	13	-libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	14	- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
	15	- $(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
	16	+libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
	17	+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
	18	+ $(CXXFLAGS) $(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
	19	@USE_LIBGLVND_FALSE@am_libEGL_la_rpath = -rpath $(libdir)
	20	am__DEPENDENCIES_1 =
	21	@HAVE_PLATFORM_X11_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
	22	@@ -304,6 +304,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
	23	am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
	24	am__v_CCLD_0 = @echo " CCLD " $@;
	25	am__v_CCLD_1 =
	26	+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
	27	+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
	28	+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
	29	+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
	30	+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
	31	+ $(AM_CXXFLAGS) $(CXXFLAGS)
	32	+AM_V_CXX = $(am__v_CXX_@AM_V@)
	33	+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
	34	+am__v_CXX_0 = @echo " CXX " $@;
	35	+am__v_CXX_1 =
	36	+CXXLD = $(CXX)
	37	+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
	38	+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
	39	+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
	40	+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
	41	+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
	42	+am__v_CXXLD_0 = @echo " CXXLD " $@;
	43	+am__v_CXXLD_1 =
	44	SOURCES = $(libEGL_la_SOURCES) $(libEGL_common_la_SOURCES) \
	45	$(libEGL_mesa_la_SOURCES)
	46	DIST_SOURCES = $(libEGL_la_SOURCES) \
	47	@@ -1014,7 +1032,7 @@ clean-noinstLTLIBRARIES:
	48	}
	49
	50	libEGL.la: $(libEGL_la_OBJECTS) $(libEGL_la_DEPENDENCIES) $(EXTRA_libEGL_la_DEPENDENCIES)
	51	- $(AM_V_CCLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
	52	+ $(AM_V_CXXLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
	53	main/$(am__dirstamp):
	54	@$(MKDIR_P) main
	55	@: > main/$(am__dirstamp)

Line 0 Link Here

(-)graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__cpu__detect.c (+33 lines)
	1	aarch64 always has NEON while FreeBSD armv6 doesn't have runtime detection
	2
	3	--- src/gallium/auxiliary/util/u_cpu_detect.c.orig 2017-07-31 10:50:59 UTC
	4	+++ src/gallium/auxiliary/util/u_cpu_detect.c
	5	@@ -300,7 +300,7 @@ PIPE_ALIGN_STACK static inline boolean sse2_has_daz(void)
	6
	7	#endif /* X86 or X86_64 */
	8
	9	-#if defined(PIPE_ARCH_ARM)
	10	+#if defined(PIPE_ARCH_ARM) \|\| defined(PIPE_ARCH_AARCH64)
	11	static void
	12	check_os_arm_support(void)
	13	{
	14	@@ -311,7 +311,9 @@ check_os_arm_support(void)
	15	* used. Because of this we cannot use PIPE_OS_ANDROID here, but rather
	16	* have a separate macro that only gets enabled from respective Android.mk.
	17	*/
	18	-#if defined(HAS_ANDROID_CPUFEATURES)
	19	+#if defined(__ARM_NEON)
	20	+ util_cpu_caps.has_neon = 1;
	21	+#elif defined(HAS_ANDROID_CPUFEATURES)
	22	AndroidCpuFamily cpu_family = android_getCpuFamily();
	23	uint64_t cpu_features = android_getCpuFeatures();
	24
	25	@@ -488,7 +490,7 @@ util_cpu_detect(void)
	26	}
	27	#endif /* PIPE_ARCH_X86 \|\| PIPE_ARCH_X86_64 */
	28
	29	-#if defined(PIPE_ARCH_ARM)
	30	+#if defined(PIPE_ARCH_ARM) \|\| defined(PIPE_ARCH_AARCH64)
	31	check_os_arm_support();
	32	#endif
	33