Date: Tue, 22 Aug 2000 13:19:17 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: jseger@FreeBSD.org Cc: ports@FreeBSD.org Subject: Mesa3 port and XFree-4 [patch] Message-ID: <39A253A5.24303B72@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------146D4369C1A6B78654D68CED
Content-Type: text/plain; charset=x-user-defined
Content-Transfer-Encoding: 7bit
Hi,
As you may know, Mesa port doesn't quite work with XFree4. The problem is that
the port installs libGL and associated header files, while for this release of
XFree GL applications should use GL library and headers installed as part of
XFree itself. Therefore, if XFREE86_VERSION>3 the Mesa port should only install
GLU and glut libraries and appropriate headers. Unfortunately, the Mesa itself
doesn't yet provide any easy way to cope with this problem, so I applied bit of
hackery to get it working. Please review the attached patches and either commit
it by yourself or give me your maintainer's approval for that. When this patch
is committed, I will ask asami to add appropriate logic into bsd.make.conf to
handle USE_MESA correctly both on XFree3 and 4.
Thanks!
-Maxim
--------------146D4369C1A6B78654D68CED
Content-Type: text/plain; charset=x-user-defined;
name="Mesa3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="Mesa3.diff"
diff -druN /tmp/Mesa3/Makefile Mesa3/Makefile
--- /tmp/Mesa3/Makefile Wed Jun 14 16:21:21 2000
+++ Mesa3/Makefile Tue Aug 22 13:00:33 2000
@@ -24,7 +24,6 @@
CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
.endif
-GLVER= 14
GLUTVER= 3
USE_X_PREFIX= yes
USE_LIBTOOL= yes
@@ -32,9 +31,33 @@
CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 3
+SUB_GL= src
+INCLUDE_GL= include
+GLVER= 14
+PLIST_SUB+= XFREE3:=""
+.else
+SUB_GL=
+INCLUDE_GL=
+GLVER= 1
+PLIST_SUB+= XFREE3:="@comment "
+MAKE_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*"
+MAKE_ARGS= -e
+.endif
+
+MAKE_ENV+= SUB_GL=${SUB_GL} \
+ INCLUDE_GL=${INCLUDE_GL}
+
post-install:
.for lib in GL GLU
@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
.endfor
+.if ${XFREE86_VERSION} > 3
+ @${MKDIR} ${PREFIX}/include/GL
+ @cd ${WRKSRC}/include/GL && \
+ ${INSTALL_DATA} glu.h glut.h ${PREFIX}/include/GL
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -druN /tmp/Mesa3/patches/patch-ad Mesa3/patches/patch-ad
--- /tmp/Mesa3/patches/patch-ad Thu Jan 1 03:00:00 1970
+++ Mesa3/patches/patch-ad Tue Aug 22 13:00:33 2000
@@ -0,0 +1,20 @@
+--- Makefile.in 2000/08/22 07:27:14 1.1
++++ Makefile.in 2000/08/22 07:29:15
+@@ -92,7 +92,7 @@
+
+ @NEED_GLUT_TRUE@SUB_GLUT = src-glut
+
+-SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
++SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu $(SUB_GLUT) $(DEMO_DIRS) util
+
+ EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE docs/RELNOTES docs/VERSIONS docs/CONFORM docs/COPYING docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS docs/README.GGI docs/README.MINGW32 docs/README.MITS docs/README.QUAKE docs/README.THREADS docs/README.X11 images/girl.rgb images/reflect.rgb images/tile.rgb
+
+@@ -110,7 +110,7 @@
+
+ TAR = gtar
+ GZIP_ENV = --best
+-DIST_SUBDIRS = include src src-glu src-glut book demos samples xdemos \
++DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu src-glut book demos samples xdemos \
+ util
+ all: all-redirect
+ .SUFFIXES:
diff -druN /tmp/Mesa3/pkg/PLIST Mesa3/pkg/PLIST
--- /tmp/Mesa3/pkg/PLIST Tue Apr 25 23:25:55 2000
+++ Mesa3/pkg/PLIST Tue Aug 22 13:00:33 2000
@@ -1,21 +1,21 @@
-etc/mesa.conf
-include/GL/gl.h
-include/GL/gl_mangle.h
+%%XFREE3:%%etc/mesa.conf
+%%XFREE3:%%include/GL/gl.h
+%%XFREE3:%%include/GL/gl_mangle.h
include/GL/glu.h
-include/GL/glu_mangle.h
+%%XFREE3:%%include/GL/glu_mangle.h
include/GL/glut.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/osmesa.h
-include/GL/xmesa.h
-include/GL/xmesa_x.h
-include/GL/xmesa_xf86.h
+%%XFREE3:%%include/GL/glx.h
+%%XFREE3:%%include/GL/glx_mangle.h
+%%XFREE3:%%include/GL/osmesa.h
+%%XFREE3:%%include/GL/xmesa.h
+%%XFREE3:%%include/GL/xmesa_x.h
+%%XFREE3:%%include/GL/xmesa_xf86.h
lib/libGL.so
-lib/libGL.so.%%GLVER%%
+%%XFREE3:%%lib/libGL.so.%%GLVER%%
lib/libGLU.so
lib/libGLU.so.%%GLVER%%
lib/libMesaGL.so
lib/libMesaGLU.so
lib/libglut.so
lib/libglut.so.%%GLUTVER%%
-@dirrm include/GL
+%%XFREE3:%%@dirrm include/GL
--------------146D4369C1A6B78654D68CED--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?39A253A5.24303B72>