Menu
▾
▴
[svn] commit: r896 - in /trunk/experimental/3rdparty: 10.3/main/finkinfo/graphics/ 10.4/main/finkinfo/graphics/ common/main/finkinfo/graphics/
|
From: <ra...@fi...> - 2007-07-18 04:03:39
|
Author: ranger Date: Wed Jul 18 06:03:31 2007 New Revision: 896 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=896&repname=user%3a+ranger Log: updated package, made to use /usr/X11 Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.info trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.patch trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.info trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.patch trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.info trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.patch Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.info URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.info&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.info (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.info Wed Jul 18 06:03:31 2007 @@ -1,0 +1,103 @@ +Package: mesa +Version: 6.5.3 +Revision: 11 +Description: 3-D graphics library +License: OSI-Approved +Maintainer: Murali Vadivelu <mur...@us...> + +Depends: %N-shlibs (= %v-%r) +BuildDepends: x11-dev +BuildDependsOnly: True +GCC: 3.3 + +Source: mirror:sourceforge:mesa3d/MesaLib-%v.tar.bz2 +Source-MD5: 46359457147c469745f24b5074a186f0 +Source2: mirror:sourceforge:mesa3d/MesaGLUT-%v.tar.bz2 +Source2-MD5: 360843e46b7ebb6909290b023f9b26fa +SourceDirectory: Mesa-%v +PatchScript: sed 's,@PREFIX@,/usr/X11,g' < %a/%n.patch | patch -p1 + +SetMAKEFLAGS: -j1 +NoSetMAKEFLAGS: true +CompileScript: << +make darwin +make realclean +make darwin-static +<< + +InstallScript: << +#!/bin/sh -ev + +mkdir -p %d/usr/X11/lib +mv lib/* %d/usr/X11/lib + +mkdir -p %d/usr/X11/include +mv include/* %d/usr/X11/include/ + +# compatibility with old mesa package +mkdir -p %i/lib/%n %i/include/%n +mv %d/usr/X11/lib/libOSMesa* %i/lib/%n/ +mv %d/usr/X11/lib/libglut* %i/lib/%n/ +pushd %i/lib/%n + ln -sf ../../../usr/X11/lib/* . + install_name_tool -id %p/lib/%n/libOSMesa.6.dylib libOSMesa.6.5.dylib + install_name_tool -id %p/lib/%n/libglut.3.dylib libglut.3.7.dylib +popd +pushd %i/include/%n + ln -sf ../../../usr/X11/include/* . +popd + +mkdir -p %i/share/%n +cp -r docs %i/share/%n/ +<< +DocFiles: docs/COPYING +SplitOff: << + Package: %N-shlibs + Depends: << + x11, + x11-shlibs + << + DocFiles: docs/COPYING + Files: /usr/X11/lib/lib*.*.dylib lib/mesa/lib*.*.dylib + Shlibs: << + /usr/X11/lib/libGLU.1.dylib 1.3.0 %n (>= 6.5.3-1) + /usr/X11/lib/libGL.1.dylib 1.5.0 %n (>= 6.5.3-1) + %p/lib/mesa/libglut.3.dylib 3.7.0 %n (>= 6.5.3-1) + %p/lib/mesa/libOSMesa.6.dylib 6.5.0 %n (>= 6.5.3-1) + << +<< + +Homepage: http://mesa3d.sourceforge.net/ +DescDetail: << +Mesa is a 3-D graphics library with an API which +is very similar to that of OpenGL.* To the extent +that Mesa utilizes the OpenGL command syntax or +state machine, it is being used with authorization +from Silicon Graphics, Inc.(SGI). However, the +author does not possess an OpenGL license from +SGI, and makes no claim that Mesa is in any way +a compatible replacement for OpenGL or associated +with SGI. Those who want a licensed implementation +of OpenGL should contact a licensed vendor. +<< +DescUsage: << +The OpenGL libraries and headers are installed to +/usr/X11, but the Mesa-specific libraries (libOSMesa +and libglut) are installed to %p/lib/mesa/ for +compatibility with older versions of this package. + +To link with Mesa, you will need to make sure your +-I and -L flags explicitly point to %p/lib/mesa +(or /usr/X11). + +The order in which the flags are passed to the +linker is also important, so that Mesa libraries is +the one that is seen first by the linker (before the +system OpenGL). + +Care needs to be taken to avoid system OpenGL, +if you want to use Mesa3d, while compiling, like +making sure that its first in the linker's search +path. Otherwise, you may get runtime errors. +<< + Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.patch URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.patch&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.patch (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mesa.patch Wed Jul 18 06:03:31 2007 @@ -1,0 +1,138 @@ + +--- Mesa-6.5.3/Makefile 2007-04-27 09:54:33.000000000 -0400 ++++ Mesa-6.5.3-patched/Makefile 2007-07-17 23:38:02.000000000 -0400 +@@ -23,7 +23,6 @@ + realclean: + touch $(TOP)/configs/current + $(MAKE) clean +- -rm -rf lib* + -rm -f $(TOP)/configs/current + -rm -f `find . -name \*.o` + -rm -f `find . -name \*.a` +--- Mesa-6.5.3/bin/mklib 2007-03-27 12:28:55.000000000 -0400 ++++ Mesa-6.5.3-patched/bin/mklib 2007-07-17 23:26:01.000000000 -0400 +@@ -570,10 +570,11 @@ + OPTS="${ARCHOPT} -bundle -multiply_defined suppress" + else + LIBSUFFIX="dylib" +- OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -headerpad_max_install_names -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name @PREFIX@/lib/lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" + fi +- LINKNAME="lib${LIBNAME}.${LIBSUFFIX}" +- LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}" ++ LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}" + + # examine first object to determine ABI + set ${OBJECTS} +@@ -599,7 +600,8 @@ + echo "mklib: Making Darwin shared library: " ${LIBNAME} + ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS} + ln -s ${LIBNAME} ${LINKNAME} +- FINAL_LIBS="${LIBNAME} ${LINKNAME}" ++ ln -s ${LINKNAME} ${LINKNAME2} ++ FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}" + fi + ;; + +--- Mesa-6.5.3/configs/darwin 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin 2007-07-17 23:10:12.000000000 -0400 +@@ -7,8 +7,8 @@ + # Compiler and flags + CC = cc + CXX = cc +-CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + # Library names (actual file names) + GL_LIB_NAME = libGL.dylib +@@ -17,12 +17,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx +--- Mesa-6.5.3/configs/darwin-static 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static 2007-07-17 23:10:12.000000000 -0400 +@@ -5,8 +5,8 @@ + CONFIG_NAME = darwin-static + + # Compiler and flags +-CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static + + # Library names (actual file names) +@@ -21,4 +21,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +--- Mesa-6.5.3/configs/darwin-static-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -6,9 +6,9 @@ + + # Compiler and flags + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + + # Library names (actual file names) +@@ -23,4 +23,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +--- Mesa-6.5.3/configs/darwin-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -8,9 +8,9 @@ + CC = cc + CXX = cc + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +@@ -21,12 +21,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx Added: trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.info URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.info&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.info (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.info Wed Jul 18 06:03:31 2007 @@ -1,0 +1,103 @@ +Package: mesa +Version: 6.5.3 +Revision: 1021 +Description: 3-D graphics library +License: OSI-Approved +Maintainer: Murali Vadivelu <mur...@us...> + +Depends: %N-shlibs (= %v-%r) +BuildDepends: x11-dev +BuildDependsOnly: True +GCC: 4.0 + +Source: mirror:sourceforge:mesa3d/MesaLib-%v.tar.bz2 +Source-MD5: 46359457147c469745f24b5074a186f0 +Source2: mirror:sourceforge:mesa3d/MesaGLUT-%v.tar.bz2 +Source2-MD5: 360843e46b7ebb6909290b023f9b26fa +SourceDirectory: Mesa-%v +PatchScript: sed 's,@PREFIX@,/usr/X11,g' < %a/%n.patch | patch -p1 + +SetMAKEFLAGS: -j1 +NoSetMAKEFLAGS: true +CompileScript: << +make darwin +make realclean +make darwin-static +<< + +InstallScript: << +#!/bin/sh -ev + +mkdir -p %d/usr/X11/lib +mv lib/* %d/usr/X11/lib + +mkdir -p %d/usr/X11/include +mv include/* %d/usr/X11/include/ + +# compatibility with old mesa package +mkdir -p %i/lib/%n %i/include/%n +mv %d/usr/X11/lib/libOSMesa* %i/lib/%n/ +mv %d/usr/X11/lib/libglut* %i/lib/%n/ +pushd %i/lib/%n + ln -sf ../../../usr/X11/lib/* . + install_name_tool -id %p/lib/%n/libOSMesa.6.dylib libOSMesa.6.5.dylib + install_name_tool -id %p/lib/%n/libglut.3.dylib libglut.3.7.dylib +popd +pushd %i/include/%n + ln -sf ../../../usr/X11/include/* . +popd + +mkdir -p %i/share/%n +cp -r docs %i/share/%n/ +<< +DocFiles: docs/COPYING +SplitOff: << + Package: %N-shlibs + Depends: << + x11, + x11-shlibs + << + DocFiles: docs/COPYING + Files: /usr/X11/lib/lib*.*.dylib lib/mesa/lib*.*.dylib + Shlibs: << + /usr/X11/lib/libGLU.1.dylib 1.3.0 %n (>= 6.5.3-1) + /usr/X11/lib/libGL.1.dylib 1.5.0 %n (>= 6.5.3-1) + %p/lib/mesa/libglut.3.dylib 3.7.0 %n (>= 6.5.3-1) + %p/lib/mesa/libOSMesa.6.dylib 6.5.0 %n (>= 6.5.3-1) + << +<< + +Homepage: http://mesa3d.sourceforge.net/ +DescDetail: << +Mesa is a 3-D graphics library with an API which +is very similar to that of OpenGL.* To the extent +that Mesa utilizes the OpenGL command syntax or +state machine, it is being used with authorization +from Silicon Graphics, Inc.(SGI). However, the +author does not possess an OpenGL license from +SGI, and makes no claim that Mesa is in any way +a compatible replacement for OpenGL or associated +with SGI. Those who want a licensed implementation +of OpenGL should contact a licensed vendor. +<< +DescUsage: << +The OpenGL libraries and headers are installed to +/usr/X11, but the Mesa-specific libraries (libOSMesa +and libglut) are installed to %p/lib/mesa/ for +compatibility with older versions of this package. + +To link with Mesa, you will need to make sure your +-I and -L flags explicitly point to %p/lib/mesa +(or /usr/X11). + +The order in which the flags are passed to the +linker is also important, so that Mesa libraries is +the one that is seen first by the linker (before the +system OpenGL). + +Care needs to be taken to avoid system OpenGL, +if you want to use Mesa3d, while compiling, like +making sure that its first in the linker's search +path. Otherwise, you may get runtime errors. +<< + Added: trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.patch URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.patch&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.patch (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mesa.patch Wed Jul 18 06:03:31 2007 @@ -1,0 +1,138 @@ + +--- Mesa-6.5.3/Makefile 2007-04-27 09:54:33.000000000 -0400 ++++ Mesa-6.5.3-patched/Makefile 2007-07-17 23:38:02.000000000 -0400 +@@ -23,7 +23,6 @@ + realclean: + touch $(TOP)/configs/current + $(MAKE) clean +- -rm -rf lib* + -rm -f $(TOP)/configs/current + -rm -f `find . -name \*.o` + -rm -f `find . -name \*.a` +--- Mesa-6.5.3/bin/mklib 2007-03-27 12:28:55.000000000 -0400 ++++ Mesa-6.5.3-patched/bin/mklib 2007-07-17 23:26:01.000000000 -0400 +@@ -570,10 +570,11 @@ + OPTS="${ARCHOPT} -bundle -multiply_defined suppress" + else + LIBSUFFIX="dylib" +- OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -headerpad_max_install_names -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name @PREFIX@/lib/lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" + fi +- LINKNAME="lib${LIBNAME}.${LIBSUFFIX}" +- LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}" ++ LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}" + + # examine first object to determine ABI + set ${OBJECTS} +@@ -599,7 +600,8 @@ + echo "mklib: Making Darwin shared library: " ${LIBNAME} + ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS} + ln -s ${LIBNAME} ${LINKNAME} +- FINAL_LIBS="${LIBNAME} ${LINKNAME}" ++ ln -s ${LINKNAME} ${LINKNAME2} ++ FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}" + fi + ;; + +--- Mesa-6.5.3/configs/darwin 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin 2007-07-17 23:10:12.000000000 -0400 +@@ -7,8 +7,8 @@ + # Compiler and flags + CC = cc + CXX = cc +-CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + # Library names (actual file names) + GL_LIB_NAME = libGL.dylib +@@ -17,12 +17,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx +--- Mesa-6.5.3/configs/darwin-static 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static 2007-07-17 23:10:12.000000000 -0400 +@@ -5,8 +5,8 @@ + CONFIG_NAME = darwin-static + + # Compiler and flags +-CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static + + # Library names (actual file names) +@@ -21,4 +21,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +--- Mesa-6.5.3/configs/darwin-static-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -6,9 +6,9 @@ + + # Compiler and flags + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + + # Library names (actual file names) +@@ -23,4 +23,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +--- Mesa-6.5.3/configs/darwin-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -8,9 +8,9 @@ + CC = cc + CXX = cc + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +@@ -21,12 +21,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx Added: trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.info URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.info&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.info (added) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.info Wed Jul 18 06:03:31 2007 @@ -1,0 +1,107 @@ +Package: mesa +Version: 6.5.3 +Revision: 1 + +Maintainer: Murali Vadivelu <mur...@us...> + +Depends: %N-shlibs (= %v-%r) +BuildDepends: x11-dev +BuildDependsOnly: True +GCC: 4.0 + +Description: 3-D graphics library +Homepage: http://mesa3d.sourceforge.net/ +License: OSI-Approved + +Source: mirror:sourceforge:mesa3d/MesaLib-%v.tar.bz2 +Source2: mirror:sourceforge:mesa3d/MesaGLUT-%v.tar.bz2 + +SourceDirectory: Mesa-%v +Source-MD5: 46359457147c469745f24b5074a186f0 +Source2-MD5: 360843e46b7ebb6909290b023f9b26fa + +PatchScript: sed 's,@PREFIX@,/usr/X11,g' < %a/%n.patch | patch -p1 + +NoSetMAKEFLAGS: true +SetMAKEFLAGS: -j1 + +CompileScript: << +make darwin +make realclean +make darwin-static +<< + +InstallScript: << +#!/bin/sh -ev + +mkdir -p %d/usr/X11/lib +mv lib/* %d/usr/X11/lib + +mkdir -p %d/usr/X11/include +mv include/* %d/usr/X11/include/ + +# compatibility with old mesa package +mkdir -p %i/lib/%n %i/include/%n +mv %d/usr/X11/lib/libOSMesa* %i/lib/%n/ +mv %d/usr/X11/lib/libglut* %i/lib/%n/ +pushd %i/lib/%n + ln -sf ../../../usr/X11/lib/* . + install_name_tool -id %p/lib/%n/libOSMesa.6.dylib libOSMesa.6.5.dylib + install_name_tool -id %p/lib/%n/libglut.3.dylib libglut.3.7.dylib +popd +pushd %i/include/%n + ln -sf ../../../usr/X11/include/* . +popd + +mkdir -p %i/share/%n +cp -r docs %i/share/%n/ +<< + +SplitOff: << + Package: %N-shlibs + Depends: x11, x11-shlibs + Files: /usr/X11/lib/lib*.*.dylib lib/mesa/lib*.*.dylib + Shlibs: << + /usr/X11/lib/libGLU.1.dylib 1.3.0 %n (>= 6.5.3-1) + /usr/X11/lib/libGL.1.dylib 1.5.0 %n (>= 6.5.3-1) + %p/lib/mesa/libglut.3.dylib 3.7.0 %n (>= 6.5.3-1) + %p/lib/mesa/libOSMesa.6.dylib 6.5.0 %n (>= 6.5.3-1) + << + DocFiles: docs/COPYING +<< + +DocFiles: docs/COPYING + +DescDetail: << +Mesa is a 3-D graphics library with an API which +is very similar to that of OpenGL.* To the extent +that Mesa utilizes the OpenGL command syntax or +state machine, it is being used with authorization +from Silicon Graphics, Inc.(SGI). However, the +author does not possess an OpenGL license from +SGI, and makes no claim that Mesa is in any way +a compatible replacement for OpenGL or associated +with SGI. Those who want a licensed implementation +of OpenGL should contact a licensed vendor. +<< + +DescUsage: << +The OpenGL libraries and headers are installed to +/usr/X11, but the Mesa-specific libraries (libOSMesa +and libglut) are installed to %p/lib/mesa/ for +compatibility with older versions of this package. + +To link with Mesa, you will need to make sure your +-I and -L flags explicitly point to %p/lib/mesa +(or /usr/X11). + +The order in which the flags are passed to the +linker is also important, so that Mesa libraries is +the one that is seen first by the linker (before the +system OpenGL). + +Care needs to be taken to avoid system OpenGL, +if you want to use Mesa3d, while compiling, like +making sure that its first in the linker's search +path. Otherwise, you may get runtime errors. +<< Added: trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.patch URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.patch&rev=896&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.patch (added) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/mesa.patch Wed Jul 18 06:03:31 2007 @@ -1,0 +1,143 @@ +diff -uNr Mesa-6.5.3/Makefile Mesa-6.5.3-patched/Makefile +--- Mesa-6.5.3/Makefile 2007-04-27 09:54:33.000000000 -0400 ++++ Mesa-6.5.3-patched/Makefile 2007-07-17 23:38:02.000000000 -0400 +@@ -23,7 +23,6 @@ + realclean: + touch $(TOP)/configs/current + $(MAKE) clean +- -rm -rf lib* + -rm -f $(TOP)/configs/current + -rm -f `find . -name \*.o` + -rm -f `find . -name \*.a` +diff -uNr Mesa-6.5.3/bin/mklib Mesa-6.5.3-patched/bin/mklib +--- Mesa-6.5.3/bin/mklib 2007-03-27 12:28:55.000000000 -0400 ++++ Mesa-6.5.3-patched/bin/mklib 2007-07-17 23:26:01.000000000 -0400 +@@ -570,10 +570,11 @@ + OPTS="${ARCHOPT} -bundle -multiply_defined suppress" + else + LIBSUFFIX="dylib" +- OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -headerpad_max_install_names -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name @PREFIX@/lib/lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" + fi +- LINKNAME="lib${LIBNAME}.${LIBSUFFIX}" +- LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}" ++ LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}" + + # examine first object to determine ABI + set ${OBJECTS} +@@ -599,7 +600,8 @@ + echo "mklib: Making Darwin shared library: " ${LIBNAME} + ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS} + ln -s ${LIBNAME} ${LINKNAME} +- FINAL_LIBS="${LIBNAME} ${LINKNAME}" ++ ln -s ${LINKNAME} ${LINKNAME2} ++ FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}" + fi + ;; + +diff -uNr Mesa-6.5.3/configs/darwin Mesa-6.5.3-patched/configs/darwin +--- Mesa-6.5.3/configs/darwin 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin 2007-07-17 23:10:12.000000000 -0400 +@@ -7,8 +7,8 @@ + # Compiler and flags + CC = cc + CXX = cc +-CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + # Library names (actual file names) + GL_LIB_NAME = libGL.dylib +@@ -17,12 +17,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx +diff -uNr Mesa-6.5.3/configs/darwin-static Mesa-6.5.3-patched/configs/darwin-static +--- Mesa-6.5.3/configs/darwin-static 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static 2007-07-17 23:10:12.000000000 -0400 +@@ -5,8 +5,8 @@ + CONFIG_NAME = darwin-static + + # Compiler and flags +-CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +-CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++CFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin ++CXXFLAGS = -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static + + # Library names (actual file names) +@@ -21,4 +21,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +diff -uNr Mesa-6.5.3/configs/darwin-static-x86ppc Mesa-6.5.3-patched/configs/darwin-static-x86ppc +--- Mesa-6.5.3/configs/darwin-static-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-static-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -6,9 +6,9 @@ + + # Compiler and flags + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + + # Library names (actual file names) +@@ -23,4 +23,4 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm ++APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm +diff -uNr Mesa-6.5.3/configs/darwin-x86ppc Mesa-6.5.3-patched/configs/darwin-x86ppc +--- Mesa-6.5.3/configs/darwin-x86ppc 2006-12-07 18:16:31.000000000 -0500 ++++ Mesa-6.5.3-patched/configs/darwin-x86ppc 2007-07-17 23:10:12.000000000 -0400 +@@ -8,9 +8,9 @@ + CC = cc + CXX = cc + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -I@PREFIX@/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -dynamic -Ddarwin + + MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +@@ -21,12 +21,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L@PREFIX@/lib -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L@PREFIX@/lib -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L@PREFIX@/lib -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = mesa glu glut/glx |