cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 9.1.7.

Browse Source 
Stagify, abuse stage dir and plist to only install files we want to install.
So we don't have to do complex do-install anymore, yay.

For the WITH_GALLIUM option we don't need llvm at run-time.

Obtained from:	xorg-dev repo
This commit is contained in:
Koop Mast 2013-11-26 20:58:53 +00:00
parent 325d90157c
commit da3e448eb9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=334972
6 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/dri/Makefile
View File

@ -41,7 +41,6 @@ ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
.endif
NO_STAGE= yes
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
PLIST_SUB+= VERSION=${MESADISTVERSION}
@ -53,7 +52,6 @@ DRI_DRIVERS= ${ALL_DRI_DRIVERS}
.if defined(WITH_NEW_XORG)
. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64)
BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33
RUN_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33
CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl
@ -101,16 +99,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>

3
graphics/libEGL/Makefile
View File

@ -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

19
graphics/libGL/Makefile
View File

@ -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")

2
graphics/libGL/bsd.mesalib.mk
View File

@ -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=""

4
graphics/libGL/distinfo
View File

@ -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

1
graphics/libglesv2/Makefile
View File

@ -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