From owner-svn-ports-all@FreeBSD.ORG Sat May 17 09:56:03 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8783B621; Sat, 17 May 2014 09:56:03 +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 69A7B21C0; Sat, 17 May 2014 09:56:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H9u3Wu080782; Sat, 17 May 2014 09:56:03 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H9u0RY080760; Sat, 17 May 2014 09:56:00 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405170956.s4H9u0RY080760@svn.freebsd.org> From: Koop Mast Date: Sat, 17 May 2014 09:56:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354307 - in head/graphics: . dri libEGL libGL libGL/files libglapi 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 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: Sat, 17 May 2014 09:56:03 -0000 Author: kwm Date: Sat May 17 09:56:00 2014 New Revision: 354307 URL: http://svnweb.freebsd.org/changeset/ports/354307 QAT: https://qat.redports.org/buildarchive/r354307/ Log: Enable shared libglapi library and make a port for it. It is used by libGL and libglesv2. This fixes undefined symbol issues in libglesv2. Clean up stagedir of unwanted files/directories, so check-plist passes. Switch logic and always build gallium support in graphics/dri on i386 and amd64. Gallium is used for Radeon HD 5000+ support. Use USES=tar:bzip2 Under WITH_NEW_XORG: Add patch to remove some dependencies for aclocal.m4 which are absent. This allows the removal of USE_AUTOTOOLS, REAPPLY_PATCHES and pre-configure target. Add INSTALL_TARGET=install-strip to strip libraries. USES=libtool:keepla Fix a /use typo with /usr in post-patch. Bump PORTREVISION for the libtool and libglapi changes. Submitted by: tijl@ (libtool and autotools changes) Obtained from: xorg-dev repo (libglapi and gallium changes) Added: head/graphics/libGL/files/patch-Makefile.in (contents, props changed) head/graphics/libglapi/ head/graphics/libglapi/Makefile (contents, props changed) head/graphics/libglapi/pkg-descr (contents, props changed) head/graphics/libglapi/pkg-plist (contents, props changed) Deleted: head/graphics/libGL/files/patch-src_egl_main_Makefile.in head/graphics/libGL/files/patch-src_glx_Makefile.in head/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in head/graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in head/graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in Modified: 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/pkg-plist head/graphics/libglesv2/Makefile head/graphics/libglesv2/pkg-plist Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -503,6 +503,7 @@ SUBDIR += libgeotiff SUBDIR += libgfx SUBDIR += libggi + SUBDIR += libglapi SUBDIR += libglesv2 SUBDIR += libgltext SUBDIR += libgnomecanvas Modified: head/graphics/dri/Makefile ============================================================================== --- head/graphics/dri/Makefile Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/dri/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -3,7 +3,7 @@ PORTNAME= dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= graphics @@ -46,7 +46,7 @@ DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif .if defined(WITH_NEW_XORG) -. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) +. if !defined(WITHOUT_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 @@ -98,4 +98,16 @@ pre-everything:: @${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 Modified: head/graphics/dri/pkg-plist ============================================================================== --- head/graphics/dri/pkg-plist Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/dri/pkg-plist Sat May 17 09:56:00 2014 (r354307) @@ -31,6 +31,7 @@ include/GL/internal/dri_interface.h %%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 libdata/pkgconfig/dri.pc Modified: head/graphics/libEGL/Makefile ============================================================================== --- head/graphics/libEGL/Makefile Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libEGL/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -3,7 +3,7 @@ PORTNAME= libEGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= OpenEGL library @@ -23,7 +23,7 @@ INSTALL_WRKSRC= ${WRKSRC}/src/egl .include .if ! defined(WITH_NEW_XORG) -IGNORE= Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24 +IGNORE= Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24 .endif .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" Modified: head/graphics/libEGL/pkg-plist ============================================================================== --- head/graphics/libEGL/pkg-plist Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libEGL/pkg-plist Sat May 17 09:56:00 2014 (r354307) @@ -6,6 +6,7 @@ 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 Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libGL/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -19,7 +19,8 @@ SUB_FILES= pkg-install pkg-deinstall .include .if defined(WITH_NEW_XORG) -LIBGLREVISION= 0 +LIBGLREVISION= 1 +LIB_DEPENDS+= libglapi.so:${PORTSDIR}/graphics/libglapi .else LIBGLREVISION= 4 .endif @@ -30,11 +31,18 @@ LIBGLREVISION= 4 CONFIGURE_ARGS+=--disable-gallium-intel .endif -.if !defined(WITH_NEW_XORG) post-install: +.if defined(WITH_NEW_XORG) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL + @${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \ + ${STAGEDIR}${PREFIX}/lib/.libGL/ + ${RM} ${STAGEDIR}${PREFIX}/lib/libglapi* + ${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc + ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal +.else ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu.h ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu_mangle.h - ${RM} ${STAGEDIR}${PREFIX}/include/GL/internal/dri_interface.h + ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal ${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc .endif Modified: head/graphics/libGL/bsd.mesalib.mk ============================================================================== --- head/graphics/libGL/bsd.mesalib.mk Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libGL/bsd.mesalib.mk Sat May 17 09:56:00 2014 (r354307) @@ -33,9 +33,8 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/d python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 -USES+= bison gmake pathfix pkgconfig shebangfix -USE_PYTHON_BUILD=-2.7 -USE_BZIP2= yes +USES+= bison gmake pathfix pkgconfig shebangfix tar:bzip2 +USE_PYTHON_BUILD=2 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -48,19 +47,8 @@ CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBAS .endif .if defined(WITH_NEW_XORG) -USE_AUTOTOOLS= autoconf:env automake:env libtool:env -# probably be shared lib, and in it own port. -CONFIGURE_ARGS+= --enable-shared-glapi=no -# we need to reapply these patches because we doing wierd stuff with autogen -REAPPLY_PATCHES= \ - ${PATCHDIR}/patch-configure \ - ${PATCHDIR}/patch-src_egl_main_Makefile.in \ - ${PATCHDIR}/patch-src_glx_Makefile.in \ - ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ - ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ - ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ - ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ - ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in +INSTALL_TARGET= install-strip +USES+= libtool:keepla python_OLD_CMD= "/usr/bin/env[[:space:]]python" python_CMD= ${LOCALBASE}/bin/python2 @@ -126,27 +114,11 @@ post-patch: ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile .else - @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \ + @${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|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \ + @${REINPLACE_CMD} -e 's|!/usr/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 \ - + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py .endif - -pre-configure: -# workaround for stupid rerunning configure in do-build step -# xxx -.if defined(WITH_NEW_XORG) - cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh -. for file in ${REAPPLY_PATCHES} - @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} -. endfor -# make sure the pkg-config files are installed in the correct place. -# this was reverted by running autogen.sh - @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; -.endif - Added: head/graphics/libGL/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGL/files/patch-Makefile.in Sat May 17 09:56:00 2014 (r354307) @@ -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/pkg-plist ============================================================================== --- head/graphics/libGL/pkg-plist Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libGL/pkg-plist Sat May 17 09:56:00 2014 (r354307) @@ -17,6 +17,7 @@ include/GL/wmesa.h %%NEW%%lib/.libGL/libGL.la lib/.libGL/libGL.so lib/.libGL/libGL.so.1 +%%NEW%%lib/.libGL/libGL.so.1.2.0 libdata/pkgconfig/gl.pc @dirrm lib/.libGL @dirrmtry include/GL Added: head/graphics/libglapi/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libglapi/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME= libglapi +PORTVERSION= ${MESAVERSION} +CATEGORIES= graphics + +COMMENT= Common GL api libary used by Mesa based ports. + +BUILD_DEPENDS= expat>=0:${PORTSDIR}/textproc/expat2 \ + libdrm>=0:${PORTSDIR}/graphics/libdrm \ + libpthread-stubs>=0:${PORTSDIR}/devel/libpthread-stubs + +USE_XORG= x11 xau xcb xdmcp + +# stuff not needed by libglapi but configure wants it +USE_XORG+= glproto dri2proto dri3proto xext xdamage xfixes presentproto \ + xshmfence + +BUILD_WRKSRC= ${WRKSRC}/src/mapi/shared-glapi +INSTALL_WRKSRC= ${WRKSRC}/src/mapi/shared-glapi + +.include + +.if ! defined(WITH_NEW_XORG) +IGNORE= Please enable WITH_NEW_XORG, libglapi needs libdrm higher then 2.4.24 +.endif + +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Added: head/graphics/libglapi/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libglapi/pkg-descr Sat May 17 09:56:00 2014 (r354307) @@ -0,0 +1,3 @@ +This package contains the share GL API library. + +WWW: http://www.freedesktop.org/Software/xorg Added: head/graphics/libglapi/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libglapi/pkg-plist Sat May 17 09:56:00 2014 (r354307) @@ -0,0 +1,4 @@ +lib/libglapi.la +lib/libglapi.so +lib/libglapi.so.0 +lib/libglapi.so.0.0.0 Modified: head/graphics/libglesv2/Makefile ============================================================================== --- head/graphics/libglesv2/Makefile Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libglesv2/Makefile Sat May 17 09:56:00 2014 (r354307) @@ -3,12 +3,14 @@ PORTNAME= libglesv2 PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL ES v2 library +BUILD_DEPENDS= expat>=0:${PORTSDIR}/textproc/expat2 LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \ - libexpat.so:${PORTSDIR}/textproc/expat2 + libglapi.so:${PORTSDIR}/graphics/libglapi .include Modified: head/graphics/libglesv2/pkg-plist ============================================================================== --- head/graphics/libglesv2/pkg-plist Sat May 17 09:54:02 2014 (r354306) +++ head/graphics/libglesv2/pkg-plist Sat May 17 09:56:00 2014 (r354307) @@ -7,6 +7,7 @@ include/GLES3/gl3platform.h lib/libGLESv2.la lib/libGLESv2.so lib/libGLESv2.so.2 +lib/libGLESv2.so.2.0.0 libdata/pkgconfig/glesv2.pc @dirrmtry include/GLES3 @dirrmtry include/GLES2