From owner-svn-ports-all@FreeBSD.ORG Fri Oct 17 09:53:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2D4936B; Fri, 17 Oct 2014 09:53:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 898C5F25; Fri, 17 Oct 2014 09:53:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9H9rI03043236; Fri, 17 Oct 2014 09:53:18 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9H9rEXt043217; Fri, 17 Oct 2014 09:53:14 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201410170953.s9H9rEXt043217@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Fri, 17 Oct 2014 09:53:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371035 - in head: Mk graphics graphics/dri graphics/gbm graphics/libEGL graphics/libGL graphics/libGL/files graphics/libGL/files-old graphics/libglapi graphics/libglesv2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2014 09:53:18 -0000 Author: kwm Date: Fri Oct 17 09:53:13 2014 New Revision: 371035 URL: https://svnweb.freebsd.org/changeset/ports/371035 QAT: https://qat.redports.org/buildarchive/r371035/ Log: Update Mesa ports to new default of 9.1.7 and more recent version to 10.3.0. The port will switch to the newer version if hw context is available in the i915kms driver. - Get ride of WITH_NEW_XORG. - Use @comment in plist to ignore unwanted files in the stagedir, instead of trying to remove them in post-install. - Bump portrevision of 9.1.7 due to dependency changes. - Drop :keepla from USES=libtool. - Drop @dirrm[try] from plists - Give dri propper options, with pkg-help for additional information. - Make separate plist for dri for the different versions, the combined plist was headache inducing. - Add "workaround" patches to allow clang to build the dri port on i386 [1]. USE_GCC is now only needed for 8.x. - Add gbm port and USE_GL switch for it. PR: 192286 [1] Submitted by: Carlos Jacobo Puga Medina [1] Approved by: portmgr (bapt@) In collaberation with: dumbbell@ Obtained from: xorg-dev Added: head/graphics/dri/pkg-help (contents, props changed) head/graphics/dri/pkg-plist-old (contents, props changed) head/graphics/gbm/ head/graphics/gbm/Makefile (contents, props changed) head/graphics/gbm/pkg-descr (contents, props changed) head/graphics/gbm/pkg-plist (contents, props changed) head/graphics/libGL/files-old/patch-Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src-glsl_ir_constant_expression.cpp (contents, props changed) head/graphics/libGL/files-old/patch-src__egl__drivers__dri2__Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src__egl__drivers__dri2__common.c (contents, props changed) head/graphics/libGL/files-old/patch-src__egl__drivers__glx__Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__include__pipe__p_config.h (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__state_trackers__egl__drm__native_drm.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__targets__egl-static__egl.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gallium__targets__gbm__Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src__gbm__Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src__gbm__backends__dri__driver_name.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gbm__main__common.c (contents, props changed) head/graphics/libGL/files-old/patch-src__gbm__main__common.h (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_r300_r300-chipset.c (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-asm.c (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-shader.c (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600_state_common.c (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_drivers_radeonsi_r600-buffer.c (contents, props changed) head/graphics/libGL/files-old/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c (contents, props changed) head/graphics/libGL/files-old/patch-src_mapi_glapi_gen_gl-gentable.py (contents, props changed) head/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h (contents, props changed) head/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h (contents, props changed) head/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h (contents, props changed) head/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in (contents, props changed) head/graphics/libGL/files-old/patch-src_mesa_main_compiler.h (contents, props changed) head/graphics/libGL/files-old/patch-src_mesa_main_imports.c (contents, props changed) head/graphics/libGL/files-old/pkg-deinstall.in (contents, props changed) head/graphics/libGL/files-old/pkg-install.in (contents, props changed) head/graphics/libGL/files/configure.ac (contents, props changed) head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c (contents, props changed) head/graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp (contents, props changed) head/graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c (contents, props changed) head/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp (contents, props changed) head/graphics/libGL/files/patch-src__loader__Makefile.in (contents, props changed) head/graphics/libGL/files/patch-src__loader__loader.c (contents, props changed) head/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h (contents, props changed) head/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h (contents, props changed) head/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h (contents, props changed) head/graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py (contents, props changed) head/graphics/libGL/files/patch-src__mesa__main__compiler.h (contents, props changed) head/graphics/libGL/files/patch-src__mesa__main__imports.c (contents, props changed) head/graphics/libGL/files/src__loader__Makefile.am (contents, props changed) Deleted: head/graphics/libGL/files-old/patch-mach64_context.h head/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S head/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S head/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S head/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S head/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c head/graphics/libGL/files-old/patch-src_mesa_Makefile head/graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp head/graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c head/graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c head/graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c head/graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py head/graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in head/graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in head/graphics/libGL/files/patch-src_mesa_main_compiler.h head/graphics/libGL/files/patch-src_mesa_main_imports.c Modified: head/Mk/bsd.port.mk head/graphics/Makefile head/graphics/dri/Makefile head/graphics/dri/pkg-plist head/graphics/libEGL/Makefile head/graphics/libEGL/pkg-plist head/graphics/libGL/Makefile head/graphics/libGL/bsd.mesalib.mk head/graphics/libGL/distinfo head/graphics/libGL/files-old/patch-configure head/graphics/libGL/files/patch-Makefile.in head/graphics/libGL/files/patch-configure head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h head/graphics/libGL/files/pkg-install.in head/graphics/libGL/pkg-plist head/graphics/libglapi/Makefile head/graphics/libglapi/pkg-descr head/graphics/libglapi/pkg-plist head/graphics/libglesv2/Makefile head/graphics/libglesv2/pkg-plist Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Oct 17 09:45:18 2014 (r371034) +++ head/Mk/bsd.port.mk Fri Oct 17 09:53:13 2014 (r371035) @@ -1773,6 +1773,7 @@ RUN_DEPENDS+= ${LINUX_BASE_PORT} PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' +_GL_gbm_LIB_DEPENDS= libgbm.so:${PORTSDIR}/graphics/gbm _GL_glesv2_LIB_DEPENDS= libGLESv2.so:${PORTSDIR}/graphics/libglesv2 _GL_egl_LIB_DEPENDS= libEGL.so:${PORTSDIR}/graphics/libEGL _GL_gl_LIB_DEPENDS= libGL.so:${PORTSDIR}/graphics/libGL Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/Makefile Fri Oct 17 09:53:13 2014 (r371035) @@ -226,6 +226,7 @@ SUBDIR += fyre SUBDIR += g2 SUBDIR += gauche-gl + SUBDIR += gbm SUBDIR += gcolor SUBDIR += gcolor2 SUBDIR += gd Modified: head/graphics/dri/Makefile ============================================================================== --- head/graphics/dri/Makefile Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/dri/Makefile Fri Oct 17 09:53:13 2014 (r371035) @@ -3,7 +3,7 @@ PORTNAME= dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 5 +PORTREVISION= ${DRIREVISION} PORTEPOCH= 2 CATEGORIES= graphics @@ -12,31 +12,37 @@ COMMENT= OpenGL hardware acceleration dr LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \ libexpat.so:${PORTSDIR}/textproc/expat2 -USES+= gettext:build -USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \ + presentproto xvmc xshmfence + +OPTIONS_DEFINE= TEXTURE + +OPTIONS_DEFINE_i386= GALLIUM VDPAU +OPTIONS_DEFAULT_i386= GALLIUM VDPAU +OPTIONS_DEFINE_amd64= GALLIUM VDPAU +OPTIONS_DEFAULT_amd64= GALLIUM VDPAU + +GALLIUM_DESC= Gallium (llvm backed) dri drivers +TEXTURE_DESC= Enable texture-float support (patent encumbered) +VDPAU_DESC= VDPAU (GPU video acceleration) support (needs Gallium) + +PKGHELP= ${.CURDIR}/pkg-help .include # gcc from base can't handle some code in mesa 9.1+ -# We only care for 9.x and 8.x, not for old pre-clang default current. +# 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 defined(WITH_NEW_XORG) -. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) \ - && ${ARCH} == amd64 +. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) CC=clang CXX=clang++ CPP=clang-cpp . elif ${OSVERSION} < 901500 USE_GCC=yes . endif -.endif ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST -.if !defined(WITH_NEW_XORG) -ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME -.endif - .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" PLIST_SUB+= VERSION=${MESADISTVERSION} @@ -45,42 +51,63 @@ PLIST_SUB+= VERSION=${MESADISTVERSION} DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif -.if defined(WITH_NEW_XORG) -. if !defined(WITHOUT_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) -BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 -CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 +.if defined(WITH_NEW_MESA) +DRIREVISION= 0 +PLIST= ${.CURDIR}/pkg-plist +.else +DRIREVISION= 6 +PLIST= ${.CURDIR}/pkg-plist-old +.endif -CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl +.if ${PORT_OPTIONS:MGALLIUM} +. if defined(WITH_NEW_MESA) +# keep in sync with libopencl please +BUILD_DEPENDS+= llvm34>=0:${PORTSDIR}/devel/llvm34 +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config34 +. else +BUILD_DEPENDS+= llvm33>=0:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 +. endif -CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast +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 +.else +CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ + --disable-gallium-egl PLIST_SUB+= GALLIUM="@comment " -. endif -. if ${ARCH} == powerpc || ${ARCH} == powerpc64 +.endif + +.if ${PORT_OPTIONS:MTEXTURE} +CONFIGURE_ARGS+=--enable-texture-float +.endif + +.if ${PORT_OPTIONS:MVDPAU} +CONFIGURE_ARGS+=--enable-vdpau +LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +PLIST_SUB+= VDPAU="" +.else +CONFIGURE_ARGS+=--disable-vdpau +PLIST_SUB+= VDPAU="@comment " +.endif + +.if ${ARCH} == powerpc || ${ARCH} == powerpc64 DRI_DRIVERS= RADEON SWRAST -. endif -. if ${ARCH} == sparc64 || ${ARCH} == armv6 +.endif +.if ${ARCH} == sparc64 || ${ARCH} == armv6 DRI_DRIVERS= SWRAST -. endif -.else # !defined(WITH_NEW_XORG) -. if ${ARCH} == powerpc || ${ARCH} == powerpc64 -DRI_DRIVERS= MACH64 RADEON SWRAST TDFX -. elif ${ARCH} == sparc64 -DRI_DRIVERS= MACH64 RADEON SWRAST -. endif -.endif # defined(WITH_NEW_XORG) +.endif # empty for unsupported arches DRI_DRIVERS+= .for _d in ${ALL_DRI_DRIVERS} -.if ${DRI_DRIVERS:M${_d}} +. if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" -.else +. else PLIST_SUB+= ${_d}_DRIVER="@comment " -.endif +. endif .endfor .if !(${ARCH} == amd64 || ${ARCH} == i386) @@ -88,26 +115,4 @@ CONFIGURE_ARGS+=--disable-gallium-intel .endif CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}" -.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ - && (${ARCH} == i386 || ${ARCH} == amd64) -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers." - @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" - @${ECHO_MSG} "Note that gallium support is highly experimental." - @${ECHO_MSG} "" -.endif - -post-install: -.if defined(WITH_NEW_XORG) - @${RM} -f ${STAGEDIR}${PREFIX}/include/GL/*.h - @${RM} ${STAGEDIR}${PREFIX}/lib/libGL.* - @${RM} ${STAGEDIR}${PREFIX}/lib/libglapi.* - @${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc -.else - @${RM} -f ${STAGEDIR}${PREFIX}/include/GL/*.h - @${RM} -rf ${STAGEDIR}${PREFIX}/lib/.libGL - @${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc -.endif - .include Added: head/graphics/dri/pkg-help ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dri/pkg-help Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,13 @@ +The GALLIUM option enables gallium (llvm) backed drivers such as for example +the r600 and radeonsi driver. + +The VDPAU option enables VDPAU drivers to decode video on the GPU via the +VDPAU library. + +The TEXTURE option enables texture-float support. However Silicon Graphics +owns the US Patent #6,650,327 [1]. Use at your own risk! + +See docs/patents.txt in the Mesa tarball or the follewing urls: + +[1] http://www.google.com/patents/about?id=mIIOAAAAEBAJ&dq=6650327 +[2] http://www.opengl.org/registry/specs/ARB/texture_float.txt Modified: head/graphics/dri/pkg-plist ============================================================================== --- head/graphics/dri/pkg-plist Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/dri/pkg-plist Fri Oct 17 09:53:13 2014 (r371035) @@ -1,40 +1,57 @@ -%%NEW%%%%I965_DRIVER%%etc/drirc +%%I965_DRIVER%%etc/drirc +@comment include/EGL/egl.h +@comment include/EGL/eglext.h +@comment include/EGL/eglextchromium.h +@comment include/EGL/eglmesaext.h +@comment include/EGL/eglplatform.h include/GL/internal/dri_interface.h -%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so -%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la +@comment include/GL/gl.h +@comment include/GL/gl_mangle.h +@comment include/GL/glcorearb.h +@comment include/GL/glext.h +@comment include/GL/glx.h +@comment include/GL/glx_mangle.h +@comment include/GL/glxext.h +@comment include/GL/osmesa.h +@comment include/GL/wglext.h +@comment include/GL/wmesa.h +@comment include/KHR/khrplatform.h +@comment include/gbm.h +%%GALLIUM%%lib/dri/kms_swrast_dri.so %%I915_DRIVER%%lib/dri/i915_dri.so -%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so -%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so -%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so -%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so -%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so -%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so -%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la -%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so -%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so -%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la -%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so -%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la +%%GALLIUM%%lib/dri/r300_dri.so +%%GALLIUM%%lib/dri/r600_dri.so %%RADEON_DRIVER%%lib/dri/radeon_dri.so -%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la -%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so -%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so -%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so -%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la +%%GALLIUM%%lib/dri/radeonsi_dri.so %%SWRAST_DRIVER%%lib/dri/swrast_dri.so -%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so -%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so -%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la -%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so -%%NEW%%lib/libdricore%%VERSION%%.la -%%NEW%%lib/libdricore%%VERSION%%.so -%%NEW%%lib/libdricore%%VERSION%%.so.1 -%%NEW%%lib/libdricore%%VERSION%%.so.1.0.0 -%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la -%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.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 +@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 +@comment lib/libgbm.so +@comment lib/libgbm.so.1 +@comment lib/libgbm.so.1.0.0 +@comment lib/libglapi.so +@comment lib/libglapi.so.0 +@comment lib/libglapi.so.0.0.0 +%%VDPAU%%lib/vdpau/libvdpau_r600.so +%%VDPAU%%lib/vdpau/libvdpau_r600.so.1 +%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0 +%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0 +%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so +%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1 +%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0 +%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 +@comment libdata/pkgconfig/egl.pc libdata/pkgconfig/dri.pc -@dirrm lib/dri -@dirrmtry include/GL/internal -@dirrmtry include/GL +@comment libdata/pkgconfig/gbm.pc +@comment libdata/pkgconfig/gl.pc Added: head/graphics/dri/pkg-plist-old ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dri/pkg-plist-old Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,67 @@ +%%I965_DRIVER%%etc/drirc +@comment include/EGL/egl.h +@comment include/EGL/eglext.h +@comment include/EGL/eglmesaext.h +@comment include/EGL/eglplatform.h +@comment include/GL/gl.h +@comment include/GL/gl_mangle.h +@comment include/GL/glext.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 +@comment include/KHR/khrplatform.h +@comment include/gbm.h +%%I915_DRIVER%%lib/dri/i915_dri.so +%%I965_DRIVER%%lib/dri/i965_dri.so +%%R200_DRIVER%%lib/dri/r200_dri.so +%%GALLIUM%%lib/dri/r300_dri.so +%%GALLIUM%%lib/dri/r600_dri.so +%%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%GALLIUM%%lib/dri/radeonsi_dri.so +%%SWRAST_DRIVER%%lib/dri/swrast_dri.so +%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%GALLIUM%%lib/libXvMCr300.so +%%GALLIUM%%lib/libXvMCr300.so.1 +%%GALLIUM%%lib/libXvMCr300.so.1.0.0 +%%GALLIUM%%lib/libXvMCr600.so +%%GALLIUM%%lib/libXvMCr600.so.1 +%%GALLIUM%%lib/libXvMCr600.so.1.0.0 +%%GALLIUM%%lib/libXvMCsoftpipe.so +%%GALLIUM%%lib/libXvMCsoftpipe.so.1 +%%GALLIUM%%lib/libXvMCsoftpipe.so.1.0.0 +@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 +lib/libdricore9.1.7.so +lib/libdricore9.1.7.so.1 +lib/libdricore9.1.7.so.1.0.0 +@comment lib/libgbm.so +@comment lib/libgbm.so.1 +@comment lib/libgbm.so.1.0.0 +@comment lib/libglapi.so +@comment lib/libglapi.so.0 +@comment lib/libglapi.so.0.0.0 +%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0 +libdata/pkgconfig/dri.pc +@comment libdata/pkgconfig/egl.pc +@comment libdata/pkgconfig/gbm.pc +@comment libdata/pkgconfig/gl.pc Added: head/graphics/gbm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gbm/Makefile Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,41 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME= gbm +PORTVERSION= ${MESAVERSION} +PORTREVISION= ${GBM_REVISION} +CATEGORIES= graphics + +COMMENT= gbm library + +LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm \ + libglapi.so:${PORTSDIR}/graphics/libglapi + +USE_XORG= x11 xau xcb xdmcp + +# stuff not needed by gbm but configure wants it +USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \ + xshmfence + +BUILD_WRKSRC= ${WRKSRC}/src/gbm +INSTALL_WRKSRC= ${WRKSRC}/src/gbm + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" + +.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 Added: head/graphics/gbm/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gbm/pkg-descr Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Added: head/graphics/gbm/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gbm/pkg-plist Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,5 @@ +include/gbm.h +lib/libgbm.so +lib/libgbm.so.1 +lib/libgbm.so.1.0.0 +libdata/pkgconfig/gbm.pc Modified: head/graphics/libEGL/Makefile ============================================================================== --- head/graphics/libEGL/Makefile Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libEGL/Makefile Fri Oct 17 09:53:13 2014 (r371035) @@ -3,28 +3,54 @@ PORTNAME= libEGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 3 +PORTREVISION= ${LIBEGL_REVISION} CATEGORIES= graphics COMMENT= OpenEGL library -LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdevq.so:${PORTSDIR}/devel/libdevq \ + libdrm.so:${PORTSDIR}/graphics/libdrm USE_XORG= x11 xau xcb xdmcp # stuff not needed by libEGL but configure wants it -USE_XORG+= glproto dri2proto xext xdamage xfixes -LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \ - libdrm.so:${PORTSDIR}/graphics/libdrm +USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \ + xshmfence + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.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 -.include +.if defined(WITH_NEW_MESA) +LIBEGL_REVISION= 0 +.else +LIBEGL_REVISION= 4 +.endif -.if ! defined(WITH_NEW_XORG) -IGNORE= Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24 +.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}) + +. endfor .endif -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include Modified: head/graphics/libEGL/pkg-plist ============================================================================== --- head/graphics/libEGL/pkg-plist Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libEGL/pkg-plist Fri Oct 17 09:53:13 2014 (r371035) @@ -1,12 +1,10 @@ include/EGL/egl.h include/EGL/eglext.h +%%NEW%%include/EGL/eglextchromium.h include/EGL/eglmesaext.h include/EGL/eglplatform.h include/KHR/khrplatform.h -lib/libEGL.la lib/libEGL.so lib/libEGL.so.1 lib/libEGL.so.1.0.0 libdata/pkgconfig/egl.pc -@dirrmtry include/KHR -@dirrmtry include/EGL Modified: head/graphics/libGL/Makefile ============================================================================== --- head/graphics/libGL/Makefile Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libGL/Makefile Fri Oct 17 09:53:13 2014 (r371035) @@ -9,39 +9,30 @@ CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \ + libglapi.so:${PORTSDIR}/graphics/libglapi \ libexpat.so:${PORTSDIR}/textproc/expat2 -USES= pkgconfig -USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \ + presentproto xshmfence SUB_FILES= pkg-install pkg-deinstall .include +.include "${.CURDIR}/bsd.mesalib.mk" -.if defined(WITH_NEW_XORG) -LIBGLREVISION= 2 -LIB_DEPENDS+= libglapi.so:${PORTSDIR}/graphics/libglapi +.if defined(WITH_NEW_MESA) +LIBGLREVISION= 0 .else -LIBGLREVISION= 5 +LIBGLREVISION= 3 .endif -.include "${.CURDIR}/bsd.mesalib.mk" - .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif post-install: - ${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc - ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal -.if defined(WITH_NEW_XORG) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL @${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \ ${STAGEDIR}${PREFIX}/lib/.libGL/ - ${RM} ${STAGEDIR}${PREFIX}/lib/libglapi* -.else - ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu.h - ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu_mangle.h -.endif .include Modified: head/graphics/libGL/bsd.mesalib.mk ============================================================================== --- head/graphics/libGL/bsd.mesalib.mk Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libGL/bsd.mesalib.mk Fri Oct 17 09:53:13 2014 (r371035) @@ -4,37 +4,54 @@ # # Remember to upgrade the following ports everytime you bump MESAVERSION: # +# - graphics/dri +# - graphics/gbm # - graphics/libEGL # - graphics/libGL +# - graphics/libglapi # - grahpics/libglesv2 -# - graphics/dri # # $FreeBSD$ +# hw context support in the i915kms driver +.if ${OPSYS} == FreeBSD && \ + (${OSVERSION} >= 1000717 && ${OSVERSION} < 1100000 || \ + ${OSVERSION} >= 1100035) +WITH_NEW_MESA=1 +.endif + MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -.if defined(WITH_NEW_XORG) -MESABASEVERSION= 9.1.7 -# if there is a subversion, include the '-' between 7.11-rc2 for example. -MESASUBVERSION= +.if defined(WITH_NEW_MESA) +MESABASEVERSION= 10.3.0 +# if there is a subversion, don't include the '-' between 7.11-rc2. +MESASUBVERSION= + +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION:R}/ PLIST_SUB+= OLD="@comment " NEW="" + +# work around libarchive bug? +EXTRACT_CMD= ${LOCALBASE}/bin/gtar +EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar + .else -MESABASEVERSION= 7.6.1 +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 -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/ DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ - python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 -USES+= bison gmake pathfix pkgconfig shebangfix tar:bzip2 -USE_PYTHON_BUILD=2 +LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq + +USES+= bison gmake libtool pathfix pkgconfig python:2,build \ + shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -43,39 +60,30 @@ LDFLAGS+= -Wl,-Y${LOCALBASE}/lib .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex -CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex +CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif -.if defined(WITH_NEW_XORG) -INSTALL_TARGET= install-strip -USES+= libtool:keepla - 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 \ - src/mapi/mapi/mapi_abi.py - -# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older. -. if ${ARCH} == i386 -USE_GCC=yes -. endif -.else -CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py -ALL_TARGET= default +.if defined(WITH_NEW_MESA) +SHEBANG_FILES+= src/mapi/mapi_abi.py .endif MASTERDIR= ${.CURDIR}/../../graphics/libGL -.if defined(WITH_NEW_XORG) +.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-//} @@ -91,19 +99,26 @@ CONFIGURE_ARGS+= --disable-egl CONFIGURE_ARGS+= --enable-egl .endif +.if ${COMPONENT:Mopencl} == "" +CONFIGURE_ARGS+= --disable-opencl +.else +CONFIGURE_ARGS+= --enable-opencl +.endif + .if ${COMPONENT:Mdri} == "" 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 !defined(WITH_NEW_XORG) -.if defined(WITHOUT_XCB) -CONFIGURE_ARGS+= --disable-xcb +.if ${COMPONENT:Mvdpau} == "" +CONFIGURE_ARGS+=--disable-vdpau .else -CONFIGURE_ARGS+= --enable-xcb -.endif +CONFIGURE_ARGS+=--enable-vdpau .endif post-patch: @@ -111,19 +126,25 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c -.if !defined(WITH_NEW_XORG) - @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' \ - ${WRKSRC}/src/gallium/auxiliary/util/Makefile - @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/src/glu/Makefile \ - ${WRKSRC}/src/mesa/Makefile \ - ${WRKSRC}/src/mesa/drivers/dri/Makefile -.else +.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 - @${REINPLACE_CMD} -e 's|!/usr/bin/python2|!${PYTHON_CMD}|g' \ +.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 + Modified: head/graphics/libGL/distinfo ============================================================================== --- head/graphics/libGL/distinfo Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libGL/distinfo Fri Oct 17 09:53:13 2014 (r371035) @@ -1,4 +1,4 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0 SIZE (MesaLib-9.1.7.tar.bz2) = 6134393 +SHA256 (MesaLib-10.3.0.tar.bz2) = 0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5 +SIZE (MesaLib-10.3.0.tar.bz2) = 7252038 Added: head/graphics/libGL/files-old/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files-old/patch-Makefile.in Fri Oct 17 09:53:13 2014 (r371035) @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2014-05-11 21:01:42.000000000 +0200 ++++ Makefile.in 2014-05-11 21:02:12.000000000 +0200 +@@ -87,9 +87,7 @@ + $(top_srcdir)/m4/ax_prog_flex.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/ax_python_module.m4 \ +- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ +- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ Modified: head/graphics/libGL/files-old/patch-configure ============================================================================== --- head/graphics/libGL/files-old/patch-configure Fri Oct 17 09:45:18 2014 (r371034) +++ head/graphics/libGL/files-old/patch-configure Fri Oct 17 09:53:13 2014 (r371035) @@ -1,52 +1,424 @@ ---- configure.orig 2013-12-12 18:52:32.304356162 +0000 -+++ configure 2013-12-12 19:50:44.434111814 +0000 -@@ -5393,7 +5393,7 @@ - ;; - *freebsd* | dragonfly*) - case "$host_cpu" in -- i*86|x86_64|powerpc*|sparc*) default_driver="dri";; -+ i*86|x86_64|ia64|powerpc*|sparc*) default_driver="dri";; - esac - ;; - esac -@@ -6946,12 +6946,35 @@ - CXXFLAGS="$CXXFLAGS -ansi -pedantic" - fi +--- configure.orig 2014-03-14 20:50:56.000000000 +0100 ++++ configure 2014-03-14 20:51:25.000000000 +0100 +@@ -779,6 +779,8 @@ + GBM_PC_REQ_PRIV + LIBUDEV_LIBS + LIBUDEV_CFLAGS ++LIBDEVQ_LIBS ++LIBDEVQ_CFLAGS + OSMESA_PC_LIB_PRIV + OSMESA_PC_REQ + OSMESA_MESA_DEPS +@@ -1126,6 +1128,8 @@ + NOUVEAU_LIBS + RADEON_CFLAGS + RADEON_LIBS ++LIBDEVQ_CFLAGS ++LIBDEVQ_LIBS + LIBUDEV_CFLAGS + LIBUDEV_LIBS + XORG_CFLAGS +@@ -1930,6 +1934,10 @@ + RADEON_CFLAGS + C compiler flags for RADEON, overriding pkg-config + RADEON_LIBS linker flags for RADEON, overriding pkg-config ++ LIBDEVQ_CFLAGS ++ C compiler flags for LIBDEVQ, overriding pkg-config ++ LIBDEVQ_LIBS ++ linker flags for LIBDEVQ, overriding pkg-config + LIBUDEV_CFLAGS + C compiler flags for LIBUDEV, overriding pkg-config + LIBUDEV_LIBS +@@ -21184,9 +21192,34 @@ + DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -- # ffb and gamma are missing because they have not been converted -- # to use the new interface. - if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ +- DRI_DIRS="i915 i965 nouveau r200 radeon swrast" +- fi + case "$host_cpu" in + x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ - unichrome savage sis swrast" -- fi ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + i*86) + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ -+ unichrome savage sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + powerpc*) + # Build only the drivers for cards that exist on PowerPC. + # At some point MGA will be added, but not yet. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast" -+ fi ++ DRI_DIRS="r200 radeon swrast" ++ fi + ;; + sparc*) + # Build only the drivers for cards that exist on SPARC. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + esac ++ ;; gnu*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" +@@ -21684,6 +21717,81 @@ + if test "x$enable_gbm" = xyes; then + SRC_DIRS="$SRC_DIRS gbm" + ++ case "$host_os" in ++ *freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 ++$as_echo_n "checking for LIBDEVQ... " >&6; } ++ ++if test -n "$LIBDEVQ_CFLAGS"; then ++ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LIBDEVQ_LIBS"; then ++ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ else ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBDEVQ_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "gbm needs libdevq" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ as_fn_error $? "gbm needs libdevq" "$LINENO" 5 ++else ++ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS ++ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ;; ++ *) + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +@@ -21755,6 +21863,8 @@ + $as_echo "yes" >&6; } + + fi ++ ;; ++ esac + + if test "x$enable_dri" = xyes; then + GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri" +@@ -21763,7 +21873,14 @@ + fi + fi + fi +-GBM_PC_REQ_PRIV="libudev" ++case "$host_os" in ++*freebsd*) ++ GBM_PC_REQ_PRIV="libdevq-1.0" ++ ;; ++*) ++ GBM_PC_REQ_PRIV="libudev" ++ ;; ++esac + GBM_PC_LIB_PRIV="$DLOPEN_LIBS" + + +@@ -21782,6 +21899,81 @@ + + if test "$enable_static" != yes; then + # build egl_glx when libGL is built ++ case "$host_os" in ++ *freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 ++$as_echo_n "checking for LIBDEVQ... " >&6; } ++ ++if test -n "$LIBDEVQ_CFLAGS"; then ++ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***