Skip to content

Commit

Permalink
graphics/mesa-dri: switch to llvm60
Browse files Browse the repository at this point in the history
PR:		227682


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@468501 35697150-7ecd-e111-bb59-0022644237b5
  • Loading branch information
jbeich committed Apr 27, 2018
1 parent d6d4f42 commit 29199ca
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Mk/bsd.gecko.mk
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ USE_XORG+= xcb
.endif

.if ${MOZILLA_VER:R:R} >= 56
MESA_LLVM_VER?= 50
MESA_LLVM_VER?= 60
BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
.endif
Expand Down
3 changes: 2 additions & 1 deletion devel/libclc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= libclc
DISTVERSION= 0.3.0.20171127
PORTREVISION= 1
CATEGORIES= devel

MAINTAINER= x11@FreeBSD.org
Expand All @@ -24,7 +25,7 @@ USES= gmake python:2.7,build gmake
USE_LDCONFIG= yes
MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR}

LLVMVER= ${MESA_LLVM_VER:U50}
LLVMVER= ${MESA_LLVM_VER:U60}

ALL_TARGET=

Expand Down
3 changes: 2 additions & 1 deletion emulators/rpcs3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.5-232
DISTVERSIONSUFFIX= -g98b715d8c
PORTREVISION= 1
CATEGORIES= emulators

MAINTAINER= jbeich@FreeBSD.org
Expand Down Expand Up @@ -44,7 +45,7 @@ CMAKE_OFF= USE_NATIVE_INSTRUCTIONS
CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config
LDFLAGS+= -Wl,--as-needed # GLU
MESA_LLVM_VER?= 50
MESA_LLVM_VER?= 60

OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
OPTIONS_DEFAULT=ALSA LLVM VULKAN
Expand Down
1 change: 1 addition & 0 deletions graphics/mesa-dri/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
PORTREVISION= 1
CATEGORIES= graphics

COMMENT= OpenGL hardware acceleration drivers for DRI2+
Expand Down
2 changes: 1 addition & 1 deletion graphics/mesa-dri/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ INSTALL_TARGET= install-strip
# need LLVM for libEGL wherever possible, but mixing GCC and LLVM breaks Gallium
.if ${CHOSEN_COMPILER_TYPE} == clang \
|| (${COMPONENT} == libs && ${ARCH} != sparc64) # no working LLVM
MESA_LLVM_VER?= 50
MESA_LLVM_VER?= 60
.endif

.if "${MESA_LLVM_VER}" != ""
Expand Down
4 changes: 2 additions & 2 deletions lang/beignet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
PORTNAME= beignet
DISTVERSION= 1.3.2
DISTVERSIONSUFFIX= -source
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= https://01.org/sites/default/files/

Expand All @@ -29,7 +29,7 @@ USE_GL= gl egl
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh
ALL_TARGET= all
LLVMVER= ${MESA_LLVM_VER:U50}
LLVMVER= ${MESA_LLVM_VER:U60}

CMAKE_ARGS= -DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVMVER} \
-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVMVER} \
Expand Down
2 changes: 1 addition & 1 deletion www/firefox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= firefox
DISTVERSION= 59.0.2
PORTREVISION= 7
PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/
Expand Down
2 changes: 1 addition & 1 deletion www/waterfox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= waterfox
DISTVERSION= 56.1.0
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= www ipv6

MAINTAINER= jbeich@FreeBSD.org
Expand Down

0 comments on commit 29199ca

Please sign in to comment.