svn commit: r397198 - in head: devel devel/clinfo graphics/dri graphics/gbm graphics/libEGL graphics/libGL graphics/libGL/files graphics/libGL/files-old graphics/libglapi graphics/libglesv2 graphic...
Koop Mast
kwm at FreeBSD.org
Thu Sep 17 18:07:32 UTC 2015
Author: kwm
Date: Thu Sep 17 18:07:25 2015
New Revision: 397198
URL: https://svnweb.freebsd.org/changeset/ports/397198
Log:
Update Mesa port to 10.6.6 and add Clover.
Add beignet 1.1.0.
Add clinfo, clblas, clfft and clrng.
The major change is that all Mesa ports are now configured the same way.
This fixes several problems and enables new features. The details
are described in this blog post:
http://blogs.freebsdish.org/graphics/2015/03/18/unifying-mesa-ports-configure/
The second important change is the OpenCL support. Mesa's
implementation, Clover, is enabled as well as Beignet. Clover
targets all Gallium drivers, only Radeon GPUs in our case. Beignet
is for Intel GPUs starting with Ivy Bridge. Thanks to Johannes
Dieterich, O. Hartman, and Koop Mast for their work on OpenCL! As a
bonus, there are several OpenCL-based math ports added (clblas,
clfft and clrng). For more information and known issues, please see
https://wiki.freebsd.org/Graphics/OpenCL
The third change is the removal of Mesa 9.1.7 which was installed on
FreeBSD 9.3-RELEASE. There is now only one version of Mesa in the Ports
tree (10.6.6) for all supported versions of FreeBSD.
Other, smaller changes:
* Include libosmesa into the Mesa framework; this changes libOSMesa
shlib version.
* bsd.mesalib.mk was renamed and split up in two files namely
Makefile.common and Makefile.targets. So ports can overwrite variables
set by Makefile.common and are used by Makefile.targets.
* Some text in the pkg-descr files was wrong, clean it up. While here,
update the WWW to the main mesa3d.org upstream page.
* devel/clinfo was added, a glxinfo like program but for OpenCL.
Non-x86 hardware reports are very welcome since we changed the framework
quite a bit.
Obtained from: Graphics team development repo.
Added:
head/devel/clinfo/
head/devel/clinfo/Makefile (contents, props changed)
head/devel/clinfo/distinfo (contents, props changed)
head/devel/clinfo/pkg-descr (contents, props changed)
head/graphics/libGL/Makefile.common
- copied, changed from r397110, head/graphics/libGL/bsd.mesalib.mk
head/graphics/libGL/Makefile.targets
- copied, changed from r397110, head/graphics/libGL/bsd.mesalib.mk
head/graphics/libGL/files/patch-src_gallium_target_opencl_Makefile.in (contents, props changed)
head/graphics/libGL/files/patch-src_util_ralloc.c (contents, props changed)
head/lang/beignet/
head/lang/beignet/Makefile (contents, props changed)
head/lang/beignet/distinfo (contents, props changed)
head/lang/beignet/files/
head/lang/beignet/files/patch-CMakeLists.txt (contents, props changed)
head/lang/beignet/files/patch-CMake_FindLLVM.cmake (contents, props changed)
head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp (contents, props changed)
head/lang/beignet/files/patch-backend_src_backend_gen__reg__allocation.cpp (contents, props changed)
head/lang/beignet/files/patch-backend_src_ir_immediate.hpp (contents, props changed)
head/lang/beignet/files/patch-backend_src_sys_alloc.cpp (contents, props changed)
head/lang/beignet/files/patch-src_cl__alloc.c (contents, props changed)
head/lang/beignet/files/patch-src_cl__api.c (contents, props changed)
head/lang/beignet/files/patch-src_cl__device__id.c (contents, props changed)
head/lang/beignet/files/patch-src_cl__event.c (contents, props changed)
head/lang/beignet/files/patch-src_cl__program.c (contents, props changed)
head/lang/beignet/files/patch-src_git__sha1.sh (contents, props changed)
head/lang/beignet/files/patch-src_performance.c (contents, props changed)
head/lang/beignet/files/patch-utests_CMakeLists.txt (contents, props changed)
head/lang/beignet/files/patch-utests_builtin__exp.cpp (contents, props changed)
head/lang/beignet/files/patch-utests_utest.cpp (contents, props changed)
head/lang/beignet/files/patch-utests_utest__math__gen.py (contents, props changed)
head/lang/beignet/pkg-descr (contents, props changed)
head/lang/beignet/pkg-plist (contents, props changed)
head/lang/clover/
head/lang/clover/Makefile (contents, props changed)
head/lang/clover/pkg-descr (contents, props changed)
head/lang/clover/pkg-plist (contents, props changed)
head/math/clblas/
head/math/clblas/Makefile (contents, props changed)
head/math/clblas/distinfo (contents, props changed)
head/math/clblas/pkg-descr (contents, props changed)
head/math/clblas/pkg-plist (contents, props changed)
head/math/clfft/
head/math/clfft/Makefile (contents, props changed)
head/math/clfft/distinfo (contents, props changed)
head/math/clfft/files/
head/math/clfft/files/patch-src_include_sharedLibrary.h (contents, props changed)
head/math/clfft/pkg-descr (contents, props changed)
head/math/clfft/pkg-plist (contents, props changed)
head/math/clrng/
head/math/clrng/Makefile (contents, props changed)
head/math/clrng/distinfo (contents, props changed)
head/math/clrng/pkg-descr (contents, props changed)
head/math/clrng/pkg-plist (contents, props changed)
Deleted:
head/graphics/dri/pkg-plist-old
head/graphics/libGL/bsd.mesalib.mk
head/graphics/libGL/files-old/
head/graphics/libGL/files/patch-Makefile.in
head/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp
head/graphics/libosmesa/files/
Modified:
head/devel/Makefile
head/graphics/dri/Makefile
head/graphics/dri/pkg-plist
head/graphics/gbm/Makefile
head/graphics/gbm/pkg-descr
head/graphics/libEGL/Makefile
head/graphics/libEGL/pkg-descr
head/graphics/libEGL/pkg-plist
head/graphics/libGL/Makefile
head/graphics/libGL/distinfo
head/graphics/libGL/files/configure.ac
head/graphics/libGL/files/patch-configure
head/graphics/libGL/files/patch-src__loader__Makefile.in
head/graphics/libGL/files/patch-src__mesa__main__compiler.h
head/graphics/libGL/files/src__loader__Makefile.am
head/graphics/libGL/pkg-plist
head/graphics/libglapi/Makefile
head/graphics/libglapi/pkg-descr
head/graphics/libglesv2/Makefile
head/graphics/libglesv2/pkg-descr
head/graphics/libglesv2/pkg-plist
head/graphics/libosmesa/Makefile
head/graphics/libosmesa/pkg-plist
head/lang/Makefile
head/math/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Thu Sep 17 17:45:21 2015 (r397197)
+++ head/devel/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -252,6 +252,7 @@
SUBDIR += cld2
SUBDIR += clewn
SUBDIR += clig
+ SUBDIR += clinfo
SUBDIR += clisp-hyperspec
SUBDIR += clojure-cider
SUBDIR += cloudabi-binutils
Added: head/devel/clinfo/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/clinfo/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -0,0 +1,33 @@
+# Created by: Koop Mast <kwm at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= clinfo
+PORTVERSION= 2.0.15.04.28
+CATEGORIES= devel
+
+MAINTAINER= kwm at FreeBSD.org
+COMMENT= OpenCL info program like glxinfo is for libGL
+
+BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+
+USE_GITHUB= yes
+GH_ACCOUNT= Oblomov
+GH_TAGNAME= b953d226b7
+
+USES= gmake
+NO_CONFIGURE= yes
+ALL_TARGET= #
+PLIST_FILES= bin/clinfo \
+ man/man1/clinfo.1.gz
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-Wall|-Wall -I${LOCALBASE}/include|g; \
+ s|-lOpenCL|-lOpenCL -L${LOCALBASE}/lib|g' \
+ ${WRKSRC}/Makefile
+
+do-install:
+ @${INSTALL_PROGRAM} ${WRKSRC}/clinfo ${STAGEDIR}${PREFIX}/bin/
+ @${INSTALL_MAN} ${WRKSRC}/man/clinfo.1 ${STAGEDIR}${PREFIX}/man/man1/
+
+.include <bsd.port.mk>
Added: head/devel/clinfo/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/clinfo/distinfo Thu Sep 17 18:07:25 2015 (r397198)
@@ -0,0 +1,2 @@
+SHA256 (Oblomov-clinfo-2.0.15.04.28-b953d226b7_GH0.tar.gz) = 547cd53e656a787bffaab7308a4ac5f6bbd9dab23aaf723a820b86ff3f8122d4
+SIZE (Oblomov-clinfo-2.0.15.04.28-b953d226b7_GH0.tar.gz) = 25230
Added: head/devel/clinfo/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/clinfo/pkg-descr Thu Sep 17 18:07:25 2015 (r397198)
@@ -0,0 +1,8 @@
+A simple OpenCL application that enumerates all possible platform and
+device properties. Inspired by AMD's program of the same name, it is
+coded in pure C99 and it tries to output all possible information,
+including that provided by platform-specific extensions, and not to
+crash on platform-unsupported properties (e.g. 1.2 properties on 1.1
+platforms).
+
+WWW: https://github.com/Oblomov/clinfo
Modified: head/graphics/dri/Makefile
==============================================================================
--- head/graphics/dri/Makefile Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/dri/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -3,7 +3,7 @@
PORTNAME= dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${DRIREVISION}
+PORTREVISION= 0
PORTEPOCH= 2
CATEGORIES= graphics
@@ -18,12 +18,6 @@ USE_XORG= glproto x11 xext xxf86vm xdama
OPTIONS_DEFINE= TEXTURE
OPTIONS_DEFAULT=TEXTURE
-OPTIONS_DEFINE_i386= GALLIUM
-OPTIONS_DEFAULT_i386= GALLIUM
-OPTIONS_DEFINE_amd64= GALLIUM
-OPTIONS_DEFAULT_amd64= GALLIUM
-
-GALLIUM_DESC= Gallium (llvm backed) dri drivers
TEXTURE_DESC= Enable texture-float support (patent encumbered)
VDPAU_DESC= VDPAU (GPU video acceleration) support (needs Gallium)
@@ -31,20 +25,13 @@ PKGHELP= ${.CURDIR}/pkg-help
.include <bsd.port.options.mk>
-# gcc from base can't handle some code in mesa 9.1+
-# We only care for 9.x and 8.x. clang in 10.x is new enough.
-# This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
-. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000)
-CC=clang
-CXX=clang++
-CPP=clang-cpp
-. elif ${OSVERSION} < 901500
-USE_GCC=yes
-. endif
-
ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
+
+#src/mesa/libmesagallium.la
+#MESA_BUILD_WRKSRC= src/util src/gallium
+#MESA_INSTALL_WRKSRC= src/gallium
PLIST_SUB+= VERSION=${MESADISTVERSION}
@@ -52,29 +39,6 @@ PLIST_SUB+= VERSION=${MESADISTVERSION}
DRI_DRIVERS= ${ALL_DRI_DRIVERS}
.endif
-.if defined(WITH_NEW_MESA)
-DRIREVISION= 0
-PLIST= ${.CURDIR}/pkg-plist
-.else
-DRIREVISION= 6
-PLIST= ${.CURDIR}/pkg-plist-old
-.endif
-
-.if ${PORT_OPTIONS:MGALLIUM}
-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
-RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
-CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
-
-CONFIGURE_ARGS+=--enable-gallium-llvm \
- --enable-xvmc \
- --with-gallium-drivers=r300,r600,radeonsi,svga,swrast
-PLIST_SUB+= GALLIUM=""
-.else
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
- --disable-gallium-egl
-PLIST_SUB+= GALLIUM="@comment "
-.endif
-
.if ${PORT_OPTIONS:MTEXTURE}
CONFIGURE_ARGS+=--enable-texture-float
.endif
@@ -109,9 +73,11 @@ PLIST_SUB+= ${_d}_DRIVER="@comment "
. endif
.endfor
-.if !(${ARCH} == amd64 || ${ARCH} == i386)
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
+
+post-install:
+ @${RM} -rf ${STAGEDIR}/etc/OpenCL
+
.include <bsd.port.mk>
Modified: head/graphics/dri/pkg-plist
==============================================================================
--- head/graphics/dri/pkg-plist Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/dri/pkg-plist Thu Sep 17 18:07:25 2015 (r397198)
@@ -4,7 +4,6 @@
@comment include/EGL/eglextchromium.h
@comment include/EGL/eglmesaext.h
@comment include/EGL/eglplatform.h
-include/GL/internal/dri_interface.h
@comment include/GL/gl.h
@comment include/GL/gl_mangle.h
@comment include/GL/glcorearb.h
@@ -12,31 +11,53 @@ include/GL/internal/dri_interface.h
@comment include/GL/glx.h
@comment include/GL/glx_mangle.h
@comment include/GL/glxext.h
+include/GL/internal/dri_interface.h
@comment include/GL/osmesa.h
@comment include/GL/wglext.h
@comment include/GL/wmesa.h
+ at comment include/GLES2/gl2.h
+ at comment include/GLES2/gl2ext.h
+ at comment include/GLES2/gl2platform.h
+ at comment include/GLES3/gl3.h
+ at comment include/GLES3/gl31.h
+ at comment include/GLES3/gl3ext.h
+ at comment include/GLES3/gl3platform.h
@comment include/KHR/khrplatform.h
@comment include/gbm.h
-%%GALLIUM%%lib/dri/kms_swrast_dri.so
%%I915_DRIVER%%lib/dri/i915_dri.so
%%I965_DRIVER%%lib/dri/i965_dri.so
+lib/dri/kms_swrast_dri.so
%%R200_DRIVER%%lib/dri/r200_dri.so
-%%GALLIUM%%lib/dri/r300_dri.so
-%%GALLIUM%%lib/dri/r600_dri.so
+lib/dri/r300_dri.so
+lib/dri/r600_dri.so
%%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%GALLIUM%%lib/dri/radeonsi_dri.so
+lib/dri/radeonsi_dri.so
%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%GALLIUM%%lib/libXvMCr600.so
-%%GALLIUM%%lib/libXvMCr600.so.1
-%%GALLIUM%%lib/libXvMCr600.so.1.0
-%%GALLIUM%%lib/libXvMCr600.so.1.0.0
+lib/dri/vmwgfx_dri.so
+ at comment lib/gallium-pipe/pipe_r300.so
+ at comment lib/gallium-pipe/pipe_r600.so
+ at comment lib/gallium-pipe/pipe_radeonsi.so
+ at comment lib/gallium-pipe/pipe_swrast.so
+ at comment lib/gallium-pipe/pipe_vmwgfx.so
@comment lib/libEGL.so
@comment lib/libEGL.so.1
@comment lib/libEGL.so.1.0.0
@comment lib/libGL.so
@comment lib/libGL.so.1
@comment lib/libGL.so.1.2.0
+ at comment lib/libGLESv2.so
+ at comment lib/libGLESv2.so.2
+ at comment lib/libGLESv2.so.2.0.0
+ at comment lib/libMesaOpenCL.so
+ at comment lib/libMesaOpenCL.so.1
+ at comment lib/libMesaOpenCL.so.1.0.0
+ at comment lib/libOSMesa.so
+ at comment lib/libOSMesa.so.8
+ at comment lib/libOSMesa.so.8.0.0
+lib/libXvMCr600.so
+lib/libXvMCr600.so.1
+lib/libXvMCr600.so.1.0
+lib/libXvMCr600.so.1.0.0
@comment lib/libgbm.so
@comment lib/libgbm.so.1
@comment lib/libgbm.so.1.0.0
@@ -55,7 +76,9 @@ include/GL/internal/dri_interface.h
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
- at comment libdata/pkgconfig/egl.pc
libdata/pkgconfig/dri.pc
+ at comment libdata/pkgconfig/egl.pc
@comment libdata/pkgconfig/gbm.pc
@comment libdata/pkgconfig/gl.pc
+ at comment libdata/pkgconfig/glesv2.pc
+ at comment libdata/pkgconfig/osmesa.pc
Modified: head/graphics/gbm/Makefile
==============================================================================
--- head/graphics/gbm/Makefile Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/gbm/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -3,7 +3,7 @@
PORTNAME= gbm
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${GBM_REVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= gbm library
@@ -19,23 +19,12 @@ USE_XORG= x11 xau xcb xdmcp
USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \
xshmfence
-BUILD_WRKSRC= ${WRKSRC}/src/gbm
-INSTALL_WRKSRC= ${WRKSRC}/src/gbm
-
.include <bsd.port.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
+
+MESA_BUILD_WRKSRC= src/mapi src/gbm
+MESA_INSTALL_WRKSRC= src/gbm
-.if defined(WITH_NEW_MESA)
-GBM_REVISION= 0
-.else
-GBM_REVISION= 0
-.endif
-
-pre-build:
-.if defined(WITH_NEW_MESA)
- @cd ${WRKSRC}/src/mapi/ && ${MAKE_CMD} ${_MAKE_JOBS}
-.else
- @cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} ${_MAKE_JOBS}
-.endif
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
.include <bsd.port.mk>
Modified: head/graphics/gbm/pkg-descr
==============================================================================
--- head/graphics/gbm/pkg-descr Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/gbm/pkg-descr Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,3 +1,3 @@
-This package contains the EGL utility library.
+This package contains the gbm utility library.
-WWW: http://www.freedesktop.org/Software/xorg
+WWW: http://mesa3d.org/
Modified: head/graphics/libEGL/Makefile
==============================================================================
--- head/graphics/libEGL/Makefile Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libEGL/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -3,7 +3,7 @@
PORTNAME= libEGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${LIBEGL_REVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= OpenEGL library
@@ -11,7 +11,8 @@ COMMENT= OpenEGL library
LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
libexpat.so:${PORTSDIR}/textproc/expat2 \
libdevq.so:${PORTSDIR}/devel/libdevq \
- libdrm.so:${PORTSDIR}/graphics/libdrm
+ libdrm.so:${PORTSDIR}/graphics/libdrm \
+ libgbm.so:${PORTSDIR}/graphics/gbm
USE_XORG= x11 xau xcb xdmcp
@@ -20,38 +21,12 @@ USE_XORG+= glproto dri2proto xext xdamag
xshmfence
.include <bsd.port.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
-.if defined(WITH_NEW_MESA)
-BUILD_WRKSRC= src/egl/drivers/dri2 src/egl/main
-INSTALL_WRKSRC= src/egl/drivers/dri2 src/egl/main
-.else
-BUILD_WRKSRC= ${WRKSRC}/src/egl
-INSTALL_WRKSRC= ${WRKSRC}/src/egl
-.endif
-
-.if defined(WITH_NEW_MESA)
-LIBEGL_REVISION= 0
-.else
-LIBEGL_REVISION= 5
-.endif
-
-.if defined(WITH_NEW_MESA)
-do-build: egl-do-build
-do-install: egl-do-install
-
-egl-do-build:
-. for dir in ${BUILD_WRKSRC}
- @(cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
-. endfor
-
-egl-do-install:
-. for dir in ${INSTALL_WRKSRC}
- @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+MESA_BUILD_WRKSRC= src/mapi src/gbm src/egl/drivers/dri2 src/egl/main
+MESA_INSTALL_WRKSRC= src/egl/drivers/dri2 src/egl/main
-. endfor
-.endif
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
Modified: head/graphics/libEGL/pkg-descr
==============================================================================
--- head/graphics/libEGL/pkg-descr Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libEGL/pkg-descr Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,3 +1,3 @@
This package contains the EGL utility library.
-WWW: http://www.freedesktop.org/Software/xorg
+WWW: http://mesa3d.org/
Modified: head/graphics/libEGL/pkg-plist
==============================================================================
--- head/graphics/libEGL/pkg-plist Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libEGL/pkg-plist Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,6 +1,6 @@
include/EGL/egl.h
include/EGL/eglext.h
-%%NEW%%include/EGL/eglextchromium.h
+include/EGL/eglextchromium.h
include/EGL/eglmesaext.h
include/EGL/eglplatform.h
include/KHR/khrplatform.h
Modified: head/graphics/libGL/Makefile
==============================================================================
--- head/graphics/libGL/Makefile Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libGL/Makefile Thu Sep 17 18:07:25 2015 (r397198)
@@ -3,7 +3,7 @@
PORTNAME= libGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${LIBGLREVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= OpenGL library that renders using GLX or DRI
@@ -16,21 +16,18 @@ USE_XORG= glproto x11 xext xxf86vm xdama
presentproto xshmfence
.include <bsd.port.options.mk>
-.include "${.CURDIR}/bsd.mesalib.mk"
+.include "${.CURDIR}/Makefile.common"
-.if defined(WITH_NEW_MESA)
-LIBGLREVISION= 0
-.else
-LIBGLREVISION= 4
-.endif
-
-.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
+MESA_BUILD_WRKSRC= src/mapi src/glx
+MESA_INSTALL_WRKSRC= src/glx
+
+.include "${.CURDIR}/Makefile.targets"
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
${STAGEDIR}${PREFIX}/lib/.mesa/
+ @cd ${WRKSRC}/src/mesa && ${SETENV} DESTDIR=${STAGEDIR} \
+ ${MAKE_CMD} install-pkgconfigDATA install-glHEADERS
.include <bsd.port.mk>
Copied and modified: head/graphics/libGL/Makefile.common (from r397110, head/graphics/libGL/bsd.mesalib.mk)
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk Thu Sep 17 12:09:53 2015 (r397110, copy source)
+++ head/graphics/libGL/Makefile.common Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,4 +1,4 @@
-# bsd.mesalib.mk - shared code between MesaLib ports.
+# Makefile.common - shared code between MesaLib ports.
#
# !!! Here be dragons !!! (they seem to be everywhere these days)
#
@@ -15,58 +15,37 @@
#
# $FreeBSD$
-# hw context support in the i915kms driver
-.if ${OPSYS} == FreeBSD && \
- (${OSVERSION} >= 1000717 && ${OSVERSION} < 1100000 || \
- ${OSVERSION} >= 1100035)
-WITH_NEW_MESA=1
-.endif
-
-.if ${OPSYS} == DragonFly && ${DFLYVERSION} >= 300901
-WITH_NEW_MESA=1
-.endif
-
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-.if defined(WITH_NEW_MESA)
-MESABASEVERSION= 10.4.6
+MESABASEVERSION= 10.6.6
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
-PLIST_SUB+= OLD="@comment " NEW=""
-
-# work around libarchive bug?
-EXTRACT_CMD= ${LOCALBASE}/bin/gtar
-EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-.else
-MESABASEVERSION= 9.1.7
-MESASUBVERSION=
-MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/
-PLIST_SUB+= OLD="" NEW="@comment "
-.endif
+DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX}
-DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
MAINTAINER= x11 at FreeBSD.org
-BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
- ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-
+BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend
LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq
-USES+= bison gettext-tools gmake libtool pathfix pkgconfig \
- python:2,build shebangfix tar:bzip2
+USES+= compiler:c++11-lib gettext-tools gmake libtool \
+ pathfix pkgconfig shebangfix tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -Wl,-Y${LOCALBASE}/lib
PKGINSTALL= ${.CURDIR}/pkg-install
PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
+# only have one port to check with portscout.
+.if ${PORTNAME} != libGL
+PORTSCOUT= ignore:1
+.endif
+
.if ${OSVERSION} < 1000033
BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex
@@ -77,89 +56,66 @@ python_CMD= ${LOCALBASE}/bin/python2
SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
src/gallium/drivers/svga/svgadump/svga_dump.py \
src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py
-
-.if defined(WITH_NEW_MESA)
SHEBANG_FILES+= src/mapi/mapi_abi.py
-.endif
MASTERDIR= ${.CURDIR}/../../graphics/libGL
-.if defined(WITH_NEW_MESA)
PATCHDIR= ${MASTERDIR}/files
-CONFIGURE_ARGS+= --disable-dri3
-.else
-PATCHDIR= ${MASTERDIR}/files-old
-.endif
+WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}
INSTALL_TARGET= install-strip
COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
-.if defined(WITH_NEW_MESA)
-MESA_LLVM_VER=35
-.else
-MESA_LLVM_VER=33
-.endif
+MESA_LLVM_VER=36
+
+# DRI3 needs PRIME support in the kernel to work
+CONFIGURE_ARGS+= --disable-dri3
+
+CONFIGURE_ARGS+= --enable-gbm
+
+# libEGL, dri and clover need gallium enabled.
+# the third option in --with-egl-platforms is wayland.
+CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
-.if ${COMPONENT:Mglesv2} == ""
-CONFIGURE_ARGS+= --disable-gles2
-.else
CONFIGURE_ARGS+= --enable-gles2
+
+# Clover (OpenCL).
+.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000)
+BUILD_DEPENDS+= libclc>=0.0.r222830:${PORTSDIR}/devel/libclc
+
+# We need the clang port too even if it is not used to compile because
+# Clover needs some of the clang includes to build.
+.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != ""
+BUILD_DEPENDS+= clang${MESA_LLVM_VER}>=0:${PORTSDIR}/lang/clang${MESA_LLVM_VER}
.endif
-.if ${COMPONENT:Megl} == ""
-CONFIGURE_ARGS+= --disable-egl
+CONFIGURE_ARGS+= --enable-opencl \
+ --enable-opencl-icd
.else
-CONFIGURE_ARGS+= --enable-egl
+CONFIGURE_ARGS+= --disable-opencl
.endif
-.if ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+= --disable-opencl
-.else
-CONFIGURE_ARGS+= --enable-opencl
+CONFIGURE_ARGS+= --enable-osmesa
+
+# gallium
+BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
+.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
+RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
.endif
+CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
-.if ${COMPONENT:Mdri} == "" && ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+=--with-dri-drivers=no
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
-.else
-# done in the dri port
-# need to enable this globaly because it also used in dri ..
-# the third possible option is wayland.
-CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
+CONFIGURE_ARGS+=--enable-gallium-llvm \
+ --enable-xvmc \
+ --with-gallium-drivers=r300,r600,radeonsi,svga,swrast
+
+.if !(${ARCH} == amd64 || ${ARCH} == i386)
+CONFIGURE_ARGS+=--disable-gallium-intel
.endif
+# what to do with this one? Currently disabled in dri.
.if ${COMPONENT:Mvdpau} == ""
CONFIGURE_ARGS+=--disable-vdpau
.else
CONFIGURE_ARGS+=--enable-vdpau
.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
-.if !defined(WITH_NEW_MESA)
- @${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
- ${WRKSRC}/src/glsl/builtins/tools/*.py
-.else
- @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
-.endif
- @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/main/get_hash_generator.py \
- ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
- ${WRKSRC}/src/mapi/glapi/gen/gl_table.py
-
-pre-build: pre-mesa-build
-
-pre-mesa-build:
-.if defined(WITH_NEW_MESA)
-# do propper gmake target.
- @cd ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool && ${MAKE_CMD}
- @cd ${WRKSRC}/src/loader && ${MAKE_CMD} libloader.la
-.endif
-
Copied and modified: head/graphics/libGL/Makefile.targets (from r397110, head/graphics/libGL/bsd.mesalib.mk)
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk Thu Sep 17 12:09:53 2015 (r397110, copy source)
+++ head/graphics/libGL/Makefile.targets Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,165 +1,41 @@
-# bsd.mesalib.mk - shared code between MesaLib ports.
-#
-# !!! Here be dragons !!! (they seem to be everywhere these days)
-#
-# Remember to upgrade the following ports everytime you bump MESAVERSION:
-#
-# - graphics/dri
-# - graphics/gbm
-# - graphics/libEGL
-# - graphics/libGL
-# - graphics/libglapi
-# - graphics/libglesv2
-# - graphics/libosmesa
-# - lang/clover
-#
# $FreeBSD$
-
-# hw context support in the i915kms driver
-.if ${OPSYS} == FreeBSD && \
- (${OSVERSION} >= 1000717 && ${OSVERSION} < 1100000 || \
- ${OSVERSION} >= 1100035)
-WITH_NEW_MESA=1
-.endif
-
-.if ${OPSYS} == DragonFly && ${DFLYVERSION} >= 300901
-WITH_NEW_MESA=1
-.endif
-
-MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
-MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-
-.if defined(WITH_NEW_MESA)
-MESABASEVERSION= 10.4.6
-# if there is a subversion, don't include the '-' between 7.11-rc2.
-MESASUBVERSION=
-
-MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
-PLIST_SUB+= OLD="@comment " NEW=""
-
-# work around libarchive bug?
-EXTRACT_CMD= ${LOCALBASE}/bin/gtar
-EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-
-.else
-MESABASEVERSION= 9.1.7
-MESASUBVERSION=
-MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/
-PLIST_SUB+= OLD="" NEW="@comment "
-.endif
-
-DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= x11 at FreeBSD.org
-
-BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
- ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-
-LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq
-
-USES+= bison gettext-tools gmake libtool pathfix pkgconfig \
- python:2,build shebangfix tar:bzip2
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-
-CPPFLAGS+= -isystem${LOCALBASE}/include
-LDFLAGS+= -Wl,-Y${LOCALBASE}/lib
-
-PKGINSTALL= ${.CURDIR}/pkg-install
-PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
-
-.if ${OSVERSION} < 1000033
-BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex
-.endif
-
-python_OLD_CMD= "/usr/bin/env[[:space:]]python"
-python_CMD= ${LOCALBASE}/bin/python2
-SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
- src/gallium/drivers/svga/svgadump/svga_dump.py \
- src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py
-
-.if defined(WITH_NEW_MESA)
-SHEBANG_FILES+= src/mapi/mapi_abi.py
-.endif
-
-MASTERDIR= ${.CURDIR}/../../graphics/libGL
-.if defined(WITH_NEW_MESA)
-PATCHDIR= ${MASTERDIR}/files
-CONFIGURE_ARGS+= --disable-dri3
-.else
-PATCHDIR= ${MASTERDIR}/files-old
-.endif
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}
-INSTALL_TARGET= install-strip
-
-COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
-
-.if defined(WITH_NEW_MESA)
-MESA_LLVM_VER=35
-.else
-MESA_LLVM_VER=33
-.endif
-
-.if ${COMPONENT:Mglesv2} == ""
-CONFIGURE_ARGS+= --disable-gles2
-.else
-CONFIGURE_ARGS+= --enable-gles2
-.endif
-
-.if ${COMPONENT:Megl} == ""
-CONFIGURE_ARGS+= --disable-egl
-.else
-CONFIGURE_ARGS+= --enable-egl
-.endif
-
-.if ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+= --disable-opencl
-.else
-CONFIGURE_ARGS+= --enable-opencl
-.endif
-
-.if ${COMPONENT:Mdri} == "" && ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+=--with-dri-drivers=no
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
-.else
-# done in the dri port
-# need to enable this globaly because it also used in dri ..
-# the third possible option is wayland.
-CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
-.endif
-
-.if ${COMPONENT:Mvdpau} == ""
-CONFIGURE_ARGS+=--disable-vdpau
-.else
-CONFIGURE_ARGS+=--enable-vdpau
-.endif
+#
+# this file holds common targets
post-patch:
@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
+ -e 's|python2 python|python2disabled pythondisabled|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
-.if !defined(WITH_NEW_MESA)
- @${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
- ${WRKSRC}/src/glsl/builtins/tools/*.py
-.else
@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
-.endif
@${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
${WRKSRC}/src/mesa/main/get_hash_generator.py \
${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
${WRKSRC}/src/mapi/glapi/gen/gl_table.py
-pre-build: pre-mesa-build
+pre-build: mesa-pre-build
-pre-mesa-build:
-.if defined(WITH_NEW_MESA)
+#custom targets so we can build parts of Mesa
+mesa-pre-build:
# do propper gmake target.
- @cd ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool && ${MAKE_CMD}
- @cd ${WRKSRC}/src/loader && ${MAKE_CMD} libloader.la
+ @cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD}
+ @cd ${WRKSRC}/src/loader && ${MAKE_CMD}
+# libloader.la
+
+.if defined(MESA_BUILD_WRKSRC)
+do-build:
+. for dir in ${MESA_BUILD_WRKSRC}
+ (cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
+. endfor
+.endif
+
+.if defined(MESA_INSTALL_WRKSRC)
+do-install:
+. for dir in ${MESA_INSTALL_WRKSRC}
+ (cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+. endfor
.endif
Modified: head/graphics/libGL/distinfo
==============================================================================
--- head/graphics/libGL/distinfo Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libGL/distinfo Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,4 +1,2 @@
-SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0
-SIZE (MesaLib-9.1.7.tar.bz2) = 6134393
-SHA256 (MesaLib-10.4.6.tar.bz2) = d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735
-SIZE (MesaLib-10.4.6.tar.bz2) = 7520024
+SHA256 (mesa-10.6.6.tar.xz) = 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778
+SIZE (mesa-10.6.6.tar.xz) = 7040744
Modified: head/graphics/libGL/files/configure.ac
==============================================================================
--- head/graphics/libGL/files/configure.ac Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libGL/files/configure.ac Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,14 +1,14 @@
---- configure.ac.orig 2014-11-18 03:23:13.000000000 +0100
-+++ configure.ac 2014-11-21 12:50:56.104986267 +0100
-@@ -37,6 +37,7 @@
+--- configure.ac.orig 2015-03-28 19:20:39.000000000 +0100
++++ configure.ac 2015-03-29 12:20:43.817681000 +0200
+@@ -68,6 +68,7 @@
DRI3PROTO_REQUIRED=1.0
PRESENTPROTO_REQUIRED=1.0
LIBUDEV_REQUIRED=151
+LIBDEVQ_REQUIRED=0.0.2
GLPROTO_REQUIRED=1.4.14
LIBOMXIL_BELLAGIO_REQUIRED=0.0
- VDPAU_REQUIRED=0.4.1
-@@ -54,7 +55,7 @@
+ LIBVA_REQUIRED=0.35.0
+@@ -87,7 +88,7 @@
AM_PROG_CC_C_O
AM_PROG_AS
AX_CHECK_GNU_MAKE
@@ -17,7 +17,7 @@
AC_PROG_SED
AC_PROG_MKDIR_P
-@@ -617,7 +618,7 @@
+@@ -689,7 +690,7 @@
[enable_dri=yes])
case "$host_os" in
@@ -26,7 +26,7 @@
dri3_default=yes
;;
*)
-@@ -883,6 +884,9 @@
+@@ -955,6 +956,9 @@
PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED],
have_libudev=yes, have_libudev=no)
@@ -36,7 +36,7 @@
AC_ARG_ENABLE([sysfs],
[AS_HELP_STRING([--enable-sysfs],
[enable /sys PCI identification @<:@default=disabled@:>@])],
-@@ -979,6 +983,10 @@
+@@ -1051,6 +1055,10 @@
DEFINES="$DEFINES -DHAVE_LIBUDEV"
have_pci_id=yes
fi
@@ -47,7 +47,7 @@
if test "$have_sysfs" = yes; then
DEFINES="$DEFINES -DHAVE_SYSFS"
-@@ -1101,6 +1109,23 @@
+@@ -1173,6 +1181,23 @@
;;
gnu*)
DEFINES="$DEFINES -DHAVE_ALIAS"
@@ -71,7 +71,7 @@
;;
cygwin*)
if test "x$with_dri_drivers" = "xyes"; then
-@@ -1278,6 +1303,8 @@
+@@ -1350,6 +1375,8 @@
AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes)
if test "x$need_pci_id$have_libudev" = xyesyes; then
GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
@@ -80,7 +80,27 @@
else
GBM_PC_REQ_PRIV=""
fi
-@@ -1724,8 +1751,6 @@
+@@ -1528,9 +1555,19 @@
+ AC_MSG_ERROR([cannot enable OpenCL without Gallium])
+ fi
+
++ if test "x$acv_mesa_CLANG" = xno; then
++
++ GCC_VERSION=`$CC -dumpversion`
++ if test $? -eq 0; then
++ GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
++ GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
++ fi
++
+ if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
+ AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
+ fi
++# end of clang test.
++ fi
+
+ if test "x$have_libclc" = xno; then
+ AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
+@@ -1819,8 +1856,6 @@
CLANG_LIBDIR=${LLVM_LIBDIR}
fi
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
Modified: head/graphics/libGL/files/patch-configure
==============================================================================
--- head/graphics/libGL/files/patch-configure Thu Sep 17 17:45:21 2015 (r397197)
+++ head/graphics/libGL/files/patch-configure Thu Sep 17 18:07:25 2015 (r397198)
@@ -1,6 +1,6 @@
---- configure.orig 2014-11-21 12:54:55.273970976 +0100
-+++ configure 2014-11-21 12:55:25.070967392 +0100
-@@ -853,6 +853,8 @@
+--- configure.orig 2015-03-29 12:20:36.346485000 +0200
++++ configure 2015-03-29 12:21:17.768637000 +0200
+@@ -863,6 +863,8 @@
GLPROTO_CFLAGS
XLIBGL_LIBS
XLIBGL_CFLAGS
@@ -9,7 +9,7 @@
LIBUDEV_LIBS
LIBUDEV_CFLAGS
LIBDRM_LIBS
-@@ -1143,6 +1145,8 @@
+@@ -1158,6 +1160,8 @@
LIBDRM_LIBS
LIBUDEV_CFLAGS
LIBUDEV_LIBS
@@ -18,7 +18,7 @@
XLIBGL_CFLAGS
XLIBGL_LIBS
GLPROTO_CFLAGS
-@@ -1942,6 +1946,10 @@
+@@ -1966,6 +1970,10 @@
C compiler flags for LIBUDEV, overriding pkg-config
LIBUDEV_LIBS
linker flags for LIBUDEV, overriding pkg-config
@@ -29,24 +29,24 @@
XLIBGL_CFLAGS
C compiler flags for XLIBGL, overriding pkg-config
XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
-@@ -5085,6 +5093,7 @@
+@@ -5232,6 +5240,7 @@
DRI3PROTO_REQUIRED=1.0
PRESENTPROTO_REQUIRED=1.0
LIBUDEV_REQUIRED=151
+LIBDEVQ_REQUIRED=0.0.2
GLPROTO_REQUIRED=1.4.14
LIBOMXIL_BELLAGIO_REQUIRED=0.0
- VDPAU_REQUIRED=0.4.1
-@@ -6503,7 +6512,7 @@
+ LIBVA_REQUIRED=0.35.0
+@@ -6675,7 +6686,7 @@
fi
-
-
+
+
-for ac_prog in python2 python
+for ac_prog in python2.7 python2 python
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -20025,7 +20034,7 @@
+@@ -20709,7 +20718,7 @@
case "$host_os" in
@@ -55,7 +55,7 @@
dri3_default=yes
;;
*)
-@@ -20543,6 +20552,78 @@
+@@ -21227,6 +21236,78 @@
have_libudev=yes
fi
@@ -134,7 +134,7 @@
# Check whether --enable-sysfs was given.
if test "${enable_sysfs+set}" = set; then :
enableval=$enable_sysfs; have_sysfs="$enableval"
-@@ -21258,6 +21339,10 @@
+@@ -21942,6 +22023,10 @@
DEFINES="$DEFINES -DHAVE_LIBUDEV"
have_pci_id=yes
fi
@@ -145,7 +145,7 @@
if test "$have_sysfs" = yes; then
DEFINES="$DEFINES -DHAVE_SYSFS"
-@@ -21385,6 +21470,22 @@
+@@ -22069,6 +22154,22 @@
;;
gnu*)
DEFINES="$DEFINES -DHAVE_ALIAS"
@@ -168,7 +168,7 @@
;;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list