FreeBSD Bugzilla – Attachment 182652 Details for
Bug 219247
graphics/mesa-{dri,libs}: update to 17.1.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v2.1
Mesa-17.1.0.diff (text/plain), 15.71 KB, created by
Jan Beich
on 2017-05-17 03:59:17 UTC
(
hide
)
Description:
v2.1
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2017-05-17 03:59:17 UTC
Size:
15.71 KB
patch
obsolete
>Index: graphics/mesa-dri/Makefile >=================================================================== >--- graphics/mesa-dri/Makefile (revision 441063) >+++ graphics/mesa-dri/Makefile (working copy) >@@ -7,6 +7,7 @@ CATEGORIES= graphics > > COMMENT= OpenGL hardware acceleration drivers for DRI2+ > >+BUILD_DEPENDS= libdrm>=2.4.80_1,1:graphics/libdrm # libsync.h fix > LIB_DEPENDS= libdrm.so:graphics/libdrm \ > libexpat.so:textproc/expat2 > RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc >Index: graphics/mesa-dri/Makefile.common >=================================================================== >--- graphics/mesa-dri/Makefile.common (revision 441063) >+++ graphics/mesa-dri/Makefile.common (working copy) >@@ -14,7 +14,7 @@ > MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} > MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} > >-MESABASEVERSION= 17.0.4 >+MESABASEVERSION= 17.1.0 > # if there is a subversion, don't include the '-' between 7.11-rc2. > MESASUBVERSION= > >@@ -68,9 +68,9 @@ RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/ > CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} > LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib > # The gallium-llvm switch is the global llvm switch for historical reasons >-CONFIGURE_ARGS+= --enable-gallium-llvm >+CONFIGURE_ARGS+= --enable-llvm --with-llvm-prefix=${LOCALBASE}/llvm${MESA_LLVM_VER} > .else >-CONFIGURE_ARGS+= --disable-gallium-llvm >+CONFIGURE_ARGS+= --disable-llvm > .endif > > # There are issues that need to be fixed to use TLS model "initial-exec" >Index: graphics/mesa-dri/Makefile.targets >=================================================================== >--- graphics/mesa-dri/Makefile.targets (revision 441063) >+++ graphics/mesa-dri/Makefile.targets (working copy) >@@ -3,6 +3,8 @@ > # this file holds common targets > > post-patch: >+# Avoid USES=shebangfix triggering source regen >+ @${FIND} ${WRKSRC} -name \*.py -exec ${TOUCH} -r ${WRKSRC}/VERSION {} + > .if ${OPSYS} == FreeBSD > @${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure > # Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics" >Index: graphics/mesa-dri/distinfo >=================================================================== >--- graphics/mesa-dri/distinfo (revision 441063) >+++ graphics/mesa-dri/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1492459376 >-SHA256 (mesa-17.0.4.tar.xz) = 1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346 >-SIZE (mesa-17.0.4.tar.xz) = 9454976 >+TIMESTAMP = 1494432267 >+SHA256 (mesa-17.1.0.tar.xz) = cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 >+SIZE (mesa-17.1.0.tar.xz) = 9849580 >Index: graphics/mesa-dri/files/configure.ac >=================================================================== >--- graphics/mesa-dri/files/configure.ac (revision 441063) >+++ graphics/mesa-dri/files/configure.ac (working copy) >@@ -1,38 +1,31 @@ > --- configure.ac.orig 2017-04-01 15:33:36 UTC > +++ configure.ac >-@@ -942,19 +942,19 @@ llvm_add_target() { >- # Call this inside ` ` to get the return value. >- # $1 is the llvm-config command with arguments. >- strip_unwanted_llvm_flags() { >-- # Use \> (marks the end of the word) >-- echo " `$1`" | sed \ >-- -e 's/\s\+-m\S*//g' \ >-- -e 's/\s\+-DNDEBUG\>//g' \ >-- -e 's/\s\+-D_GNU_SOURCE\>//g' \ >-- -e 's/\s\+-pedantic\>//g' \ >-- -e 's/\s\+-W\S*//g' \ >-- -e 's/\s\+-O\S*//g' \ >-- -e 's/\s\+-g\S*//g' \ >-- -e 's/-fno-rtti\>/-Fno-rtti/g' \ >-- -e 's/\s\+-f\S*//g' \ >-- -e 's/-Fno-rtti\>/-fno-rtti/g' \ >-- -e 's/^ //' >-+ echo " `$1` " | sed -E \ >-+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \ >-+ -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \ >-+ -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \ >-+ -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \ >-+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \ >-+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \ >-+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \ >-+ -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \ >-+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \ >-+ -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \ >-+ -e 's/^[[[:space:]]]//' \ >-+ -e 's/[[[:space:]]]$//' >- } >+@@ -415,13 +415,24 @@ AM_CONDITIONAL([GCC_ATOMIC_BUILTINS_SUPPORTED], [test x$GCC_ATOMIC_BUILTINS_SUPP > >- llvm_set_environment_variables() { >+ dnl Check if host supports 64-bit atomics >+ dnl note that lack of support usually results in link (not compile) error >+-AC_MSG_CHECKING(whether __sync_add_and_fetch_8 is supported) >++save_CFLAGS=$CFLAGS >++if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then >++ CFLAGS="$CFLAGS -DUSE_GCC_ATOMIC_BUILTINS" >++ AC_MSG_CHECKING(whether __atomic_fetch_add_8 is supported) >++else >++ AC_MSG_CHECKING(whether __sync_add_and_fetch_8 is supported) >++fi >+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ >+ #include <stdint.h> >+ uint64_t v; >+ int main() { >++#ifdef USE_GCC_ATOMIC_BUILTINS >++ return __atomic_add_fetch(&v, 1, __ATOMIC_ACQ_REL); >++#else >+ return __sync_add_and_fetch(&v, (uint64_t)1); >++#endif >+ }]])], GCC_64BIT_ATOMICS_SUPPORTED=yes, GCC_64BIT_ATOMICS_SUPPORTED=no) >++CFLAGS=$save_CFLAGS >+ if test "x$GCC_64BIT_ATOMICS_SUPPORTED" != xyes; then >+ DEFINES="$DEFINES -DMISSING_64BIT_ATOMICS" >+ fi > @@ -1121,7 +1121,7 @@ fi > AC_SUBST(LIBSENSORS_LIBS) > >Index: graphics/mesa-dri/files/patch-configure >=================================================================== >--- graphics/mesa-dri/files/patch-configure (revision 441063) >+++ graphics/mesa-dri/files/patch-configure (working copy) >@@ -1,38 +1,41 @@ > --- configure.orig 2017-04-01 15:33:50 UTC > +++ configure >-@@ -22350,19 +22350,19 @@ llvm_add_target() { >- # Call this inside ` ` to get the return value. >- # $1 is the llvm-config command with arguments. >- strip_unwanted_llvm_flags() { >-- # Use \> (marks the end of the word) >-- echo " `$1`" | sed \ >-- -e 's/\s\+-m\S*//g' \ >-- -e 's/\s\+-DNDEBUG\>//g' \ >-- -e 's/\s\+-D_GNU_SOURCE\>//g' \ >-- -e 's/\s\+-pedantic\>//g' \ >-- -e 's/\s\+-W\S*//g' \ >-- -e 's/\s\+-O\S*//g' \ >-- -e 's/\s\+-g\S*//g' \ >-- -e 's/-fno-rtti\>/-Fno-rtti/g' \ >-- -e 's/\s\+-f\S*//g' \ >-- -e 's/-Fno-rtti\>/-fno-rtti/g' \ >-- -e 's/^ //' >-+ echo " `$1` " | sed -E \ >-+ -e 's/[[:space:]]+-m[^[:space:]]*//g' \ >-+ -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \ >-+ -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \ >-+ -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \ >-+ -e 's/[[:space:]]+-W[^[:space:]]*//g' \ >-+ -e 's/[[:space:]]+-O[^[:space:]]*//g' \ >-+ -e 's/[[:space:]]+-g[^[:space:]]*//g' \ >-+ -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \ >-+ -e 's/[[:space:]]+-f[^[:space:]]*//g' \ >-+ -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \ >-+ -e 's/^[[:space:]]//' \ >-+ -e 's/[[:space:]]$//' >+@@ -20326,15 +20326,26 @@ else >+ fi >+ >+ >+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __sync_add_and_fetch_8 is supported" >&5 >++save_CFLAGS=$CFLAGS >++if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then >++ CFLAGS="$CFLAGS -DUSE_GCC_ATOMIC_BUILTINS" >++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __atomic_fetch_add_8 is supported" >&5 >++$as_echo_n "checking whether __atomic_fetch_add_8 is supported... " >&6; } >++else >++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __sync_add_and_fetch_8 is supported" >&5 >+ $as_echo_n "checking whether __sync_add_and_fetch_8 is supported... " >&6; } >++fi >+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >+ /* end confdefs.h. */ >+ >+ #include <stdint.h> >+ uint64_t v; >+ int main() { >++#ifdef USE_GCC_ATOMIC_BUILTINS >++ return __atomic_add_fetch(&v, 1, __ATOMIC_ACQ_REL); >++#else >+ return __sync_add_and_fetch(&v, (uint64_t)1); >++#endif > } >- >- llvm_set_environment_variables() { >+ _ACEOF >+ if ac_fn_c_try_link "$LINENO"; then : >+@@ -20344,6 +20355,7 @@ else >+ fi >+ rm -f core conftest.err conftest.$ac_objext \ >+ conftest$ac_exeext conftest.$ac_ext >++CFLAGS=$save_CFLAGS >+ if test "x$GCC_64BIT_ATOMICS_SUPPORTED" != xyes; then >+ DEFINES="$DEFINES -DMISSING_64BIT_ATOMICS" >+ fi > @@ -22560,7 +22560,7 @@ fi > > >Index: graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c >=================================================================== >--- graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (nonexistent) >+++ graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (working copy) >@@ -0,0 +1,13 @@ >+--- src/gallium/drivers/vc4/vc4_bufmgr.c.orig 2017-05-10 14:13:57 UTC >++++ src/gallium/drivers/vc4/vc4_bufmgr.c >+@@ -43,6 +43,10 @@ >+ #define VG(x) >+ #endif >+ >++#ifndef ETIME >++#define ETIME ETIMEDOUT >++#endif >++ >+ static bool dump_stats = false; >+ >+ static void > >Property changes on: graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.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_intel_tools_aubinator__error__decode.c >=================================================================== >--- graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c (nonexistent) >+++ graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c (working copy) >@@ -0,0 +1,12 @@ >+--- src/intel/tools/aubinator_error_decode.c.orig 2017-04-17 14:00:35 UTC >++++ src/intel/tools/aubinator_error_decode.c >+@@ -22,6 +22,9 @@ >+ * >+ */ >+ >++#ifdef __FreeBSD__ >++#define _WITH_GETLINE >++#endif >+ #include <stdbool.h> >+ #include <stdio.h> >+ #include <stdlib.h> > >Property changes on: graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.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 (nonexistent) >+++ graphics/mesa-dri/files/patch-src_util_build__id.c (working copy) >@@ -0,0 +1,15 @@ >+--- src/util/build_id.c.orig 2017-04-17 14:00:35 UTC >++++ src/util/build_id.c >+@@ -33,7 +33,11 @@ >+ #endif >+ >+ #ifndef ElfW >+-#define ElfW(type) Elf_##type >++#ifdef _LP64 >++#define ElfW(type) Elf64_##type >++#else >++#define ElfW(type) Elf32_##type >++#endif >+ #endif >+ >+ #define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1)) > >Property changes on: graphics/mesa-dri/files/patch-src_util_build__id.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_ralloc.c >=================================================================== >--- graphics/mesa-dri/files/patch-src_util_ralloc.c (revision 441063) >+++ graphics/mesa-dri/files/patch-src_util_ralloc.c (nonexistent) >@@ -1,18 +0,0 @@ >---- src/util/ralloc.c.orig 2017-04-01 15:33:37 UTC >-+++ src/util/ralloc.c >-@@ -338,6 +338,7 @@ ralloc_parent(const void *ptr) >- >- static void *autofree_context = NULL; >- >-+__attribute__((destructor)) >- static void >- autofree(void) >- { >-@@ -349,7 +350,6 @@ ralloc_autofree_context(void) >- { >- if (unlikely(autofree_context == NULL)) { >- autofree_context = ralloc_context(NULL); >-- atexit(autofree); >- } >- return autofree_context; >- } > >Property changes on: graphics/mesa-dri/files/patch-src_util_ralloc.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-1 >\ No newline at end of property >Index: graphics/mesa-dri/files/patch-src_util_u__atomic.c >=================================================================== >--- graphics/mesa-dri/files/patch-src_util_u__atomic.c (nonexistent) >+++ graphics/mesa-dri/files/patch-src_util_u__atomic.c (working copy) >@@ -0,0 +1,34 @@ >+--- src/util/u_atomic.c.orig 2017-05-10 14:13:58 UTC >++++ src/util/u_atomic.c >+@@ -34,6 +34,15 @@ >+ >+ static pthread_mutex_t sync_mutex = PTHREAD_MUTEX_INITIALIZER; >+ >++#ifdef USE_GCC_ATOMIC_BUILTINS >++uint64_t __atomic_fetch_add_8(uint64_t *ptr, uint64_t val, int memorder); >++uint64_t __atomic_fetch_sub_8(uint64_t *ptr, uint64_t val, int memorder); >++#else >++uint64_t __sync_add_and_fetch_8(uint64_t *ptr, uint64_t val); >++uint64_t __sync_sub_and_fetch_8(uint64_t *ptr, uint64_t val); >++#endif >++ >++#ifndef USE_GCC_ATOMIC_BUILTINS >+ WEAK uint64_t >+ __sync_add_and_fetch_8(uint64_t *ptr, uint64_t val) >+ { >+@@ -60,6 +69,8 @@ __sync_sub_and_fetch_8(uint64_t *ptr, uint64_t val) >+ return r; >+ } >+ >++#else >++ >+ WEAK uint64_t >+ __atomic_fetch_add_8(uint64_t *ptr, uint64_t val, int memorder) >+ { >+@@ -71,5 +82,6 @@ __atomic_fetch_sub_8(uint64_t *ptr, uint64_t val, int memorder) >+ { >+ return __sync_sub_and_fetch(ptr, val); >+ } >++#endif /* !USE_GCC_ATOMIC_BUILTINS */ >+ >+ #endif > >Property changes on: graphics/mesa-dri/files/patch-src_util_u__atomic.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/pkg-plist >=================================================================== >--- graphics/mesa-dri/pkg-plist (revision 441063) >+++ graphics/mesa-dri/pkg-plist (working copy) >@@ -25,7 +25,9 @@ include/GL/internal/dri_interface.h > @comment include/gbm.h > %%I915_DRIVER%%lib/dri/i915_dri.so > %%I965_DRIVER%%lib/dri/i965_dri.so >+%%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so > %%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so >+%%FREEDRENO_GDRIVER%%lib/dri/msm_dri.so > %%R200_DRIVER%%lib/dri/r200_dri.so > %%R300_GDRIVER%%lib/dri/r300_dri.so > %%R600_GDRIVER%%lib/dri/r600_dri.so >@@ -34,6 +36,7 @@ include/GL/internal/dri_interface.h > %%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so > %%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so > %%SWRAST_DRIVER%%lib/dri/swrast_dri.so >+%%VC4_GDRIVER%%lib/dri/vc4_dri.so > %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so > @comment lib/gallium-pipe/pipe_r300.so > @comment lib/gallium-pipe/pipe_r600.so >Index: graphics/libdrm/Makefile >=================================================================== >--- graphics/libdrm/Makefile (revision 441063) >+++ graphics/libdrm/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= libdrm > PORTVERSION= 2.4.80 >+PORTREVISION= 1 > PORTEPOCH= 1 > CATEGORIES= graphics x11 > MASTER_SITES= http://dri.freedesktop.org/libdrm/ >Index: graphics/libdrm/files/patch-libsync.h >=================================================================== >--- graphics/libdrm/files/patch-libsync.h (nonexistent) >+++ graphics/libdrm/files/patch-libsync.h (working copy) >@@ -0,0 +1,14 @@ >+--- libsync.h.orig 2017-04-14 23:29:46 UTC >++++ libsync.h >+@@ -75,7 +75,11 @@ static inline int sync_wait(int fd, int timeout) >+ } >+ return 0; >+ } else if (ret == 0) { >++#ifdef ETIME >+ errno = ETIME; >++#else >++ errno = ETIMEDOUT; >++#endif >+ return -1; >+ } >+ } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); > >Property changes on: graphics/libdrm/files/patch-libsync.h >___________________________________________________________________ >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219247
:
182554
|
182561
|
182651
| 182652