Subject: MesaLib update: glut and MesaDemos
To: Jan Schaumann <jschauma@netbsd.org>
From: Ron Roskens <roskens@elfin.net>
List: tech-pkg
Date: 11/17/2003 21:41:07
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Jan,
A couple of build problems inside glut and MesaDemos:
glut:
libglut built without version
glut depends upon graphics/glu (otherwise its linked against X11R6 libs)
glut uses libtool.
MesaDemos:
rather than using the pre-built distribution makefiles,
use the automake/configure built makefiles which have
the build dependencies all setup.
Ron
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="glut.diff"
Index: glut/Makefile
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/graphics/glut/Makefile,v
retrieving revision 1.21
diff -B -p -u -r1.21 Makefile
--- glut/Makefile 9 Nov 2003 02:23:18 -0000 1.21
+++ glut/Makefile 18 Nov 2003 02:29:21 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.21 2003/11/09 02:23:18 jschauma Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
-PKGREVISION= 1
+PKGREVISION= 2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
@@ -14,6 +14,8 @@ CONFLICTS+= Mesa<3.2.1
.include "../../graphics/Mesa/Makefile.common"
USE_BUILDLINK2= yes
+USE_LIBTOOL= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_X11BASE= yes
CONFIGURE_DIRS= ${WRKSRC}
BUILD_DIRS= ${WRKSRC}/src-glut
@@ -27,6 +29,7 @@ post-install:
done
.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
# must be below bsd.pkg.mk to overwrite values
Index: glut/distinfo
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/graphics/glut/distinfo,v
retrieving revision 1.16
diff -B -p -u -r1.16 distinfo
--- glut/distinfo 9 Nov 2003 02:23:18 -0000 1.16
+++ glut/distinfo 18 Nov 2003 02:24:36 -0000
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.16 2003/11/09 02:23:18 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 (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) = d7a7dab7da7068c814a28b996bb3af6c24b48801
SHA1 (patch-ab) = 807b07b1505735f23dd4148c8c838df08af6333e
Index: glut/patches/patch-ac
===================================================================
RCS file: glut/patches/patch-ac
diff -N glut/patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ glut/patches/patch-ac 18 Nov 2003 02:38:16 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/GGI/Makefile.am.orig 2003-11-07 08:33:09.000000000 -0600
++++ src/GGI/Makefile.am 2003-11-17 20:24:36.000000000 -0600
+@@ -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.
Index: glut/patches/patch-ad
===================================================================
RCS file: glut/patches/patch-ad
diff -N glut/patches/patch-ad
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ glut/patches/patch-ad 18 Nov 2003 02:38:16 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src-glut/Makefile.am.orig 2003-11-07 10:36:19.000000000 -0600
++++ src-glut/Makefile.am 2003-11-17 20:25:58.000000000 -0600
+@@ -8,9 +8,8 @@
+ lib_LTLIBRARIES = libglut.la
+ EXTRA_PROGRAMS = capturexfont
+
+-#libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LDFLAGS = -L../@GLU_DIR@
+-libglut_la_LIBADD = -lGLU
++libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
++libglut_la_LIBADD = ${LDFLAGS} -lGLU
+ libglut_la_SOURCES = \
+ glutwin32.h \
+ win32_glx.h \
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="MesaDemos.diff"
Index: MesaDemos/Makefile
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/graphics/MesaDemos/Makefile,v
retrieving revision 1.8
diff -B -p -u -r1.8 Makefile
--- MesaDemos/Makefile 26 Aug 2003 01:43:51 -0000 1.8
+++ MesaDemos/Makefile 18 Nov 2003 03:29:29 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.8 2003/08/26 01:43:51 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,23 @@ COMMENT= OpenGL examples and Demos
USE_BUILDLINK2= yes
USE_X11BASE= yes
+USE_LIBTOOL= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
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"
Index: MesaDemos/distinfo
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/graphics/MesaDemos/distinfo,v
retrieving revision 1.4
diff -B -p -u -r1.4 distinfo
--- MesaDemos/distinfo 29 Sep 2003 21:30:28 -0000 1.4
+++ MesaDemos/distinfo 18 Nov 2003 03:26:50 -0000
@@ -1,7 +1,11 @@
$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 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) = e51a24319e450026b44ade4922095e4051f3318a
+SHA1 (patch-ac) = 8750d7a8c476c85823c0c56bb9b6f8323019a1f0
+SHA1 (patch-ad) = 38da6ec05805eab6c93431e7e977e38b33f83860
+SHA1 (patch-ae) = 0b1b8f12e6e9c75977804a65cc291ac8d0619c27
Index: MesaDemos/patches/patch-aa
===================================================================
RCS file: /cvs/NetBSD/pkgsrc/graphics/MesaDemos/patches/patch-aa,v
retrieving revision 1.2
diff -B -p -u -r1.2 patch-aa
--- MesaDemos/patches/patch-aa 9 Mar 2003 19:04:53 -0000 1.2
+++ MesaDemos/patches/patch-aa 18 Nov 2003 02:52:11 -0000
@@ -1,22 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/03/09 19:04:53 jschauma Exp $
+$NetBSD$
---- 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 @@ $NetBSD: patch-aa,v 1.2 2003/03/09 19:04
+ 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
Index: MesaDemos/patches/patch-ab
===================================================================
RCS file: MesaDemos/patches/patch-ab
diff -N MesaDemos/patches/patch-ab
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MesaDemos/patches/patch-ab 18 Nov 2003 03:26:50 -0000
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- 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
+
Index: MesaDemos/patches/patch-ac
===================================================================
RCS file: MesaDemos/patches/patch-ac
diff -N MesaDemos/patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MesaDemos/patches/patch-ac 18 Nov 2003 02:52:25 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- 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
Index: MesaDemos/patches/patch-ad
===================================================================
RCS file: MesaDemos/patches/patch-ad
diff -N MesaDemos/patches/patch-ad
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MesaDemos/patches/patch-ad 18 Nov 2003 02:43:47 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/GGI/Makefile.am.orig 2003-11-07 08:33:09.000000000 -0600
++++ src/GGI/Makefile.am 2003-11-17 20:24:36.000000000 -0600
+@@ -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.
Index: MesaDemos/patches/patch-ae
===================================================================
RCS file: MesaDemos/patches/patch-ae
diff -N MesaDemos/patches/patch-ae
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MesaDemos/patches/patch-ae 18 Nov 2003 02:55:30 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.orig 2003-11-07 11:00:34.000000000 -0600
++++ configure 2003-11-17 20:54:58.000000000 -0600
+@@ -8651,7 +8651,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
--ikeVEW9yuYc//A+q--