Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22759/main/finkinfo/graphics

Modified Files:
        mesa.info mesa.patch 
Log Message:
Updated version from tracker 1611970

Index: mesa.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mesa.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mesa.info   22 Sep 2006 00:36:16 -0000      1.2
+++ mesa.info   9 Jan 2007 17:13:32 -0000       1.3
@@ -1,45 +1,60 @@
 Package: mesa
-Version: 6.4.2
-Revision: 10
+Version: 6.5.2
+Revision: 1
+
 Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
+
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: x11-dev
 BuildDependsOnly: True
+
 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: 7674d2c603b5834259e4e5a820cefd5b
-Source2-MD5: b157ba8ad1ea63260cf5339132e7aac6
-GCC: 4.0
+Source-MD5: e4d894181f1859651658b3704633e10d
+Source2-MD5: e84edbb11c69c8e408dfadd2ed08e95b
+
 PatchScript: sed 's,@PREFIX@,%p,g' < %a/%n.patch | patch -p1
+
 CompileScript: <<
 make darwin
+make realclean
+make darwin-static
 <<
+
 InstallScript: <<
 mkdir -p %i/lib/%n
-mv %b/lib/* %i/lib/%n/
+mv lib/* %i/lib/%n/
+
 mkdir -p %i/include/%n
-mv %b/include/* %i/include/%n/
+mv include/* %i/include/%n/
+
 mkdir -p %i/share/%n
-cp -r %b/docs %i/share/%n/
+cp -r docs %i/share/%n/
 ln -sf %p/lib/%n %i/share/%n/lib
 ln -sf %p/include/%n %i/share/%n/include
 <<
+
 SplitOff: <<
-Package: %N-shlibs
-Depends: x11, x11-shlibs
-Files: lib/mesa/libGLU.dylib lib/mesa/libGL.dylib lib/mesa/libglut.dylib 
lib/mesa/libOSMesa.dylib 
-Shlibs: <<
-%p/lib/mesa/libGLU.dylib 1.3.0 %n (>= 6.4.1-1)
-%p/lib/mesa/libGL.dylib 1.5.0 %n (>= 6.4.1-1)
-%p/lib/mesa/libglut.dylib 3.7.0 %n (>= 6.4.1-1)
-%p/lib/mesa/libOSMesa.dylib 6.4.0 %n (>= 6.4.1-1)
+    Package: %N-shlibs
+    Depends: x11, x11-shlibs
+    Files: lib/mesa/lib*.*.dylib
+    Shlibs: <<
+    %p/lib/mesa/libGLU.1.dylib 1.3.0 %n (>= 6.5.2-1)
+    %p/lib/mesa/libGL.1.dylib 1.5.0 %n (>= 6.5.2-1)
+    %p/lib/mesa/libglut.3.dylib 3.7.0 %n (>= 6.5.2-1)
+    %p/lib/mesa/libOSMesa.6.dylib 6.5.0 %n (>= 6.5.2-1)
 <<
-DocFiles: docs/COPYING
+    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 
@@ -52,6 +67,7 @@
 with SGI. Those who want a licensed implementation 
 of OpenGL should contact a licensed vendor. 
 <<
+
 DescUsage: <<
 The libraries and headers are installed in 
 %p/lib/mesa and %p/include/mesa, respectively. This 
@@ -70,6 +86,7 @@
 making sure that its first in the linker's search
 path. Otherwise, you get runtime errors.
 <<
+
 DescPackaging: <<
 A link is created from %p/include/mesa and 
 %p/lib/mesa to %p/share/mesa/include and 
@@ -78,4 +95,5 @@
 for a common GL directory containing an include 
 directory (with gl.h, etc.) and lib directory 
 (with libGL.*, etc.).
-<<
\ No newline at end of file
+<<
+                

Index: mesa.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mesa.patch  12 Feb 2006 18:15:09 -0000      1.1
+++ mesa.patch  9 Jan 2007 17:13:32 -0000       1.2
@@ -1,12 +1,54 @@
-diff -urN Mesa-6.4.1.orig/bin/mklib Mesa-6.4.1/bin/mklib
---- Mesa-6.4.1.orig/bin/mklib  2005-12-17 15:19:11.000000000 +0000
-+++ Mesa-6.4.1/bin/mklib       2005-12-17 15:17:48.000000000 +0000
-@@ -505,7 +505,7 @@
+Binary files Mesa-6.5.2.orig/.DS_Store and Mesa-6.5.2/.DS_Store differ
+diff -urN Mesa-6.5.2.orig/Makefile Mesa-6.5.2/Makefile
+--- Mesa-6.5.2.orig/Makefile   2006-12-02 18:20:04.000000000 +0000
++++ Mesa-6.5.2/Makefile        2007-01-04 16:43:24.000000000 +0000
+@@ -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`
+Binary files Mesa-6.5.2.orig/bin/.DS_Store and Mesa-6.5.2/bin/.DS_Store differ
+diff -urN Mesa-6.5.2.orig/bin/mklib Mesa-6.5.2/bin/mklib
+--- Mesa-6.5.2.orig/bin/mklib  2006-11-15 14:55:46.000000000 +0000
++++ Mesa-6.5.2/bin/mklib       2007-01-04 16:44:13.000000000 +0000
+@@ -560,6 +560,7 @@
+             echo "mklib: Making Darwin static library: " ${LIBNAME}
+             LINK="ar"
+             OPTS="-ruvs"
++          echo "${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}"
+             ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
+             FINAL_LIBS=${LIBNAME}
          else
-             LIBNAME="lib${LIBNAME}.dylib"
+@@ -569,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/mesa/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}
+@@ -596,9 +598,11 @@
+           fi
+ 
              echo "mklib: Making Darwin shared library: " ${LIBNAME}
--            FLAGS="-dynamiclib -multiply_defined suppress -current_version 
${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0"
-+            FLAGS="-dynamiclib -multiply_defined suppress  -install_name 
@PREFIX@/lib/mesa/${LIBNAME} -current_version ${MAJOR}.${MINOR}.0 
-compatibility_version ${MAJOR}.${MINOR}.0"
-           if [ $CPLUSPLUS = 1 ] ; then
-               LINK="g++"
-           else
++          echo "${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}"
+             ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+             ln -s ${LIBNAME} ${LINKNAME}
+-            FINAL_LIBS="${LIBNAME} ${LINKNAME}"
++          ln -s ${LIBNAME} ${LINKNAME2}
++            FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
+         fi
+         ;;
+ 
+
+                


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to