Hi Francois!
> > I built and installed XFree86-4.0.1-8mdk and the CVS Glide but
> > Mesa-3.3-9mdk fails to build, sorry I cannot currently test it:
> >
> > He does not find a include file named agpgart.h:
>
> Get latest kernel from cooker with newagpgart (versin 0.99).
No I won't. I don't like patched kernels where I don't know what
all the patches do. Where can I get the patch ? Also AFAIK the
RIVA Cards don't need this do they ? Is this patch part of the
coming 2.2.17 (vanilla) kernel ? If no, you have to do something
about it anyway.
I have found the include files in the sources of XFree (maybe an
older version), and this works for compiling and running.
Oh yes, with the MesaGL library switch the vrwave package still
works fine, so we have a compromise here ;-). But I needed to
heavy patch the native part as XMesa has been renamed to osmesa
:-( Also XMesaBuffer (OSMesaBuffer) is no longer existant, so
I don't know what to do about vrwave :-((
What has happened here ? Help is much appreciated, as I suspect
only Mandrake changes (no version number changes). There
seems to be something broken up here :-(
I have still added the patch and spec for vrwave again for lenny,
in case vrwave gets into contrib (still got no answer to that one),
but be aware that it won't compile.
Best regards,
Reinhard Katzmann
--
E-Mail: [EMAIL PROTECTED]
Current Projects: Linux-Installation Mandrake 7.1 (99% finished)
Improvements of Driver for Tevion Tablet
Java-DB and -Interface for Pincity (95 % finished)
GnuPG Public Key available on request.
%define name vrwave
%define version 2.0
%define release 2mdk
Name: %{name}
Version: %{version}
Release: %{release}
Summary: VRML 2.0 browser.
Source: %{name}20-src.tar.bz2
Source1: vrwave.sh
Source2: makejar
Patch: %{name}-%{version}.patch
# Unknown Icon Type :-((((((
#Icon: vrwave.png
Group: X11/Applications/Graphics
BuildRoot: /var/tmp/%{name}-%{version}-root
Copyright: GPL
URL: http://www.iicm.edu/vrwave
Requires: Mesa >= 3.3-9mdk, XFree86
#Requires: java >= 1.1.7
BuildRequires: dos2unix, XFree86-devel >= 4.0.1-8mdk
#BuildRequires: jdk >= 1.1.7
Obsoletes: VRwave
%description
VRwave is a VRML 2.0 browser being developed at the IICM (Institute
for Information Processing and Computer Supported New Media), Graz
University of Technology, Austria, by the team who brought you the
VRweb VRML 1.0 browser.
%changelog
* Wed Aug 16 2000 Reinhard Katzmann <[EMAIL PROTECTED] 1mdk
- Heavily patch for new Mesa (no xmesa.h any longer, now osmesa.h)
(includes are now in XFree86-devel, so a special require was added)
- patched config.OpenGL so it uses -lMesaGL to avoid conflicts with
the GLwrapper which is default for -lGL.
* Wed Aug 16 2000 Reinhard Katzmann <[EMAIL PROTECTED] 1mdk
- Update to 2.0
- First mandrake release
- Macroifizations
- Added java requirements as comment (no jdk package for mandrake)
- Removed 0.9 extra files, added test directory (which has the samples)
- Added fonts, images, sclass (netscape stubs for appletviewer)
* Thu Sep 10 1998 Kjetil Wiekhorst J�rgensen <[EMAIL PROTECTED]> [0.9-2]
- recompiled with mesa 3.0 beta (prior version had big security problems)
- uses jdk 1.1.6 to compile classes
* Tue May 19 1998 Kjetil Wiekhorst J�rgensen <[EMAIL PROTECTED]>
- Initial release.
%prep
%setup -n vrwave20-src
# Without this there are errors while compiling :-(
cd VRwave/native
( for i in *.c *.h ge3d/*.h ; do dos2unix $i ; done )
cd ../..
%patch -p1 -b .orig
%build
export CPU=LINUX_ELF
export CLASSPATH=$CLASSPATH:/usr/lib/netscape/java/classes/java40.jar
cd VRwave
cp javasrc/iicm/vrml/vrwave/Scene_jdk1_1.jav javasrc/iicm/vrml/vrwave/Scene.java
sh ./makeit
#sh ./makepw
cp $RPM_SOURCE_DIR/makejar .
sh ./makejar
cd native
mkdir -p $CPU
( cd $CPU; ln -s ../makefile.CPU makefile )
make alljni
#Use this line instead if you only wish to build netscape plugin
#make alljri
%install
rm -rf $RPM_BUILD_ROOT
cd VRwave
export CPU=LINUX_ELF
install -d $RPM_BUILD_ROOT%{_datadir}/vrwave
install -m 644 -o root -g root classes/vrwave.jar
$RPM_BUILD_ROOT%{_datadir}/vrwave/vrwave.jar
install -d $RPM_BUILD_ROOT%{_libdir}
install -m 644 -o root -g root native/$CPU/libgejc.so
$RPM_BUILD_ROOT%{_libdir}/libgejc.so
install -d $RPM_BUILD_ROOT%{_bindir}
install -m 755 -o root -g root $RPM_SOURCE_DIR/vrwave.sh
$RPM_BUILD_ROOT%{_bindir}/vrwave
cd test
( rm -f *.bat* */*.bat* ; chmod a+x run eaitest/RUN* )
cd ..
install -m 644 -o root -g root images/logo.gif
$RPM_BUILD_ROOT%{_datadir}/vrwave/logo.gif
install -m 644 -o root -g root images/logo_ico.gif
$RPM_BUILD_ROOT%{_datadir}/vrwave/icons.gif
cp -Rd fonts $RPM_BUILD_ROOT%{_datadir}/vrwave
cp -Rd images $RPM_BUILD_ROOT%{_datadir}/vrwave
cp -Rd test $RPM_BUILD_ROOT%{_datadir}/vrwave
cp -Rd sclass $RPM_BUILD_ROOT%{_datadir}/vrwave
ln -sf $RPM_BUILD_ROOT%{_datadir}/vrwave/vrwave.jar
$RPM_BUILD_ROOT%{_datadir}/vrwave/classes
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc VRwave/*.txt VRwave/jdoc
%{_bindir}/vrwave
%{_libdir}/libgejc.so
%{_datadir}/vrwave/vrwave.jar
%{_datadir}/vrwave/classes
%{_datadir}/vrwave/test/*
%{_datadir}/vrwave/fonts
%{_datadir}/vrwave/images
%{_datadir}/vrwave/logo.gif
%{_datadir}/vrwave/icons.gif
%{_datadir}/vrwave/sclass
%docdir /usr/share/vrwave/help
--- vrwave20-src/VRwave/native/cfg/config.LINUX_ELF~ Fri Jul 7 17:07:20 2000
+++ vrwave20-src/VRwave/native/cfg/config.LINUX_ELF Wed Aug 16 21:39:56 2000
@@ -25,8 +25,8 @@
# include ../config.OpenGL
# directory name of netscape's javah (for plugin compilation only)
-NSJAVAHSYS=LinuxELF1.2.13
+NSJAVAHSYS=LinuxELF2.2.16
# path to mesa libraries (libMesaGL*)
-OGLINC=-I/usr3/merkur/mpichler3/mesa/Mesa_LINUX/include
-MESALIBDIR=-L/usr3/merkur/mpichler3/mesa/Mesa_LINUX/lib
+OGLINC=-I/usr/X11R6/include
+MESALIBDIR=-L/usr/X11R6/lib
--- vrwave20-src/VRwave/native/config.OpenGL~ Fri Jul 7 17:07:20 2000
+++ vrwave20-src/VRwave/native/config.OpenGL Mon Aug 28 13:59:07 2000
@@ -13,7 +13,7 @@
GE3DFILE=ge3d_ogl
# OpenGL library
-OGLLIB=-lGLU -lGL
+OGLLIB=-lGLU -lMesaGL
# OpenGL should install a colormap (otherwise technicolor on 8bit)
CCGLDEFS=-DINSTCOLORMAP
--- vrwave20-src/VRwave/native/gejcon.c.orig Mon Aug 28 14:17:49 2000
+++ vrwave20-src/VRwave/native/gejcon.c Mon Aug 28 14:24:28 2000
@@ -32,6 +32,7 @@
#ifdef USEMESA
//#include <mesa/GL/glx.h>
#include <GL/glx.h>
+#include <GL/osmesa.h>
#else
#include <GL/glx.h>
@@ -50,8 +51,8 @@
#define MINWIDTH 150
#define MINHEIGHT 150
-#ifdef XMESA_MAJOR_VERSION
-#define MESA_2_0 /* heavy interface change in XMesa routines */
+#ifdef OSMESA_MAJOR_VERSION
+#define MESA_2_0 /* heavy interface change in OSMesa routines */
#endif
#include <stdio.h> /* debugging */
@@ -188,13 +189,13 @@
{
Window glxwin = (Window) JN_GETINTMEMBERVAR(noglwindow);
#ifdef USEMESA
- XMesaContext pixcon = (XMesaContext) JN_GETPTRMEMBERVAR(ncontext);
- XMesaContext ximcon = (XMesaContext) JN_GETPTRMEMBERVAR(nxcontext);
+ OSMesaContext pixcon = (OSMesaContext) JN_GETPTRMEMBERVAR(ncontext);
+ OSMesaContext ximcon = (OSMesaContext) JN_GETPTRMEMBERVAR(nxcontext);
/* fprintf (stderr, "OGLCanvas_setContext: %p %p\n", (void*) pixcon, (void*)
ximcon); */
- XMesaContext mesacon;
+ OSMesaContext mesacon;
# ifdef MESA_2_0
- XMesaBuffer pixbuf = (XMesaBuffer) JN_GETPTRMEMBERVAR(nbuffer);
- XMesaBuffer ximbuf = (XMesaBuffer) JN_GETPTRMEMBERVAR(nxbuffer);
+ OSMesaBuffer pixbuf = (OSMesaBuffer) JN_GETPTRMEMBERVAR(nbuffer);
+ OSMesaBuffer ximbuf = (OSMesaBuffer) JN_GETPTRMEMBERVAR(nxbuffer);
# endif
#else
GLXContext glxcon = (GLXContext) JN_GETPTRMEMBERVAR(ncontext);
@@ -221,13 +222,13 @@
# ifdef MESA_2_0
/* fprintf (stderr, "drawing into mesa context %p via buffer %p\n", */
/* mesacon, (mesacon == pixcon) ? pixbuf : ximbuf); */
- if (!XMesaMakeCurrent (mesacon, (mesacon == pixcon) ? pixbuf : ximbuf))
- { fprintf (stderr, "%s. Error: XMesaMakeCurrent failed!\n", progname);
+ if (!OSMesaMakeCurrent (mesacon, (mesacon == pixcon) ? pixbuf : ximbuf))
+ { fprintf (stderr, "%s. Error: OSMesaMakeCurrent failed!\n", progname);
return 0;
}
# else
- if (!XMesaMakeCurrent (mesacon))
- { fprintf (stderr, "%s. Error: XMesaMakeCurrent failed!\n", progname);
+ if (!OSMesaMakeCurrent (mesacon))
+ { fprintf (stderr, "%s. Error: OSMesaMakeCurrent failed!\n", progname);
return 0;
}
# endif /* Mesa */
@@ -306,9 +307,9 @@
/* must care of active buffer when having two */
/* fprintf (stderr, "swapping buffer %p\n", */
/* (void*) (handle->obj->nxactive) ? handle->obj->nxbuffer : handle->obj->nbuffer); */
- XMesaSwapBuffers ((XMesaBuffer) ((JN_GETBOOLMEMBERVAR(nxactive)) ?
JN_GETPTRMEMBERVAR(nxbuffer) : JN_GETPTRMEMBERVAR(nbuffer)));
+ OSMesaSwapBuffers ((OSMesaBuffer) ((JN_GETBOOLMEMBERVAR(nxactive)) ?
+JN_GETPTRMEMBERVAR(nxbuffer) : JN_GETPTRMEMBERVAR(nbuffer)));
# else
- XMesaSwapBuffers ();
+ OSMesaSwapBuffers ();
# endif
#else
glXSwapBuffers (xdpy, (Window) JN_GETINTMEMBERVAR(noglwindow));
@@ -523,23 +524,23 @@
#ifdef USEMESA
-static XMesaContext firstmesacontext = 0; /* to share display lists for texturing */
+static OSMesaContext firstmesacontext = 0; /* to share display lists for texturing */
/* createMesaBackBuffer */
/* create Mesa back buffer of ximage or pixmap type */
static void createMesaBackBuffer (Window cwin, XVisualInfo* xvisinfo,
- XMesaContext *mcon, int ximage, const char* ximagestr,
+ OSMesaContext *mcon, int ximage, const char* ximagestr,
# ifdef MESA_2_0
- XMesaBuffer *mbuf
+ OSMesaBuffer *mbuf
# else
int unused
# endif
)
{
# ifdef MESA_2_0
- XMesaVisual mesavis = XMesaCreateVisual (
+ OSMesaVisual mesavis = OSMesaCreateVisual (
xdpy, xvisinfo, 1, /* rgb mode */
0, /* no alpha planes (Mesa 2.0) */
1, /* double buffered */
@@ -548,19 +549,22 @@
# endif
ximage, /* 0:pixmap, 1:ximage */
1, 0, 0, /* depth buffer, no stencil, no accum (Mesa 2.0) */
+# if (OSMESA_MINOR_VERSION > 2)
+ 0, 0, 0, 0, 0, 0,
+# endif
0 /* level (Mesa 2.0) */
);
/* fprintf (stderr, "createMesaBackBuffer (%s)\n", ximagestr); */
if (!mesavis)
- { fprintf (stderr, "%s. fatal: XMesaCreateVisual failed!\n", progname);
+ { fprintf (stderr, "%s. fatal: OSMesaCreateVisual failed!\n", progname);
return;
}
- *mcon = XMesaCreateContext (mesavis, firstmesacontext); /* share display lists */
+ *mcon = OSMesaCreateContext (mesavis, firstmesacontext); /* share display lists */
# else
- *mcon = XMesaCreateContext (
+ *mcon = OSMesaCreateContext (
xdpy, xvisinfo, 1, /* rgb mode */
1, ximage, /* double buffered, ximage or pixmap */
firstmesacontext /* share display lists */
@@ -568,7 +572,7 @@
# endif
if (!*mcon)
- { fprintf (stderr, "%s. fatal: could not create XMesaContext (%s)!\n", progname,
ximagestr);
+ { fprintf (stderr, "%s. fatal: could not create OSMesaContext (%s)!\n", progname,
+ximagestr);
return;
}
@@ -576,22 +580,22 @@
firstmesacontext = *mcon;
# ifdef MESA_2_0
- *mbuf = XMesaCreateWindowBuffer (mesavis, cwin);
+ *mbuf = OSMesaCreateWindowBuffer (mesavis, cwin);
if (gejcverbose)
- fprintf (stderr, "XMesaCreateWindowBuffer (%p, 0x%x): %p\n", mesavis, (int) cwin,
*mbuf);
+ fprintf (stderr, "OSMesaCreateWindowBuffer (%p, 0x%x): %p\n", mesavis, (int)
+cwin, *mbuf);
if (!*mbuf)
{ fprintf (stderr, "%s. fatal: could not create window buffer (Mesa)!\n", progname);
return;
}
# else
- if (*mcon && !XMesaBindWindow (*mcon, cwin))
- { fprintf (stderr, "%s. fatal: binding window failed (XMesaBindWindow)!\n",
progname);
+ if (*mcon && !OSMesaBindWindow (*mcon, cwin))
+ { fprintf (stderr, "%s. fatal: binding window failed (OSMesaBindWindow)!\n",
+progname);
return;
}
# endif
if (gejcverbose)
- fprintf (stderr, "createMesaBackBuffer (%s) finished. Window: 0x%x, XMesaContext:
%p\n",
+ fprintf (stderr, "createMesaBackBuffer (%s) finished. Window: 0x%x,
+OSMesaContext: %p\n",
ximagestr, (int) cwin, *mcon);
} /* createMesaBackBuffer */
@@ -635,10 +639,10 @@
*/
static XVisualInfo xvisinfo; /* must be static, because Mesa 2.x keeps a pointer
to it */
- XMesaContext pixcon = 0;
- XMesaContext ximcon = 0;
+ OSMesaContext pixcon = 0;
+ OSMesaContext ximcon = 0;
# ifdef MESA_2_0
- XMesaBuffer pixbuf, ximbuf;
+ OSMesaBuffer pixbuf, ximbuf;
# endif
getVisualInfo (cwin, &xvisinfo);
PGP signature
