pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/glut Update to glut-8.0.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/30083d8db6fc
branches: trunk
changeset: 649396:30083d8db6fc
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Apr 03 01:00:52 2015 +0000
description:
Update to glut-8.0.1.
Like the graphics/glu update, this makes glut independent of MesaLib.
This is MesaGLUT-7.9.2 base, with patches from FDO git to add autoconf
glue, that brings it to 8.0.1.
pkgsrc change: use libtool instead of glut's "mklib" shellscript.
diffstat:
graphics/glut/Makefile | 51 +-
graphics/glut/PLIST | 7 +-
graphics/glut/distinfo | 16 +
graphics/glut/patches/patch-Makefile | 271 +++
graphics/glut/patches/patch-acinclude.m4 | 126 +
graphics/glut/patches/patch-bin_config.guess | 1442 ++++++++++++++++
graphics/glut/patches/patch-bin_config.sub | 1814 +++++++++++++++++++++
graphics/glut/patches/patch-bin_install-sh | 119 +
graphics/glut/patches/patch-bin_version.mk | 24 +
graphics/glut/patches/patch-configs_autoconf.in | 108 +
graphics/glut/patches/patch-configs_default | 212 ++
graphics/glut/patches/patch-configure.ac | 463 +++++
graphics/glut/patches/patch-src_Makefile | 47 +
graphics/glut/patches/patch-src_glut_glx_Makefile | 53 +
14 files changed, 4718 insertions(+), 35 deletions(-)
diffs (truncated from 4820 to 300 lines):
diff -r 9774bf31b3cc -r 30083d8db6fc graphics/glut/Makefile
--- a/graphics/glut/Makefile Fri Apr 03 00:53:46 2015 +0000
+++ b/graphics/glut/Makefile Fri Apr 03 01:00:52 2015 +0000
@@ -1,39 +1,30 @@
-# $NetBSD: Makefile,v 1.54 2013/05/16 05:28:13 richard Exp $
+# $NetBSD: Makefile,v 1.55 2015/04/03 01:00:52 tnn Exp $
-PKGNAME= glut-${MESA_PKGVERSION}
-COMMENT= GLUT Graphics library similar to SGI's OpenGL
-
-CONFLICTS+= Mesa-glx-[0-9]*
-CONFLICTS+= Mesa<3.2.1
+DISTNAME= MesaGLUT-7.9.2
+# we have the autoconf patches from git, so call it 8.0.1.
+PKGNAME= glut-8.0.1
+CATEGORIES= graphics
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glut/
+EXTRACT_SUFX= .tar.bz2
-
-PKGCONFIG_OVERRIDE+= src/glut/glx/glut.pc.in
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://cgit.freedesktop.org/mesa/glut/
+COMMENT= GLUT Graphics library similar to SGI's OpenGL
+#LICENSE= # TODO: (see mk/license.mk)
-.include "../../graphics/Mesa/Makefile.lib"
+WRKSRC= ${WRKDIR}/Mesa-7.9.2
+USE_TOOLS+= autoreconf automake autoconf gmake pkg-config makedepend
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+GNU_CONFIGURE= YES
-BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_PKGVERSION}
-BUILDLINK_API_DEPENDS.glu+= glu>=${MESA_PKGVERSION}
+PKGCONFIG_OVERRIDE+= src/glut/glx/glut.pc.in
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vif
.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-
-CONFIGURE_ARGS+= --enable-glu
-CONFIGURE_ARGS+= --enable-glut
-CONFIGURE_ARGS+= --disable-glw
-CONFIGURE_ARGS+= --with-dri-drivers=""
-
-BUILD_DIRS= src/glut/glx
-BUILD_TARGET= default
-
-INSTALL_DIRS= src/glut/glx
-INSTALLATION_DIRS+= include/GL
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/include/GL/glut.h \
- ${DESTDIR}${PREFIX}/include/GL/glut.h
- ${INSTALL_DATA} ${WRKSRC}/include/GL/glutf90.h \
- ${DESTDIR}${PREFIX}/include/GL/glutf90.h
-
.include "../../mk/bsd.pkg.mk"
diff -r 9774bf31b3cc -r 30083d8db6fc graphics/glut/PLIST
--- a/graphics/glut/PLIST Fri Apr 03 00:53:46 2015 +0000
+++ b/graphics/glut/PLIST Fri Apr 03 01:00:52 2015 +0000
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2013/05/16 14:43:13 richard Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/03 01:00:52 tnn Exp $
include/GL/glut.h
-include/GL/glutf90.h
-lib/libglut.so
-lib/libglut.so.3
-lib/libglut.so.3.7.1
+lib/libglut.la
lib/pkgconfig/glut.pc
diff -r 9774bf31b3cc -r 30083d8db6fc graphics/glut/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glut/distinfo Fri Apr 03 01:00:52 2015 +0000
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.19 2015/04/03 01:00:52 tnn Exp $
+
+SHA1 (MesaGLUT-7.9.2.tar.bz2) = d0dc573cb7897de514ee29386be944724e17e979
+RMD160 (MesaGLUT-7.9.2.tar.bz2) = ef00dfa09b563a8ffeeb3523b6d06b66d172983f
+Size (MesaGLUT-7.9.2.tar.bz2) = 200406 bytes
+SHA1 (patch-Makefile) = 526f638679c2a78383ae1358f281d4fb370244c4
+SHA1 (patch-acinclude.m4) = f8a00cf60fe3e684fc167e7c4a7449c8ee13f7a5
+SHA1 (patch-bin_config.guess) = 81254c60a647f41f01847b3ff5328546fce8f5a2
+SHA1 (patch-bin_config.sub) = ac4559d14ed8780a79b94dfd4bbd2f9b658d7808
+SHA1 (patch-bin_install-sh) = 9deb7c17f2e4ba621f1bb41e8fb1bb3cc058ac7e
+SHA1 (patch-bin_version.mk) = 4009abc4f73da7d51925d268c5838578083dbeb3
+SHA1 (patch-configs_autoconf.in) = 36fc1b24dea24a141b4c92d5ab4b525fddee295d
+SHA1 (patch-configs_default) = 22a57d6770b41fff19f3e10c15c766fd5ea8c738
+SHA1 (patch-configure.ac) = 6f7066c73a362882ba87a1336df0214e5020b80f
+SHA1 (patch-src_Makefile) = 01301af232cf843dcde85de87da321242bf457fc
+SHA1 (patch-src_glut_glx_Makefile) = 9d052c85f7e6f034a351a57487e4af8318349565
diff -r 9774bf31b3cc -r 30083d8db6fc graphics/glut/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glut/patches/patch-Makefile Fri Apr 03 01:00:52 2015 +0000
@@ -0,0 +1,271 @@
+$NetBSD: patch-Makefile,v 1.1 2015/04/03 01:00:52 tnn Exp $
+
+Patch from FDO git to bring the package up to 8.0.1.
+
+--- Makefile.orig 2015-04-02 23:45:08.000000000 +0000
++++ Makefile
+@@ -0,0 +1,264 @@
++# Top-level Mesa makefile
++
++TOP = .
++
++SUBDIRS = src
++
++
++# The git command below generates an empty string when we're not
++# building in a GIT tree (i.e., building from a release tarball).
++default: $(TOP)/configs/current
++ @for dir in $(SUBDIRS) ; do \
++ if [ -d $$dir ] ; then \
++ (cd $$dir && $(MAKE)) || exit 1 ; \
++ fi \
++ done
++
++all: default
++
++
++clean:
++ -@touch $(TOP)/configs/current
++ -@for dir in $(SUBDIRS) ; do \
++ if [ -d $$dir ] ; then \
++ (cd $$dir && $(MAKE) clean) ; \
++ fi \
++ done
++ -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
++
++
++realclean: clean
++ -rm -rf lib*
++ -rm -f $(TOP)/configs/current
++ -rm -f $(TOP)/configs/autoconf
++ -rm -rf autom4te.cache
++ -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
++ -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
++
++
++distclean: realclean
++
++
++install:
++ @for dir in $(SUBDIRS) ; do \
++ if [ -d $$dir ] ; then \
++ (cd $$dir && $(MAKE) install) || exit 1 ; \
++ fi \
++ done
++
++
++.PHONY: default doxygen clean realclean distclean install
++
++# If there's no current configuration file
++$(TOP)/configs/current:
++ @echo
++ @echo
++ @echo "Please choose a configuration from the following list:"
++ @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
++ @echo
++ @echo "Then type 'make <config>' (ex: 'make linux-x86')"
++ @echo
++ @echo "Or, run './configure' then 'make'"
++ @echo "See './configure --help' for details"
++ @echo
++ @echo "(ignore the following error message)"
++ @exit 1
++
++
++# Rules to set/install a specific build configuration
++aix \
++aix-64 \
++aix-64-static \
++aix-gcc \
++aix-static \
++autoconf \
++bluegene-osmesa \
++bluegene-xlc-osmesa \
++beos \
++catamount-osmesa-pgi \
++darwin \
++darwin-fat-32bit \
++darwin-fat-all \
++freebsd \
++freebsd-dri \
++freebsd-dri-amd64 \
++freebsd-dri-x86 \
++hpux10 \
++hpux10-gcc \
++hpux10-static \
++hpux11-32 \
++hpux11-32-static \
++hpux11-32-static-nothreads \
++hpux11-64 \
++hpux11-64-static \
++hpux11-ia64 \
++hpux11-ia64-static \
++hpux9 \
++hpux9-gcc \
++irix6-64 \
++irix6-64-static \
++irix6-n32 \
++irix6-n32-static \
++irix6-o32 \
++irix6-o32-static \
++linux \
++linux-i965 \
++linux-alpha \
++linux-alpha-static \
++linux-cell \
++linux-cell-debug \
++linux-debug \
++linux-dri \
++linux-dri-debug \
++linux-dri-x86 \
++linux-dri-x86-64 \
++linux-dri-ppc \
++linux-dri-xcb \
++linux-egl \
++linux-indirect \
++linux-fbdev \
++linux-ia64-icc \
++linux-ia64-icc-static \
++linux-icc \
++linux-icc-static \
++linux-llvm \
++linux-llvm-debug \
++linux-opengl-es \
++linux-osmesa \
++linux-osmesa-static \
++linux-osmesa16 \
++linux-osmesa16-static \
++linux-osmesa32 \
++linux-ppc \
++linux-ppc-static \
++linux-profile \
++linux-sparc \
++linux-sparc5 \
++linux-static \
++linux-ultrasparc \
++linux-tcc \
++linux-x86 \
++linux-x86-debug \
++linux-x86-32 \
++linux-x86-64 \
++linux-x86-64-debug \
++linux-x86-64-profile \
++linux-x86-64-static \
++linux-x86-profile \
++linux-x86-static \
++netbsd \
++openbsd \
++osf1 \
++osf1-static \
++solaris-x86 \
++solaris-x86-gcc \
++solaris-x86-gcc-static \
++sunos4 \
++sunos4-gcc \
++sunos4-static \
++sunos5 \
++sunos5-gcc \
++sunos5-64-gcc \
++sunos5-smp \
++sunos5-v8 \
++sunos5-v8-static \
++sunos5-v9 \
++sunos5-v9-static \
++sunos5-v9-cc-g++ \
++ultrix-gcc:
++ @ if test -f configs/current -o -L configs/current; then \
++ if ! cmp configs/$@ configs/current > /dev/null; then \
++ echo "Please run 'make realclean' before changing configs" ; \
++ exit 1 ; \
++ fi ; \
++ else \
++ cd configs && rm -f current && ln -s $@ current ; \
++ fi
++ $(MAKE) default
++
++
++# Rules for making release tarballs
++
++VERSION=8.0.1
++DIRECTORY = MesaGLUT-$(VERSION)
++GLUT_NAME = MesaGLUT-$(VERSION)
++
++GLUT_FILES = \
++ $(DIRECTORY)/Makefile* \
++ $(DIRECTORY)/configure \
++ $(DIRECTORY)/configure.ac \
++ $(DIRECTORY)/acinclude.m4 \
++ $(DIRECTORY)/aclocal.m4 \
++ $(DIRECTORY)/bin/config.guess \
Home |
Main Index |
Thread Index |
Old Index