diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-18 18:28:22 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-18 18:28:22 +0000 |
| commit | aca644c866aedd023f2ba810ddb826556c18d7ae (patch) | |
| tree | ed2dbfb082f7ee744b79a3e1ebf367d2c15c68f4 /media-libs/freeglut | |
| parent | Version bump to latest bugfix release. (diff) | |
| download | gentoo-2-aca644c866aedd023f2ba810ddb826556c18d7ae.tar.gz gentoo-2-aca644c866aedd023f2ba810ddb826556c18d7ae.tar.bz2 gentoo-2-aca644c866aedd023f2ba810ddb826556c18d7ae.zip | |
Drop unused patches.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/freeglut')
| -rw-r--r-- | media-libs/freeglut/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/freeglut/files/2.4.0-cursor.patch | 19 | ||||
| -rw-r--r-- | media-libs/freeglut/files/freeglut-2.4.0-macos.patch | 11 | ||||
| -rw-r--r-- | media-libs/freeglut/files/freeglut-gcc42.patch | 12 |
4 files changed, 6 insertions, 43 deletions
diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog index 119c6bd76ebf..8d18b1bd2cf2 100644 --- a/media-libs/freeglut/ChangeLog +++ b/media-libs/freeglut/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freeglut # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.76 2011/01/26 18:09:59 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.77 2011/03/18 18:28:21 scarabeus Exp $ + + 18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/2.4.0-cursor.patch, -files/freeglut-2.4.0-macos.patch, + -files/freeglut-gcc42.patch: + Drop unused patches. 26 Jan 2011; Fabian Groffen <grobian@gentoo.org> -freeglut-2.4.0-r1.ebuild, freeglut-2.6.0.ebuild: diff --git a/media-libs/freeglut/files/2.4.0-cursor.patch b/media-libs/freeglut/files/2.4.0-cursor.patch deleted file mode 100644 index fab7f9eb0d81..000000000000 --- a/media-libs/freeglut/files/2.4.0-cursor.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/freeglut_cursor.c.old 2006-10-11 20:49:13.000000000 +0200 -+++ 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 diff --git a/media-libs/freeglut/files/freeglut-2.4.0-macos.patch b/media-libs/freeglut/files/freeglut-2.4.0-macos.patch deleted file mode 100644 index 8a05b94eb70a..000000000000 --- a/media-libs/freeglut/files/freeglut-2.4.0-macos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freeglut-2.4.0/src/freeglut_joystick.c.orig 2005-07-02 10:41:52.000000000 +0200 -+++ freeglut-2.4.0/src/freeglut_joystick.c 2005-07-02 10:44:17.000000000 +0200 -@@ -1389,7 +1389,7 @@ - # endif - #endif - --#if defined( __linux__ ) -+#if defined( __linux__ ) || defined(__APPLE_CC__) - /* Default for older Linux systems. */ - joy->num_axes = 2; - joy->num_buttons = 32; diff --git a/media-libs/freeglut/files/freeglut-gcc42.patch b/media-libs/freeglut/files/freeglut-gcc42.patch deleted file mode 100644 index 27404eaea847..000000000000 --- a/media-libs/freeglut/files/freeglut-gcc42.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/freeglut_joystick.c.old 2006-07-25 21:15:14.000000000 -0600 -+++ src/freeglut_joystick.c 2006-07-25 21:21:54.000000000 -0600 -@@ -1684,9 +1684,6 @@ - - fgInitialiseJoysticks (); - -- if ( !fgJoystick ) -- return 0; -- - if ( !fgState.JoysticksInitialised ) - return 0; - |