diff --git a/Mesa.changes b/Mesa.changes index c656db0..5fa871f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 31 08:53:24 CET 2007 - sndirsch@suse.de + +- updated to Mesa 7.0.2 RC1 +- obsoletes disable-libGL-warning.diff, i915-g33.diff and + i915tex-g33.diff +- adjusted link-shared.diff and static.diff + ------------------------------------------------------------------- Mon Aug 13 03:06:02 CEST 2007 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 8880f49..9c346c3 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.0.1) +# spec file for package Mesa (Version 7.0.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,17 +12,17 @@ Name: Mesa BuildRequires: gcc-c++ libdrm-devel pkgconfig xorg-x11-devel -URL: http://www.mesa3d.org +Url: http://www.mesa3d.org License: X11/MIT Group: System/Libraries Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa -Autoreqprov: on -Version: 7.0.1 -Release: 6 +AutoReqProv: on +Version: 7.0.2 +Release: 1 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* -Source: MesaLib-%{version}.tar.bz2 -Source1: MesaDemos-%{version}.tar.bz2 +Source: MesaLib-%{version}-rc1.tar.bz2 +Source1: MesaDemos-%{version}-rc1.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 Source5: via.csh @@ -30,12 +30,9 @@ Source6: via.sh Patch0: disable-sis_dri.diff Patch1: dri_driver_dir.diff Patch2: i915-crossbar.diff -Patch3: disable-libGL-warning.diff Patch4: libIndirectGL.diff Patch5: static.diff Patch6: link-shared.diff -Patch7: i915-g33.diff -Patch8: i915tex-g33.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -105,7 +102,7 @@ Authors: Brian Paul %prep -%setup -n %{name}-%{version} -b1 -b4 +%setup -n %{name}-%{version}-rc1 -b1 -b4 rm docs/README.MINGW32.orig # make legal department happy (Bug #204110) test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 @@ -119,17 +116,10 @@ rm -rf src/glw/ %patch0 %patch1 %patch2 -%patch3 %patch5 %ifarch %ix86 x86_64 ppc %patch6 %endif -pushd src/mesa/drivers/dri/i915 -%patch7 -popd -pushd src/mesa/drivers/dri/i915tex -%patch8 -popd %build @@ -156,19 +146,19 @@ make realclean %ifarch %ix86 ppc x86_64 %ifarch %ix86 make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs} -make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs} +make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs} make realclean make linux-x86-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs} %endif %ifarch ppc make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs} -make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs} +make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs} make realclean make linux-ppc-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs} %endif %ifarch x86_64 make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs} -make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs} +make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs} make realclean make linux-x86-64-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs} %endif @@ -178,7 +168,7 @@ make linux-dri OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_D %else make linux OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif -make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri +make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri make realclean make linux-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs} %endif @@ -267,6 +257,8 @@ rm -rf $RPM_BUILD_ROOT /usr/include/GL/xmesa_xf86.h /usr/%{_lib}/libGLU.so /usr/%{_lib}/libOSMesa.so +/usr/%{_lib}/pkgconfig/gl.pc +/usr/%{_lib}/pkgconfig/glu.pc %{_mandir}/man3/* %files devel-static @@ -274,8 +266,12 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libGL.a /usr/%{_lib}/libGLU.a /usr/%{_lib}/libMesaGL.a - %changelog +* Wed Oct 31 2007 - sndirsch@suse.de +- updated to Mesa 7.0.2 RC1 +- obsoletes disable-libGL-warning.diff, i915-g33.diff and + i915tex-g33.diff +- adjusted link-shared.diff and static.diff * Mon Aug 13 2007 - sndirsch@suse.de - disable-libGL-warning.diff: * Just filters warnings about unsupported non-conformant visuals diff --git a/MesaDemos-7.0.1.tar.bz2 b/MesaDemos-7.0.1.tar.bz2 deleted file mode 100644 index fe99687..0000000 --- a/MesaDemos-7.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f074ec7b1d5f6ba5fe7ff35abea1518f4e237fd77e786417a56193fba0ce07a -size 1354835 diff --git a/MesaDemos-7.0.2-rc1.tar.bz2 b/MesaDemos-7.0.2-rc1.tar.bz2 new file mode 100644 index 0000000..e31429c --- /dev/null +++ b/MesaDemos-7.0.2-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5d70f80f54f3da01a2d7a00bbab98dbfa1bdecec68dddaf4770e753d90d93c3 +size 1339060 diff --git a/MesaLib-7.0.1.tar.bz2 b/MesaLib-7.0.1.tar.bz2 deleted file mode 100644 index d85a12c..0000000 --- a/MesaLib-7.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e29399443c4f25e13ae5833d948d04e7224580471936372f27e40284a2218cf1 -size 3437570 diff --git a/MesaLib-7.0.2-rc1.tar.bz2 b/MesaLib-7.0.2-rc1.tar.bz2 new file mode 100644 index 0000000..1fdcda6 --- /dev/null +++ b/MesaLib-7.0.2-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49ca12c8f7df18901e609af965302bff363f34d7495fea29a3fd246d82a119d2 +size 3385409 diff --git a/disable-libGL-warning.diff b/disable-libGL-warning.diff deleted file mode 100644 index f2140f1..0000000 --- a/disable-libGL-warning.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- src/glx/x11/glxext.c.orig 2007-08-12 10:45:15.688553249 +0200 -+++ src/glx/x11/glxext.c 2007-08-12 10:55:49.810243457 +0200 -@@ -672,8 +672,12 @@ filter_modes( __GLcontextModes ** server - if ( do_delete && (m->visualID != 0) ) { - do_delete = GL_FALSE; - -- fprintf(stderr, "libGL warning: 3D driver claims to not support " -- "visual 0x%02x\n", m->visualID); -+ /* filter warnings about unsupported non-conformant visuals -+ (Novell #247471 / X.Org #6689) */ -+ if (m->visualRating != GLX_NON_CONFORMANT_CONFIG) { -+ fprintf(stderr, "libGL warning: 3D driver claims to not " -+ "support visual 0x%02x\n", m->visualID); -+ } - } - - if ( do_delete ) { diff --git a/i915-g33.diff b/i915-g33.diff deleted file mode 100644 index d0ee762..0000000 --- a/i915-g33.diff +++ /dev/null @@ -1,91 +0,0 @@ -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/i915_texstate.c ./i915_texstate.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/i915_texstate.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./i915_texstate.c 2007-06-06 00:55:28.000000000 +0200 -@@ -491,12 +491,19 @@ - abort(); - } - -- -- if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G || -- i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM) -- i945LayoutTextureImages( i915, tObj ); -- else -- i915LayoutTextureImages( i915, tObj ); -+ switch (i915->intel.intelScreen->deviceID) { -+ case PCI_CHIP_I945_G: -+ case PCI_CHIP_I945_GM: -+ case PCI_CHIP_I945_GME: -+ case PCI_CHIP_G33_G: -+ case PCI_CHIP_Q33_G: -+ case PCI_CHIP_Q35_G: -+ i945LayoutTextureImages( i915, tObj ); -+ break; -+ default: -+ i915LayoutTextureImages( i915, tObj ); -+ break; -+ } - - t->Setup[I915_TEXREG_MS3] = - (((tObj->Image[0][t->intel.base.firstLevel]->Height - 1) << MS3_HEIGHT_SHIFT) | -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.c ./intel_context.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_context.c 2007-06-06 00:55:28.000000000 +0200 -@@ -123,6 +123,14 @@ - chipset = "Intel(R) 945G"; break; - case PCI_CHIP_I945_GM: - chipset = "Intel(R) 945GM"; break; -+ case PCI_CHIP_I945_GME: -+ chipset = "Intel(R) 945GME"; break; -+ case PCI_CHIP_G33_G: -+ chipset = "Intel(R) G33"; break; -+ case PCI_CHIP_Q35_G: -+ chipset = "Intel(R) Q35"; break; -+ case PCI_CHIP_Q33_G: -+ chipset = "Intel(R) Q33"; break; - default: - chipset = "Unknown Intel Chipset"; break; - } -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.h ./intel_context.h ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.h 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_context.h 2007-06-06 00:55:28.000000000 +0200 -@@ -454,6 +454,10 @@ - #define PCI_CHIP_I915_GM 0x2592 - #define PCI_CHIP_I945_G 0x2772 - #define PCI_CHIP_I945_GM 0x27A2 -+#define PCI_CHIP_I945_GME 0x27AE -+#define PCI_CHIP_G33_G 0x29C2 -+#define PCI_CHIP_Q35_G 0x29B2 -+#define PCI_CHIP_Q33_G 0x29D2 - - - /* ================================================================ -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_screen.c ./intel_screen.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_screen.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_screen.c 2007-06-06 00:55:28.000000000 +0200 -@@ -514,6 +514,10 @@ - case PCI_CHIP_I915_GM: - case PCI_CHIP_I945_G: - case PCI_CHIP_I945_GM: -+ case PCI_CHIP_I945_GME: -+ case PCI_CHIP_G33_G: -+ case PCI_CHIP_Q35_G: -+ case PCI_CHIP_Q33_G: - return i915CreateContext( mesaVis, driContextPriv, - sharedContextPrivate ); - -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_tex.c ./intel_tex.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_tex.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_tex.c 2007-06-06 00:55:28.000000000 +0200 -@@ -677,7 +677,11 @@ - /* Time for another vtbl entry: - */ - else if (intel->intelScreen->deviceID == PCI_CHIP_I945_G || -- intel->intelScreen->deviceID == PCI_CHIP_I945_GM) { -+ intel->intelScreen->deviceID == PCI_CHIP_I945_GM || -+ intel->intelScreen->deviceID == PCI_CHIP_I945_GME || -+ intel->intelScreen->deviceID == PCI_CHIP_G33_G || -+ intel->intelScreen->deviceID == PCI_CHIP_Q33_G || -+ intel->intelScreen->deviceID == PCI_CHIP_Q35_G) { - GLuint row_len = image->Width * image->TexFormat->TexelBytes; - GLubyte *dst = (GLubyte *)(t->BufAddr + offset); - GLubyte *src = (GLubyte *)image->Data; diff --git a/i915tex-g33.diff b/i915tex-g33.diff deleted file mode 100644 index 88787e6..0000000 --- a/i915tex-g33.diff +++ /dev/null @@ -1,64 +0,0 @@ -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.c ./intel_context.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_context.c 2007-06-06 00:55:28.000000000 +0200 -@@ -130,6 +130,18 @@ - case PCI_CHIP_I945_GM: - chipset = "Intel(R) 945GM"; - break; -+ case PCI_CHIP_I945_GME: -+ chipset = "Intel(R) 945GME"; -+ break; -+ case PCI_CHIP_G33_G: -+ chipset = "Intel(R) G33"; -+ break; -+ case PCI_CHIP_Q35_G: -+ chipset = "Intel(R) Q35"; -+ break; -+ case PCI_CHIP_Q33_G: -+ chipset = "Intel(R) Q33"; -+ break; - default: - chipset = "Unknown Intel Chipset"; - break; -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.h ./intel_context.h ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.h 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_context.h 2007-06-06 00:55:28.000000000 +0200 -@@ -381,6 +385,10 @@ - #define PCI_CHIP_I915_GM 0x2592 - #define PCI_CHIP_I945_G 0x2772 - #define PCI_CHIP_I945_GM 0x27A2 -+#define PCI_CHIP_I945_GME 0x27AE -+#define PCI_CHIP_G33_G 0x29C2 -+#define PCI_CHIP_Q35_G 0x29B2 -+#define PCI_CHIP_Q33_G 0x29D2 - - - /* ================================================================ -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c ./intel_mipmap_tree.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_mipmap_tree.c 2007-06-06 00:55:28.000000000 +0200 -@@ -79,6 +79,10 @@ - switch (intel->intelScreen->deviceID) { - case PCI_CHIP_I945_G: - case PCI_CHIP_I945_GM: -+ case PCI_CHIP_I945_GME: -+ case PCI_CHIP_G33_G: -+ case PCI_CHIP_Q33_G: -+ case PCI_CHIP_Q35_G: - ok = i945_miptree_layout(mt); - break; - case PCI_CHIP_I915_G: -diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_screen.c ./intel_screen.c ---- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_screen.c 2007-06-22 00:14:38.000000000 +0200 -+++ ./intel_screen.c 2007-06-06 00:55:28.000000000 +0200 -@@ -752,6 +752,10 @@ - case PCI_CHIP_I915_GM: - case PCI_CHIP_I945_G: - case PCI_CHIP_I945_GM: -+ case PCI_CHIP_I945_GME: -+ case PCI_CHIP_G33_G: -+ case PCI_CHIP_Q35_G: -+ case PCI_CHIP_Q33_G: - return i915CreateContext(mesaVis, driContextPriv, sharedContextPrivate); - - default: diff --git a/link-shared.diff b/link-shared.diff index c487cba..e4b57c1 100644 --- a/link-shared.diff +++ b/link-shared.diff @@ -17,7 +17,7 @@ @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ cd drivers/dri ; $(MAKE) install ; \ fi -+ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(INSTALL_DIR)/$(LIB_DIR) ++ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(DESTDIR)/$(INSTALL_DIR)/$(LIB_DIR) ## NOT INSTALLED YET: ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES @@ -34,7 +34,7 @@ @@ -77,7 +77,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template - $(TOP)/bin/mklib -noprefix -o $@ \ + $(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \ - $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) + $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -Wl,--undefined -Wl,--allow-shlib-undefined diff --git a/static.diff b/static.diff index 3a65fe7..61cc595 100644 --- a/static.diff +++ b/static.diff @@ -1,7 +1,6 @@ -Only in configs.orig/: linux-dri.orig -diff -u -r configs.orig/linux-ppc-static configs/linux-ppc-static ---- configs.orig/linux-ppc-static 2006-07-31 11:07:44.000000000 +0200 -+++ configs/linux-ppc-static 2006-07-31 11:07:56.000000000 +0200 +diff -u configs.orig/linux-ppc-static configs/linux-ppc-static +--- configs.orig/linux-ppc-static 2007-10-31 08:30:54.131367500 +0100 ++++ configs/linux-ppc-static 2007-10-31 08:31:08.204247000 +0100 @@ -8,7 +8,3 @@ # Library names (actual file names) @@ -10,48 +9,9 @@ diff -u -r configs.orig/linux-ppc-static configs/linux-ppc-static -GLUT_LIB_NAME = libglut.a -GLW_LIB_NAME = libGLw.a -OSMESA_LIB_NAME = libOSMesa.a -diff -u -r configs.orig/linux-x86-64-static configs/linux-x86-64-static ---- configs.orig/linux-x86-64-static 2006-07-31 11:07:44.000000000 +0200 -+++ configs/linux-x86-64-static 2006-07-31 11:11:08.000000000 +0200 -@@ -8,16 +8,6 @@ - - # Library names (actual file names) - GL_LIB_NAME = libGL.a --GLU_LIB_NAME = libGLU.a --GLUT_LIB_NAME = libglut.a --GLW_LIB_NAME = libGLw.a --OSMESA_LIB_NAME = libOSMesa.a - - # Library/program dependencies (static libs don't have dependencies) - GL_LIB_DEPS = --OSMESA_LIB_DEPS = --GLU_LIB_DEPS = --GLUT_LIB_DEPS = --GLW_LIB_DEPS = --APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ -- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm -diff -u -r configs.orig/linux-x86-static configs/linux-x86-static ---- configs.orig/linux-x86-static 2006-07-31 11:07:44.000000000 +0200 -+++ configs/linux-x86-static 2006-07-31 11:11:44.000000000 +0200 -@@ -8,16 +8,6 @@ - - # Library names (actual file names) - GL_LIB_NAME = libGL.a --GLU_LIB_NAME = libGLU.a --GLUT_LIB_NAME = libglut.a --GLW_LIB_NAME = libGLw.a --OSMESA_LIB_NAME = libOSMesa.a - - # Library/program dependencies (static libs don't have dependencies) - GL_LIB_DEPS = --OSMESA_LIB_DEPS = --GLU_LIB_DEPS = --GLUT_LIB_DEPS = --GLW_LIB_DEPS = --APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ -- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm ---- configs/linux-static.orig 2006-12-02 21:29:56.556452204 +0100 -+++ configs/linux-static 2006-12-02 21:30:18.559452348 +0100 +diff -u configs.orig/linux-static configs/linux-static +--- configs.orig/linux-static 2007-10-31 08:30:54.275376500 +0100 ++++ configs/linux-static 2007-10-31 08:31:08.376257750 +0100 @@ -8,17 +8,9 @@ # Library names (actual file names) @@ -69,4 +29,42 @@ diff -u -r configs.orig/linux-x86-static configs/linux-x86-static -GLW_LIB_DEPS = # Need to specify all libraries we may need - APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \ + APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm +diff -u configs.orig/linux-x86-64-static configs/linux-x86-64-static +--- configs.orig/linux-x86-64-static 2007-10-31 08:30:54.387383500 +0100 ++++ configs/linux-x86-64-static 2007-10-31 08:32:57.027048000 +0100 +@@ -8,15 +8,6 @@ + + # Library names (actual file names) + GL_LIB_NAME = libGL.a +-GLU_LIB_NAME = libGLU.a +-GLUT_LIB_NAME = libglut.a +-GLW_LIB_NAME = libGLw.a +-OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies (static libs don't have dependencies) + GL_LIB_DEPS = +-OSMESA_LIB_DEPS = +-GLU_LIB_DEPS = +-GLUT_LIB_DEPS = +-GLW_LIB_DEPS = +-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm +diff -u configs.orig/linux-x86-static configs/linux-x86-static +--- configs.orig/linux-x86-static 2007-10-31 08:30:54.463388250 +0100 ++++ configs/linux-x86-static 2007-10-31 08:33:31.349193000 +0100 +@@ -8,15 +8,6 @@ + + # Library names (actual file names) + GL_LIB_NAME = libGL.a +-GLU_LIB_NAME = libGLU.a +-GLUT_LIB_NAME = libglut.a +-GLW_LIB_NAME = libGLw.a +-OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies (static libs don't have dependencies) + GL_LIB_DEPS = +-OSMESA_LIB_DEPS = +-GLU_LIB_DEPS = +-GLUT_LIB_DEPS = +-GLW_LIB_DEPS = +-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm