pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Finally update Mesa and friends after the dis...
details: https://anonhg.NetBSD.org/pkgsrc/rev/59875fda8fe4
branches: trunk
changeset: 463574:59875fda8fe4
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Tue Nov 18 16:10:55 2003 +0000
description:
Finally update Mesa and friends after the distfile changed on the website
without a version bump. Changes made, according to the website, for
libtool/autofoo fixes.
Some changes from Ron Roskens:
glut depends upon graphics/glu (otherwise its linked against X11R6 libs)
MesaDemos:
rather than using the pre-built distribution makefiles,
use the automake/configure built makefiles which have
the build dependencies all setup.
This closes PR pkg/23476.
diffstat:
graphics/Mesa/Makefile | 7 ++++---
graphics/Mesa/Makefile.common | 9 +++++----
graphics/MesaDemos/Makefile | 16 ++++++++++------
graphics/MesaDemos/PLIST | 3 ++-
graphics/MesaDemos/distinfo | 16 ++++++++++------
graphics/MesaDemos/patches/patch-aa | 29 +++++++++++------------------
graphics/MesaDemos/patches/patch-ab | 30 ++++++++++++++++++++++++++++++
graphics/MesaDemos/patches/patch-ac | 14 ++++++++++++++
graphics/MesaDemos/patches/patch-ad | 13 +++++++++++++
graphics/MesaDemos/patches/patch-ae | 17 +++++++++++++++++
graphics/MesaLib/Makefile | 4 ++--
graphics/MesaLib/PLIST | 8 +++-----
graphics/MesaLib/distinfo | 9 +++++----
graphics/MesaLib/patches/patch-ac | 18 +++++++++---------
graphics/MesaLib/patches/patch-ae | 17 +++++++++++++++++
graphics/glu/Makefile | 4 ++--
graphics/glu/PLIST | 4 ++--
graphics/glu/distinfo | 7 ++++---
graphics/glu/patches/patch-ae | 17 +++++++++++++++++
graphics/glut/Makefile | 7 +++++--
graphics/glut/distinfo | 12 +++++++-----
graphics/glut/patches/patch-ad | 14 ++++++++++++++
graphics/glut/patches/patch-ae | 17 +++++++++++++++++
23 files changed, 220 insertions(+), 72 deletions(-)
diffs (truncated from 519 to 300 lines):
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/Mesa/Makefile Tue Nov 18 16:10:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/09/29 21:30:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.53 2003/11/18 16:10:55 jschauma Exp $
#
PKGNAME= Mesa-${MESA_VERSION}
@@ -12,8 +12,6 @@
pre-patch: # empty
-.include "Makefile.common"
-
USE_BUILDLINK2= yes
USE_X11BASE= yes
@@ -22,8 +20,11 @@
NO_BUILD= yes
EXTRACT_ONLY= # empty
+post-patch: # empty
do-install: # empty
+.include "Makefile.common"
+
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/glu/buildlink2.mk"
.include "../../graphics/glut/buildlink2.mk"
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/Mesa/Makefile.common Tue Nov 18 16:10:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2003/09/29 21:30:28 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.20 2003/11/18 16:10:55 jschauma Exp $
DISTNAME?= MesaLib-${MESA_VERSION}
CATEGORIES?= graphics
@@ -8,16 +8,17 @@
MAINTAINER?= tech-pkg%NetBSD.org@localhost
HOMEPAGE?= http://www.mesa3d.org/
-AUTOMAKE_REQD= 1.4
+AUTOMAKE_REQD= 1.7
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE?= yes
CONFIGURE_ARGS+= --enable-static
+DIST_SUBDIR= Mesa-${MESA_VERSION}
-.if !target(pre-patch)
-pre-patch:
+.if !target(post-patch)
+post-patch:
cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
.endif
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaDemos/Makefile Tue Nov 18 16:10:55 2003 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/18 16:10:55 jschauma Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
+PKGREVISION= 1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
@@ -11,18 +12,21 @@
USE_BUILDLINK2= yes
USE_X11BASE= yes
+
BUILD_DIRS= ${WRKSRC}/book ${WRKSRC}/demos ${WRKSRC}/samples
-MAKEFILE= Makefile.X11
-ALL_TARGET= netbsd
+ALL_TARGET= check
+CONFIGURE_ARGS+= --with-glut=${X11PREFIX}
+CONFIGURE_ENV+= ac_cv_lib_glut_main=yes
MAKE_ENV+= X11PREFIX=${X11PREFIX}
do-install:
.for dir in book demos images samples
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME}/${dir}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
cd ${WRKSRC}/${dir} && ${PAX} -s ,^./.*Makefile.*,, -s ,^./CVS.*,, \
- -rw . ${PREFIX}/share/examples/${PKGNAME}/${dir}
+ -s ,^./.*\\.o$$,, -s ,^./\\.libs.*,, -s ,^./\\.deps.*,, \
+ -rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
.endfor
- ${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME}
+ ${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV}
.include "../../graphics/Mesa/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaDemos/PLIST Tue Nov 18 16:10:55 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/29 21:30:28 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/11/18 16:10:55 jschauma Exp $
share/examples/${PKGNAME}/book/README
share/examples/${PKGNAME}/book/aaindex
share/examples/${PKGNAME}/book/aaindex.c
@@ -135,6 +135,7 @@
share/examples/${PKGNAME}/demos/descrip.mms
share/examples/${PKGNAME}/demos/drawpix
share/examples/${PKGNAME}/demos/drawpix.c
+share/examples/${PKGNAME}/demos/example.c
share/examples/${PKGNAME}/demos/fire
share/examples/${PKGNAME}/demos/fire.c
share/examples/${PKGNAME}/demos/gamma
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/distinfo
--- a/graphics/MesaDemos/distinfo Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaDemos/distinfo Tue Nov 18 16:10:55 2003 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2003/11/18 16:10:55 jschauma Exp $
-SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
-SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
-SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes
+SHA1 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 3c6f948023f5f41b8d5bd308076e9d8cfd194115
+Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 901632 bytes
+SHA1 (patch-aa) = b5fa5d77d3b0cf7906f28408e7dec20e9c696276
+SHA1 (patch-ab) = 8750d7a8c476c85823c0c56bb9b6f8323019a1f0
+SHA1 (patch-ac) = 38da6ec05805eab6c93431e7e977e38b33f83860
+SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/patches/patch-aa
--- a/graphics/MesaDemos/patches/patch-aa Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaDemos/patches/patch-aa Tue Nov 18 16:10:55 2003 +0000
@@ -1,22 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/03/09 19:04:53 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2003/11/18 16:10:55 jschauma Exp $
---- book/Makefile.X11.orig Tue Feb 15 20:09:06 2000
-+++ book/Makefile.X11 Sat Mar 8 18:59:50 2003
-@@ -9,10 +9,10 @@
-
- ##### MACROS #####
-
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
-
--GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-+GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
-
-@@ -22,7 +22,7 @@
+--- book/Makefile.am.orig 2003-11-07 08:32:07.000000000 -0600
++++ book/Makefile.am 2003-11-17 20:50:19.000000000 -0600
+@@ -10,13 +10,12 @@
lines list material mipmap model movelight nurbs pickdepth \
picksquare plane planet polyoff polys quadric robot sccolorlight \
scene scenebamb sceneflat select smooth stencil stroke surface \
@@ -24,4 +10,11 @@
+ teaambient teapots texbind texgen texprox texsub \
texturesurf torus trim unproject varray wrap
+ EXTRA_DIST = jitter.h
+-LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \
+- $(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+ #LDFLAGS = -no-install
+
+ # execute all programs
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaDemos/patches/patch-ab Tue Nov 18 16:10:55 2003 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.5 2003/11/18 16:10:55 jschauma Exp $
+
+--- demos/Makefile.am.orig 2003-11-07 10:57:52.000000000 -0600
++++ demos/Makefile.am 2003-11-17 21:26:50.000000000 -0600
+@@ -22,6 +22,7 @@
+ morph3d \
+ multiarb \
+ occlude \
++ osdemo \
+ paltex \
+ pixeltex \
+ pointblast \
+@@ -47,14 +48,14 @@
+
+ CLEANFILES = test.ppm
+
+-LDADD = $(GLUT_LIBS) \
+- $(top_builddir)/$(GLU_DIR)/libGLU.la \
+- $(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+
+ #LDFLAGS = -no-install
+
+ EXTRA_DIST = isosurf.dat particles.cxx particles.h tunneldat.h
+
++osdemo_LDADD = $(LDADD) -lOSMesa
++
+ # use double buffering if possible
+ BUFFER = -db
+
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaDemos/patches/patch-ac Tue Nov 18 16:10:55 2003 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.4 2003/11/18 16:10:55 jschauma Exp $
+
+--- samples/Makefile.am.orig 2003-11-07 08:32:08.000000000 -0600
++++ samples/Makefile.am 2003-11-17 20:51:29.000000000 -0600
+@@ -12,8 +12,7 @@
+
+ EXTRA_DIST = tkmap.c loadppm.c
+
+-LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \
+- $(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+ #LDFLAGS = -no-install
+
+ # default image
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaDemos/patches/patch-ad Tue Nov 18 16:10:55 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:55 jschauma Exp $
+
+--- configure.orig 2003-11-08 19:10:36.000000000 -0500
++++ configure 2003-11-08 19:10:53.000000000 -0500
+@@ -7121,7 +7121,7 @@
+ if test "x$enable_optim" = xyes; then
+ if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then
+ if test "x$GCC" = xyes; then
+- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing"
++ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing"
+ case "$host" in
+ i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";;
+ esac
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaDemos/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaDemos/patches/patch-ae Tue Nov 18 16:10:55 2003 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:55 jschauma Exp $
+
+--- src/GGI/Makefile.am.orig 2003-11-13 21:47:55.000000000 -0500
++++ src/GGI/Makefile.am 2003-11-13 21:48:04.000000000 -0500
+@@ -7,10 +7,10 @@
+ ggimesaconfdatadir = ${sysconfdir}/ggi
+ ggimesaconfdata_DATA = ggimesa.conf
+
+-INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
+ -I$(top_srcdir)/src $(GGI_CFLAGS)
+
+-DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
++DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
+
+ if HAVE_GGI
+ # Build a libtool convenience library.
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaLib/Makefile Tue Nov 18 16:10:55 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/11/09 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2003/11/18 16:10:55 jschauma Exp $
PKGNAME= MesaLib-${MESA_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER= rh%NetBSD.org@localhost
COMMENT= Graphics library similar to SGI's OpenGL
diff -r 0aca8b8d9242 -r 59875fda8fe4 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST Tue Nov 18 14:55:37 2003 +0000
+++ b/graphics/MesaLib/PLIST Tue Nov 18 16:10:55 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/09/29 21:30:28 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/11/18 16:10:55 jschauma Exp $
include/GL/gl.h
include/GL/gl_mangle.h
include/GL/glext.h
@@ -13,12 +13,10 @@
lib/libGL.la
lib/libGL.so
lib/libGL.so.5
-lib/libGL.so.5.501
+lib/libGL.so.5.502
lib/libOSMesa.a
lib/libOSMesa.la
lib/libOSMesa.so
Home |
Main Index |
Thread Index |
Old Index