Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv26064/10.4/stable/main/finkinfo/x11
Modified Files:
freeglut.info
Added Files:
freeglut.patch
Log Message:
antiprism -> stable based on feedback; propagate a dep update for it too
--- NEW FILE: freeglut.patch ---
--- freeglut-2.4.0/src/freeglut_cursor.c.old 2006-10-11 20:49:13.000000000
+0200
+++ freeglut-2.4.0/src/freeglut_cursor.c 2006-10-11 20:51:43.000000000
+0200
@@ -147,11 +147,13 @@
}
}
- if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) {
+ if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
+ XUndefineCursor( fgDisplay.Display, window->Window.Handle );
+ } else if ( cursor != None ) {
+ XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
+ } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
fgError( "Failed to create cursor" );
}
- XDefineCursor( fgDisplay.Display,
- window->Window.Handle, cursor );
}
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
Index: freeglut.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/freeglut.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freeglut.info 13 Nov 2006 18:10:16 -0000 1.1
+++ freeglut.info 7 Sep 2007 21:37:40 -0000 1.2
@@ -1,15 +1,16 @@
Package: freeglut
Version: 2.4.0
-Revision: 1
+Revision: 3
Maintainer: Jack Howarth <[EMAIL PROTECTED]>
Source: mirror:sourceforge:freeglut/%N-%v.tar.gz
Source-MD5: 6d16873bd876fbf4980a927cfbc496a1
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9), x11-dev
-Conflicts: glut
-Replaces: glut
-ConfigureParams: --disable-replace-glut --disable-warnings
+Conflicts: glut, openglut
+Replaces: glut, openglut
+ConfigureParams: --disable-replace-glut --disable-warnings
--disable-dependency-tracking
SetCFLAGS: -O3
+Patch: %n.patch
PatchScript: <<
perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
<<
@@ -19,6 +20,7 @@
make install DESTDIR=%d
ln -s libfreeglut.3.dylib %i/lib/libglut.dylib
ln -s libfreeglut.a %i/lib/libglut.a
+ln -s libfreeglut.la %i/lib/libglut.la
ln -s freeglut.h %i/include/GL/glut.h
ln -s freeglut_ext.h %i/include/GL/glut_ext.h
ln -s freeglut_std.h %i/include/GL/glut_std.h
@@ -44,8 +46,9 @@
DescPackaging: <<
This package is NOT binary compatible with glut/glut-shlibs and can not
replace for them. Packages that wish to use freeglut as a replacement
-for glut need to have "BuildDepends: glut|freeglut" and "Depends:
-glut-shlibs|freeglut-shlibs" in their info file.
+for glut cannot have "BuildDepends: glut|freeglut" and "Depends:
+glut-shlibs|freeglut-shlibs" in their info file, but need to pick one
+self-consistently.
This package builds the freeglut libraries named as freeglut rather than
glut to allow the co-existance with glut since the shared library versioning
@@ -53,8 +56,7 @@
headers to allow freeglut to used as a drop in replace for glut without
requiring changes in the source code of programs which require glut.
-Note that I have used the LDFLAGS to prevent freeglut from linking its
-demo programs against the installed libglut.
+Patch fixes crash in flightgear (taken from RH's Fedora 7 package).
<<
License: OSI-Approved
Homepage: http://freeglut.sourceforge.net/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
