svn commit: r548949 - in head/graphics/mesa-dri: . files

[Emmanuel Vadot]

Author: manu
Date: Sat Sep 19 09:33:33 2020
New Revision: 548949
URL: https://svnweb.freebsd.org/changeset/ports/548949

Log:
  mesa: Remove sparc64 patches
  
  No one who cares about graphics have a sparc64 machine.
  Next update to 20.2 will not contain any patches too.
  
  Reviewed by:	zeising
  Approved by:	x11 (zeising@)
  Differential Revision:	https://reviews.freebsd.org/D26460

Modified:
  head/graphics/mesa-dri/Makefile.common
  head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h

Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common	Sat Sep 19 09:30:31 2020	(r548948)
+++ head/graphics/mesa-dri/Makefile.common	Sat Sep 19 09:33:33 2020	(r548949)
@@ -27,6 +27,9 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11 at FreeBSD.org
 
+NOT_FOR_ARCHS=sparc64
+NOT_FOR_ARCHS_REASON=not supported on sparc64
+
 COMPONENT=	${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \
@@ -95,9 +98,6 @@ LLVM_DEFAULT=	80
 
 BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
-.if ${ARCH} == sparc64
-MESON_ARGS+=	-Dllvm=false
-.else
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
 .if ${COMPONENT} != libs
 RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
@@ -105,7 +105,6 @@ RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm$
 MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 MESON_ARGS+=	-Dllvm=true
-.endif
 
 # we don't care about GLes v1
 MESON_ARGS+=	-Dgles1=false

Modified: head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h
==============================================================================
--- head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h	Sat Sep 19 09:30:31 2020	(r548948)
+++ head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h	Sat Sep 19 09:33:33 2020	(r548949)
@@ -1,29 +1,6 @@
---- src/gallium/include/pipe/p_config.h.orig	2017-10-02 15:49:02 UTC
+--- src/gallium/include/pipe/p_config.h.orig	2019-06-26 20:14:08 UTC
 +++ src/gallium/include/pipe/p_config.h
-@@ -77,6 +77,13 @@
- #define PIPE_CC_ICL
- #endif
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+#define PIPE_ARCH_SPARC
-+#if defined(__sparc64__)
-+#define PIPE_ARCH_SPARC_64
-+#endif
-+#endif
-+
- 
- /*
-  * Processor architecture
-@@ -131,7 +138,7 @@
- 
- #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
- #define PIPE_ARCH_LITTLE_ENDIAN
--#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390)
-+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
- #define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
-@@ -160,6 +167,12 @@
+@@ -160,6 +160,12 @@
  #define PIPE_OS_ANDROID
  #endif