Subject: Re: Mesa3d
To: None <tech-pkg@netbsd.org>
From: Jan Schaumann <jschauma@netbsd.org>
List: tech-pkg
Date: 11/17/2003 15:19:09
--Y7xTucakfITjPcLV
Content-Type: multipart/mixed; boundary="ibTvN161/egqYuK8"
Content-Disposition: inline
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Jan Schaumann <jschauma@netbsd.org> wrote:
> Jan Schaumann <jschauma@netbsd.org> wrote:
> =20
> > I'm working on this. One of the things that held me back from updating
> > those packages is that oddly enough graphics/glut now creates
> > libglut.so.0.0. The previous was .so.10.1, so I really don't quite
> > understand why that would be the case.
Attached are patches to update Mesa* and gl*. glut still builds
libglut.so.0.0, but I see no way short of renaming/forcing it to get
another version number.
Forcing it may, however, not be a good idea since we then digress from
the original distribution. So... any objections if we just use
libglut.so.0.0?
-Jan
--=20
"Life," said Marvin, "don't talk to me about life."
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Content-Transfer-Encoding: quoted-printable
Index: Mesa/Makefile.common
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/Mesa/Makefile.common,v
retrieving revision 1.19
diff -b -u -r1.19 Makefile.common
--- Mesa/Makefile.common 29 Sep 2003 21:30:28 -0000 1.19
+++ Mesa/Makefile.common 17 Nov 2003 20:06:37 -0000
@@ -8,16 +8,17 @@
MAINTAINER?=3D tech-pkg@NetBSD.org
HOMEPAGE?=3D http://www.mesa3d.org/
=20
-AUTOMAKE_REQD=3D 1.4
+AUTOMAKE_REQD=3D 1.7
USE_GMAKE=3D yes
USE_LIBTOOL=3D yes
LIBTOOL_OVERRIDE=3D ${WRKSRC}/libtool
=20
GNU_CONFIGURE?=3D yes
CONFIGURE_ARGS+=3D --enable-static
+DIST_SUBDIR=3D Mesa-${MESA_VERSION}
=20
-.if !target(pre-patch)
-pre-patch:
+.if !target(post-patch)
+post-patch:
cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
.endif
=20
Index: MesaDemos/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaDemos/Makefile,v
retrieving revision 1.8
diff -b -u -r1.8 Makefile
--- MesaDemos/Makefile 26 Aug 2003 01:43:51 -0000 1.8
+++ MesaDemos/Makefile 17 Nov 2003 20:06:37 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.8 2003/08/26 01:43:51 jschauma Exp $
=20
PKGNAME=3D MesaDemos-${MESA_VERSION}
+PKGREVISION=3D 1
DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+=3D ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC=3D ${WRKDIR}/${DISTNAME:S/Lib//}
Index: MesaDemos/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaDemos/distinfo,v
retrieving revision 1.4
diff -b -u -r1.4 distinfo
--- MesaDemos/distinfo 29 Sep 2003 21:30:28 -0000 1.4
+++ MesaDemos/distinfo 17 Nov 2003 20:06:37 -0000
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 jschauma Exp $
=20
-SHA1 (MesaLib-5.0.2.tar.bz2) =3D 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) =3D 1704278 bytes
-SHA1 (MesaDemos-5.0.2.tar.bz2) =3D 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) =3D 896368 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D a49234ad74d6c67b2727c1dd8a8c8e=
1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D 1719544 bytes
+SHA1 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) =3D 3c6f948023f5f41b8d5bd308076e=
9d8cfd194115
+Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) =3D 901632 bytes
SHA1 (patch-aa) =3D 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
+SHA1 (patch-ae) =3D 58bb48fb84edae72ecfb62682061cf6d723fe100
Index: MesaLib/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/Makefile,v
retrieving revision 1.25
diff -b -u -r1.25 Makefile
--- MesaLib/Makefile 9 Nov 2003 02:23:18 -0000 1.25
+++ MesaLib/Makefile 17 Nov 2003 20:06:37 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.25 2003/11/09 02:23:18 jschauma Exp $
=20
PKGNAME=3D MesaLib-${MESA_VERSION}
-PKGREVISION=3D 1
+PKGREVISION=3D 2
WRKSRC=3D ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER=3D rh@NetBSD.org
COMMENT=3D Graphics library similar to SGI's OpenGL
Index: MesaLib/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/PLIST,v
retrieving revision 1.10
diff -b -u -r1.10 PLIST
--- MesaLib/PLIST 29 Sep 2003 21:30:28 -0000 1.10
+++ MesaLib/PLIST 17 Nov 2003 20:06:37 -0000
@@ -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
lib/libOSMesa.so.4
-lib/libOSMesa.so.4.501
-share/examples/mesa/mesa.conf
-@dirrm share/examples/mesa
+lib/libOSMesa.so.4.502
@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
Index: MesaLib/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
retrieving revision 1.14
diff -b -u -r1.14 distinfo
--- MesaLib/distinfo 9 Nov 2003 02:23:18 -0000 1.14
+++ MesaLib/distinfo 17 Nov 2003 20:06:37 -0000
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.14 2003/11/09 02:23:18 jschauma Exp $
=20
-SHA1 (MesaLib-5.0.2.tar.bz2) =3D 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) =3D 1704278 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D a49234ad74d6c67b2727c1dd8a8c8e=
1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D 1719544 bytes
SHA1 (patch-aa) =3D 7fa63dca0edfc41812b5432cbabd861ec52cec33
-SHA1 (patch-ac) =3D 30d3f08c2d9bbfe648a2ed2cbfade6c30a7413fe
+SHA1 (patch-ac) =3D 723c70827840465f3b7f07e0852107ddcdc0c0c1
SHA1 (patch-ad) =3D 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) =3D 58bb48fb84edae72ecfb62682061cf6d723fe100
Index: MesaLib/patches/patch-ac
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/patches/patch-ac,v
retrieving revision 1.2
diff -b -u -r1.2 patch-ac
--- MesaLib/patches/patch-ac 29 Sep 2003 21:30:28 -0000 1.2
+++ MesaLib/patches/patch-ac 17 Nov 2003 20:06:37 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/09/29 21:30:28 jschauma Exp $
+$NetBSD: $
=20
---- src/Makefile.in.orig 2003-09-29 13:14:27.000000000 -0400
-+++ src/Makefile.in 2003-09-29 13:14:55.000000000 -0400
-@@ -25,7 +25,7 @@
+--- src/Makefile.in.orig 2003-11-07 11:58:20.000000000 -0500
++++ src/Makefile.in 2003-11-13 21:45:41.000000000 -0500
+@@ -187,7 +187,7 @@
+ program_transform_name =3D @program_transform_name@
sbindir =3D @sbindir@
- libexecdir =3D @libexecdir@
- datadir =3D @datadir@
+ sharedstatedir =3D @sharedstatedir@
-sysconfdir =3D @sysconfdir@
+sysconfdir =3D @datadir@/examples/mesa
- sharedstatedir =3D @sharedstatedir@
- localstatedir =3D @localstatedir@
- libdir =3D @libdir@
+ target_alias =3D @target_alias@
+ use_si_glu =3D @use_si_glu@
+=20
Index: glu/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/Makefile,v
retrieving revision 1.20
diff -b -u -r1.20 Makefile
--- glu/Makefile 9 Nov 2003 02:23:18 -0000 1.20
+++ glu/Makefile 17 Nov 2003 20:06:37 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.20 2003/11/09 02:23:18 jschauma Exp $
=20
PKGNAME=3D ${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=3D 1
+PKGREVISION=3D 2
WRKSRC=3D ${WRKDIR}/${DISTNAME:C/Lib//}
MAINTAINER=3D rh@NetBSD.org
COMMENT=3D GLU polygon tesselation facility for Mesa
Index: glu/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/PLIST,v
retrieving revision 1.7
diff -b -u -r1.7 PLIST
--- glu/PLIST 10 May 2003 16:37:12 -0000 1.7
+++ glu/PLIST 17 Nov 2003 20:06:37 -0000
@@ -3,7 +3,7 @@
include/GL/glu_mangle.h
lib/libGLU.so
lib/libGLU.so.2
-lib/libGLU.so.2.501
+lib/libGLU.so.2.502
lib/libGLU.a
lib/libGLU.la
@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
Index: glu/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/distinfo,v
retrieving revision 1.13
diff -b -u -r1.13 distinfo
--- glu/distinfo 9 Nov 2003 02:23:18 -0000 1.13
+++ glu/distinfo 17 Nov 2003 20:06:37 -0000
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.13 2003/11/09 02:23:18 jschauma Exp $
=20
-SHA1 (MesaLib-5.0.2.tar.bz2) =3D 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) =3D 1704278 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D a49234ad74d6c67b2727c1dd8a8c8e=
1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D 1719544 bytes
SHA1 (patch-aa) =3D 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) =3D 58bb48fb84edae72ecfb62682061cf6d723fe100
Index: glut/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/Makefile,v
retrieving revision 1.21
diff -b -u -r1.21 Makefile
--- glut/Makefile 9 Nov 2003 02:23:18 -0000 1.21
+++ glut/Makefile 17 Nov 2003 20:06:37 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.21 2003/11/09 02:23:18 jschauma Exp $
=20
PKGNAME=3D ${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=3D 1
+PKGREVISION=3D 2
DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+=3D ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC=3D ${WRKDIR}/${DISTNAME:S/Lib//}
@@ -14,6 +14,8 @@
.include "../../graphics/Mesa/Makefile.common"
=20
USE_BUILDLINK2=3D yes
+USE_LIBTOOL=3D yes
+LIBTOOL_OVERRIDE=3D ${WRKSRC}/libtool
USE_X11BASE=3D yes
CONFIGURE_DIRS=3D ${WRKSRC}
BUILD_DIRS=3D ${WRKSRC}/src-glut
Index: glut/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/PLIST,v
retrieving revision 1.8
diff -b -u -r1.8 PLIST
--- glut/PLIST 26 Aug 2003 01:43:50 -0000 1.8
+++ glut/PLIST 17 Nov 2003 20:06:37 -0000
@@ -2,8 +2,8 @@
include/GL/glut.h
include/GL/glutf90.h
lib/libglut.so
-lib/libglut.so.10
-lib/libglut.so.10.1
+lib/libglut.so.0
+lib/libglut.so.0.0
lib/libglut.a
lib/libglut.la
@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
Index: glut/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/distinfo,v
retrieving revision 1.16
diff -b -u -r1.16 distinfo
--- glut/distinfo 9 Nov 2003 02:23:18 -0000 1.16
+++ glut/distinfo 17 Nov 2003 20:06:37 -0000
@@ -1,8 +1,10 @@
$NetBSD: distinfo,v 1.16 2003/11/09 02:23:18 jschauma Exp $
=20
-SHA1 (MesaLib-5.0.2.tar.bz2) =3D 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) =3D 1704278 bytes
-SHA1 (MesaDemos-5.0.2.tar.bz2) =3D 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) =3D 896368 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D a49234ad74d6c67b2727c1dd8a8c8e=
1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) =3D 1719544 bytes
+SHA1 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) =3D 3c6f948023f5f41b8d5bd308076e=
9d8cfd194115
+Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) =3D 901632 bytes
SHA1 (patch-aa) =3D d7a7dab7da7068c814a28b996bb3af6c24b48801
SHA1 (patch-ab) =3D 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) =3D 58bb48fb84edae72ecfb62682061cf6d723fe100
+SHA1 (patch-af) =3D febcd3b7551a9f81d57134dff7f0d7f8d2715c01
--ibTvN161/egqYuK8--
--Y7xTucakfITjPcLV
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (NetBSD)
iD8DBQE/uS09fFtkr68iakwRAhmGAKDEZb/xYHEpDvi31s8Jk2QKNRf/vgCcCy5c
YgD/iTjml3ezhwvdJ+V0J9Q=
=dWma
-----END PGP SIGNATURE-----
--Y7xTucakfITjPcLV--