Fri Apr 3 02:05:02 2015 UTC ()
Update to glx-utils-8.2.0: sync w/ MesaDemos


(tnn)
diff -r1.11 -r1.12 pkgsrc/graphics/glx-utils/Makefile
diff -r1.12 -r1.13 pkgsrc/graphics/glx-utils/distinfo
diff -r1.1 -r0 pkgsrc/graphics/glx-utils/hacks.mk
cvs diff -r1.11 -r1.12 pkgsrc/graphics/glx-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/glx-utils/Makefile 2013/08/10 23:02:26 1.11
+++ pkgsrc/graphics/glx-utils/Makefile 2015/04/03 02:05:02 1.12
@@ -1,35 +1,39 @@ @@ -1,35 +1,39 @@
1# $NetBSD: Makefile,v 1.11 2013/08/10 23:02:26 khorben Exp $ 1# $NetBSD: Makefile,v 1.12 2015/04/03 02:05:02 tnn Exp $
2 2
3DISTNAME= MesaDemos-${MESA_VERSION} 3DISTNAME= mesa-demos-8.2.0
4PKGNAME= glx-utils-${MESA_VERSION} 4PKGNAME= ${DISTNAME:S/mesa-demos/glx-utils/}
5CATEGORIES= x11 graphics 5CATEGORIES= x11 graphics
6COMMENT= OpenGL glxgears and glxinfo 6MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/
 7EXTRACT_SUFX= .tar.bz2
7 8
8.include "../../graphics/Mesa/Makefile.common" 9MAINTAINER= pkgsrc-users@NetBSD.org
9MESA_VERSION= 7.4.4 10HOMEPAGE= http://cgit.freedesktop.org/mesa/demos/
 11COMMENT= OpenGL glxgears and glxinfo
 12#LICENSE= # Similar to mit but with SGI advertising clause.
10 13
11MESA_PATCHFILES= # don't track Mesa patchlevels 14NO_CONFIGURE= yes
 15USE_LANGUAGES= c
12 16
13INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin
14LDFLAGS+= -lX11 # ld 2.22 wants each library explicitly 18LDFLAGS+= -lX11 # ld 2.22 wants each library explicitly
15 19
16.include "../../graphics/glu/buildlink3.mk" 
17.include "../../graphics/MesaLib/buildlink3.mk" 
18 20
19do-build: 21do-build:
20 cd ${WRKSRC}/progs/xdemos && \ 22 cd ${WRKSRC}/src/xdemos && \
21 ${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \ 23 ${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \
22 glxgears.c ${LDFLAGS} \ 24 glxgears.c ${LDFLAGS} \
23 -L../../lib -lGLU -lGL -lm -lXext \ 25 -L../../lib -lGLU -lGL -lm -lXext \
24 -o glxgears && \ 26 -o glxgears && \
25 ${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \ 27 ${SETENV} ${MAKE_ENV} ${CC} -I../../include ${CFLAGS} \
26 glxinfo.c ${LDFLAGS} \ 28 glxinfo.c glinfo_common.c ${LDFLAGS} \
27 -L../../lib -lGLU -lGL -lm -lXext -o glxinfo 29 -L../../lib -lGLU -lGL -lm -lXext -o glxinfo
28 30
29do-install: 31do-install:
30 ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxgears \ 32 ${INSTALL_PROGRAM} ${WRKSRC}/src/xdemos/glxgears \
31 ${DESTDIR}${PREFIX}/bin/ 33 ${DESTDIR}${PREFIX}/bin/
32 ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxinfo \ 34 ${INSTALL_PROGRAM} ${WRKSRC}/src/xdemos/glxinfo \
33 ${DESTDIR}${PREFIX}/bin/ 35 ${DESTDIR}${PREFIX}/bin/
34 36
 37.include "../../graphics/glu/buildlink3.mk"
 38.include "../../graphics/MesaLib/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/graphics/glx-utils/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/glx-utils/distinfo 2009/07/08 20:00:58 1.12
+++ pkgsrc/graphics/glx-utils/distinfo 2015/04/03 02:05:02 1.13
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.12 2009/07/08 20:00:58 hasso Exp $ 1$NetBSD: distinfo,v 1.13 2015/04/03 02:05:02 tnn Exp $
2 2
3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe 3SHA1 (mesa-demos-8.2.0.tar.bz2) = e1a66ac63eebba4f950f95d830f34a6005167116
4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1 4RMD160 (mesa-demos-8.2.0.tar.bz2) = e6804e480ed5d227ba689cb9b3ea95cc85353889
5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes 5Size (mesa-demos-8.2.0.tar.bz2) = 10071635 bytes
File Deleted: pkgsrc/graphics/glx-utils/Attic/hacks.mk