diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-10-05 21:21:31 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-10-05 21:21:31 +0800 |
| commit | 3b53308abe2b9bc8a7c3a4235da0fb974901e8d1 (patch) | |
| tree | f98e8034ca259301ea69202a73e24bae7ac4fb2c | |
| parent | 199aa5b68c66ebfc55faf2ff9ded473984737d35 (diff) | |
| download | xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar.gz xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar.bz2 xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar.lz xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar.xz xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.tar.zst xorg-devel-ports-3b53308abe2b9bc8a7c3a4235da0fb974901e8d1.zip | |
Update to 9.1.7.
Stagify, no more do-install magic o/
Also lets us get rid of include/GL/internal/dri_interface.h in dri o/
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1182 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | graphics/dri/Makefile | 12 | ||||
| -rw-r--r-- | graphics/dri/pkg-plist | 1 | ||||
| -rw-r--r-- | graphics/libEGL/Makefile | 3 | ||||
| -rw-r--r-- | graphics/libGL/Makefile | 19 | ||||
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 2 | ||||
| -rw-r--r-- | graphics/libGL/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libglesv2/Makefile | 1 |
7 files changed, 4 insertions, 38 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index c3b67b9..8c45b22 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -101,16 +101,4 @@ pre-everything:: @${ECHO_MSG} "" .endif -do-install: -.if !defined(WITH_NEW_XORG) - cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri -.else - cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install - cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install -. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64) - cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install - cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install -. endif -.endif - .include <bsd.port.mk> diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index d80890b..f05890e 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,5 +1,4 @@ %%NEW%%%%I965_DRIVER%%etc/drirc -include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so %%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile index bb44227..902f510 100644 --- a/graphics/libEGL/Makefile +++ b/graphics/libEGL/Makefile @@ -20,8 +20,7 @@ USE_XORG+= glproto dri2proto xext xdamage xfixes LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \ libdrm.so:${PORTSDIR}/graphics/libdrm -NO_STAGE= yes -BUILD_WKRSRC= ${WRKSRC}/src/egl +BUILD_WRKSRC= ${WRKSRC}/src/egl INSTALL_WRKSRC= ${WRKSRC}/src/egl WITH_NEW_XORG= yes diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 3d91cdd..265aa88 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -16,7 +16,6 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both SUB_FILES= pkg-install pkg-deinstall -NO_STAGE= yes .include <bsd.port.options.mk> .if defined(WITH_NEW_XORG) @@ -25,24 +24,6 @@ LIBGLREVISION= 0 LIBGLREVISION= 4 .endif -do-install: -.if ! defined(WITH_NEW_XORG) - ${RM} -f ${WRKSRC}/include/GL/glu*.h - @${MKDIR} ${PREFIX}/lib/.libGL - cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl -.else - cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA - cd ${WRKSRC}/src/glx; ${GMAKE} install - ${MKDIR} ${PREFIX}/include/GL - cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/ - @${MKDIR} ${PREFIX}/lib/.libGL - ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ - ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/ -.endif - -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include "${.CURDIR}/bsd.mesalib.mk" .if !(${ARCH} == "amd64" || ${ARCH} == "i386") diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 6ae5ab7..90fe420 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -17,7 +17,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_XORG) -MESABASEVERSION= 9.1.6 +MESABASEVERSION= 9.1.7 # if there is a subversion, include the '-' between 7.11-rc2 for example. MESASUBVERSION= PLIST_SUB+= OLD="@comment " NEW="" diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index aa7bb41..fd2024b 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-9.1.6.tar.bz2) = e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d -SIZE (MesaLib-9.1.6.tar.bz2) = 6134267 +SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0 +SIZE (MesaLib-9.1.7.tar.bz2) = 6134393 diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile index 4dd4381..c48744a 100644 --- a/graphics/libglesv2/Makefile +++ b/graphics/libglesv2/Makefile @@ -20,7 +20,6 @@ USE_XORG+= glproto dri2proto xext xdamage xfixes BUILD_WKRSRC= ${WRKSRC}/src/mapi/es2api INSTALL_WRKSRC= ${WRKSRC}/src/mapi/es2api -NO_STAGE= yes # this library doesn't exist in Mesa 7.6 so use newer WITH_NEW_XORG=yes |