summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/dri/distinfo4
-rw-r--r--graphics/libGL/bsd.mesalib.mk10
-rw-r--r--graphics/libGL/distinfo4
-rw-r--r--graphics/libGLU/Makefile1
-rw-r--r--graphics/libGLU/distinfo4
5 files changed, 9 insertions, 14 deletions
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
deleted file mode 100644
index b1b015b..0000000
--- a/graphics/dri/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
-SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index be1e151..1b15819 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -22,7 +22,7 @@ MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
.if defined(WITH_NEW_XORG)
MESABASEVERSION= 8.0
# if there is a subversion, include the '-' between 7.11-rc2 for example.
-MESASUBVERSION= rc2
+MESASUBVERSION=
PLIST_SUB+= OLD="@comment " NEW=""
.else
MESABASEVERSION= 7.6.1
@@ -48,7 +48,7 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
- --disable-egl --disable-glut --disable-glw
+ --disable-egl
.if defined(WITH_NEW_XORG)
EXTRA_PATCHES+= ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
@@ -57,11 +57,15 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \
${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S
+CONFIGURE_ARGS+=--disable-glut --disable-glw
.endif
ALL_TARGET= default
-PATCHDIR= ${.CURDIR}/../../graphics/libGL/files
+MASTERDIR= ${.CURDIR}/../../graphics/libGL
+PATCHDIR= ${MASTERDIR}/files
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}
.if !defined(ARCH)
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index b1b015b..23a07bf 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-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
-SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245
+SHA256 (MesaLib-8.0.tar.bz2) = a69adfe4fdda792ed145f7610075b8003961f080e5c515f1dfd326e172aa8543
+SIZE (MesaLib-8.0.tar.bz2) = 5687424
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 0a19926..7cde796 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -16,7 +16,6 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
do-install:
@${MKDIR} ${PREFIX}/include/GL/
- cd ${WRKSRC}/src/glu; ${GMAKE} install
${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
cd ${WRKSRC}/src/glu; ${GMAKE} install
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
deleted file mode 100644
index b1b015b..0000000
--- a/graphics/libGLU/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
-SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245