summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-18 18:28:22 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-18 18:28:22 +0000
commit5961ce87a4a7a27566ac826be3dfbd7cddde775a (patch)
treecc9d963aa16a5a67bd4dcd6ec3473ea689d5d8bb /media-libs
parentVersion bump to latest bugfix release. (diff)
downloadhistorical-5961ce87a4a7a27566ac826be3dfbd7cddde775a.tar.gz
historical-5961ce87a4a7a27566ac826be3dfbd7cddde775a.tar.bz2
historical-5961ce87a4a7a27566ac826be3dfbd7cddde775a.zip
Drop unused patches.
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/freeglut/ChangeLog7
-rw-r--r--media-libs/freeglut/Manifest5
-rw-r--r--media-libs/freeglut/files/2.4.0-cursor.patch19
-rw-r--r--media-libs/freeglut/files/freeglut-2.4.0-macos.patch11
-rw-r--r--media-libs/freeglut/files/freeglut-gcc42.patch12
5 files changed, 7 insertions, 47 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/Manifest b/media-libs/freeglut/Manifest
index f876a2506a6f..c2e7b545cdfe 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,10 +1,7 @@
-AUX 2.4.0-cursor.patch 760 RMD160 4cbf8ffe84e1463e85569153704d4dfe07961e46 SHA1 feb229abe646828c9d629172e504c7c6905deb9f SHA256 5206d52da9159b0505feb271ce4c24abdab6b3fbc4944abd7b2a4c3f0610a9d8
AUX 2.6.0-GFX_radeon.patch 786 RMD160 7b7ea37704106af989f36e72b94e8b8e69c6857f SHA1 2e392c7d0b60016ec89e6a5edf504f5722351b95 SHA256 ed6642c409bc32b4ee98cd371ea3d403ce293eabf2d06aad9d9913166e62ed89
AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 RMD160 2453315cc3d2a882bd68d96a413d555e75a0b661 SHA1 095343909d035a9e0933a3af431fc708170db23c SHA256 52ada965b1dc6abbb9ce0bbc00bf91452c6717b74016d21e0a10df24a0ffe83c
-AUX freeglut-2.4.0-macos.patch 384 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795edfd SHA1 4863883e3742162f1ace5767a6c9906e4f7d2f30 SHA256 6de982efac5a62b317e4cc73570da45c4ded0f42295b5dfeae090948d37eabf6
-AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
DIST freeglut-2.6.0-mpx-r6.patch 13696 RMD160 c6a4fa56c512b3e3d4179e00a531e7e90582ec28 SHA1 a2f09fa5fdd0877fb1bbdcbc80f0b7d8ad61df17 SHA256 e2936ce3cb4af219871806004d30f46d7fa9da77f66208203d566bae9e48bb5c
DIST freeglut-2.6.0.tar.gz 1124186 RMD160 43bdb1a6d99445ee09370930ec6bc0f8310e7fcf SHA1 68306c4486c13d005a4e4d54035e0c0b1bdc220b SHA256 615b41edc96c405ee6bb7e9a2942642140c3e57c1dd8c68e968a17ddfb59e98f
EBUILD freeglut-2.6.0.ebuild 1522 RMD160 4b91c520c476e9aa7feeee0dbd5ec1fda987b165 SHA1 c4d8af9a8d97af19a1e5c0ff70abf01722c683cf SHA256 6a40b31606632019b9a9ff38bbb14edda45404035fc329ce74dc7e3b13722856
-MISC ChangeLog 9626 RMD160 8cb127c4213ae23f15281ebe79c2405e454f6cb3 SHA1 d256afa27cf1f6a6d0cc3b6aab07a2b01a492451 SHA256 ebd6615e9c3bc4f0d37a0cb323b88c7a17d3e2f085aff60a1677f4772424f7a1
+MISC ChangeLog 9802 RMD160 c98da97d8e16bf53d935bf8a45457864482e5c59 SHA1 7dc964b629c23b19a756ee47c94c3005a672d2b9 SHA256 c90767b80124945b93b0b5d05793b2349a739ef8d131d11325c83c7afb48f7df
MISC metadata.xml 547 RMD160 aca9d5b8a53da9ad98263a30fafdadb0f97cf368 SHA1 2b890cdc7b0ad39313851f4794e7d04cf360fcd9 SHA256 f20911324f4b6374ced9986fae7cfa7f2bf3041817042a8db923f7e4bcf65b96
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;
-