summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortnn <tnn>2015-04-03 02:05:02 +0000
committertnn <tnn>2015-04-03 02:05:02 +0000
commitc3a330b0dd9d3cd9cbf63ac69090433ff3d29ad0 (patch)
tree8bfd691f9e21ad0ffcae9d0e4c35192e80fda010 /graphics
parentd4070b4ccd0488c429ee381e071e6ddfe0d168af (diff)
downloadpkgsrc-c3a330b0dd9d3cd9cbf63ac69090433ff3d29ad0.tar.gz
Update to glx-utils-8.2.0: sync w/ MesaDemos
Diffstat (limited to 'graphics')
-rw-r--r--graphics/glx-utils/Makefile30
-rw-r--r--graphics/glx-utils/distinfo8
-rw-r--r--graphics/glx-utils/hacks.mk6
3 files changed, 21 insertions, 23 deletions
diff --git a/graphics/glx-utils/Makefile b/graphics/glx-utils/Makefile
index fcad38c8f2a..a9e623de9c6 100644
--- a/graphics/glx-utils/Makefile
+++ b/graphics/glx-utils/Makefile
@@ -1,35 +1,39 @@
-# $NetBSD: Makefile,v 1.11 2013/08/10 23:02:26 khorben Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/03 02:05:02 tnn Exp $
-DISTNAME= MesaDemos-${MESA_VERSION}
-PKGNAME= glx-utils-${MESA_VERSION}
+DISTNAME= mesa-demos-8.2.0
+PKGNAME= ${DISTNAME:S/mesa-demos/glx-utils/}
CATEGORIES= x11 graphics
-COMMENT= OpenGL glxgears and glxinfo
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/
+EXTRACT_SUFX= .tar.bz2
-.include "../../graphics/Mesa/Makefile.common"
-MESA_VERSION= 7.4.4
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://cgit.freedesktop.org/mesa/demos/
+COMMENT= OpenGL glxgears and glxinfo
+#LICENSE= # Similar to mit but with SGI advertising clause.
-MESA_PATCHFILES= # don't track Mesa patchlevels
+NO_CONFIGURE= yes
+USE_LANGUAGES= c
INSTALLATION_DIRS= bin
LDFLAGS+= -lX11 # ld 2.22 wants each library explicitly
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
do-build:
- cd ${WRKSRC}/progs/xdemos && \
+ cd ${WRKSRC}/src/xdemos && \
${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \
glxgears.c ${LDFLAGS} \
-L../../lib -lGLU -lGL -lm -lXext \
-o glxgears && \
${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \
- glxinfo.c ${LDFLAGS} \
+ glxinfo.c glinfo_common.c ${LDFLAGS} \
-L../../lib -lGLU -lGL -lm -lXext -o glxinfo
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxgears \
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/xdemos/glxgears \
${DESTDIR}${PREFIX}/bin/
- ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxinfo \
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/xdemos/glxinfo \
${DESTDIR}${PREFIX}/bin/
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glx-utils/distinfo b/graphics/glx-utils/distinfo
index 2a998068a17..e578494b16a 100644
--- a/graphics/glx-utils/distinfo
+++ b/graphics/glx-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2009/07/08 20:00:58 hasso Exp $
+$NetBSD: distinfo,v 1.13 2015/04/03 02:05:02 tnn Exp $
-SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
-RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
-Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
+SHA1 (mesa-demos-8.2.0.tar.bz2) = e1a66ac63eebba4f950f95d830f34a6005167116
+RMD160 (mesa-demos-8.2.0.tar.bz2) = e6804e480ed5d227ba689cb9b3ea95cc85353889
+Size (mesa-demos-8.2.0.tar.bz2) = 10071635 bytes
diff --git a/graphics/glx-utils/hacks.mk b/graphics/glx-utils/hacks.mk
deleted file mode 100644
index afae2a36bd1..00000000000
--- a/graphics/glx-utils/hacks.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2013/08/10 23:02:26 khorben Exp $
-
-### [Sun Aug 11 01:00:40 CEST 2013 : khorben]
-### MesaDemos $MESA_VERSION may not exist, so forcing 7.4.4 for now
-###
-MESA_VERSION= 7.4.4