Attachment 186494 Details for Bug 220982 – release, v2

[patch] release, v2

mesa-17.2.1.diff (text/plain), 9.16 KB, created by Jan Beich on 2017-09-17 23:53:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-09-17 23:53:53 UTC

Size: 9.16 KB

patch

obsolete

>Index: graphics/mesa-dri/Makefile
>===================================================================
>--- graphics/mesa-dri/Makefile	(revision 450007)
>+++ graphics/mesa-dri/Makefile	(working copy)
>@@ -54,9 +54,6 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src_mesa_drivers
> . endif
> .elif ${ARCH} == armv6 || ${ARCH} == aarch64
> GALLIUM_DRIVERS+=	FREEDRENO VC4
>-. if ${ARCH} == armv6
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
>-. endif
> .endif
> 
> CONFIGURE_ARGS+=	--with-dri-drivers="${DRI_DRIVERS:tl}" \
>Index: graphics/mesa-dri/Makefile.common
>===================================================================
>--- graphics/mesa-dri/Makefile.common	(revision 450007)
>+++ graphics/mesa-dri/Makefile.common	(working copy)
>@@ -14,7 +14,7 @@
> MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
> MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
> 
>-MESABASEVERSION=	17.1.8
>+MESABASEVERSION=	17.2.1
> # if there is a subversion, don't include the '-' between 7.11-rc2.
> MESASUBVERSION=
> 
>Index: graphics/mesa-dri/Makefile.targets
>===================================================================
>--- graphics/mesa-dri/Makefile.targets	(revision 450007)
>+++ graphics/mesa-dri/Makefile.targets	(working copy)
>@@ -18,6 +18,10 @@ post-patch:
> .  endif
> . endif
> .endif
>+.if ${ARCH:Marm*} && ! ${CFLAGS:M-march=*} # ignore if CPUTYPE is defined
>+	@${ECHO_CMD} "vc4_tiling_lt_neon.lo: CFLAGS+=-march=armv7-a -mfpu=neon" \
>+		>>${WRKSRC}/src/gallium/drivers/vc4/Makefile.in
>+.endif
> 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
> 		${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
> 
>Index: graphics/mesa-dri/distinfo
>===================================================================
>--- graphics/mesa-dri/distinfo	(revision 450007)
>+++ graphics/mesa-dri/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1504427762
>-SHA256 (mesa-17.1.8.tar.xz) = 75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db
>-SIZE (mesa-17.1.8.tar.xz) = 9902800
>+TIMESTAMP = 1505689402
>+SHA256 (mesa-17.2.1.tar.xz) = 77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e
>+SIZE (mesa-17.2.1.tar.xz) = 10414776
>Index: graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
>===================================================================
>--- graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in	(revision 450030)
>+++ graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in	(nonexistent)
>@@ -1,13 +0,0 @@
>-# 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
>- 
>
>Property changes on: graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/mesa-dri/files/patch-src_egl_Makefile.in
>===================================================================
>--- graphics/mesa-dri/files/patch-src_egl_Makefile.in	(nonexistent)
>+++ graphics/mesa-dri/files/patch-src_egl_Makefile.in	(working copy)
>@@ -0,0 +1,55 @@
>+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)
>
>Property changes on: graphics/mesa-dri/files/patch-src_egl_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__cpu__detect.c
>===================================================================
>--- graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__cpu__detect.c	(nonexistent)
>+++ graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__cpu__detect.c	(working copy)
>@@ -0,0 +1,15 @@
>+FreeBSD armv6 cannot detect NEON at runtime
>+
>+--- src/gallium/auxiliary/util/u_cpu_detect.c.orig	2017-07-31 10:50:59 UTC
>++++ src/gallium/auxiliary/util/u_cpu_detect.c
>+@@ -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();
>+ 
>
>Property changes on: graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__cpu__detect.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/mesa-dri/files/patch-src_util_build__id.c
>===================================================================
>--- graphics/mesa-dri/files/patch-src_util_build__id.c	(revision 450030)
>+++ graphics/mesa-dri/files/patch-src_util_build__id.c	(working copy)
>@@ -7,7 +7,7 @@
>  
>  #ifndef ElfW
> -#define ElfW(type) Elf_##type
>-+#ifdef __LP64__
>++#if __ELF_WORD_SIZE == 64
> +#define ElfW(type) Elf64_##type
> +#else
> +#define ElfW(type) Elf32_##type
>Index: graphics/mesa-libs/Makefile
>===================================================================
>--- graphics/mesa-libs/Makefile	(revision 450007)
>+++ graphics/mesa-libs/Makefile	(working copy)
>@@ -14,6 +14,7 @@ OPTIONS_DEFINE=	WAYLAND
> OPTIONS_SUB=	yes
> 
> WAYLAND_DESC=		Enable support for the Wayland platform in EGL
>+WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
> WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
> 			libwayland-server.so:graphics/wayland
> 
>@@ -42,7 +43,7 @@ MESA_BUILD_WRKSRC=	src/mapi
> MESA_INSTALL_WRKSRC=	src/mapi
> 
> .if ${PORT_OPTIONS:MWAYLAND}
>-MESA_BUILD_WRKSRC+=	src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
>+MESA_BUILD_WRKSRC+=	src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
> MESA_INSTALL_WRKSRC+=	src/egl/wayland/wayland-egl
> .endif
>

Actions: View | Diff

Attachments on bug 220982: 184678 | 184874 | 185043 | 185044 | 185045 | 185138 | 185340 | 185642 | 186074 | 186494 | 186599 | 186873