Restore still needed bsd fix and add a new one due to recent changes, submitted upstream

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 10ece59865b1..11f48521e3dd 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.55 2009/08/21 08:39:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.56 2009/09/20 14:47:33 aballier Exp $
+
+  20 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  freeglut-2.6.0_rc1.ebuild, +files/freeglut-2.6.0_rc1-bsd_joystick.patch:
+  Restore still needed bsd fix and add a new one due to recent changes,
+  submitted upstream
 
 *freeglut-2.6.0_rc1 (21 Aug 2009)
 
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index da105d4cac05..42b6f8c2477c 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX 2.4.0-cursor.patch 760 RMD160 4cbf8ffe84e1463e85569153704d4dfe07961e46 SHA1 feb229abe646828c9d629172e504c7c6905deb9f SHA256 5206d52da9159b0505feb271ce4c24abdab6b3fbc4944abd7b2a4c3f0610a9d8
 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-2.6.0_rc1-bsd_joystick.patch 564 RMD160 9aefe433021a8eebaf337a273fc2fb862baad27b SHA1 41eb8aceedb7903f8c9ed1dd93b4dc8c61df2dd5 SHA256 e033905a09bc169d76c2eb75b333e675d5a49f3787a549a0b48ae4cf10934c09
 AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
 DIST freeglut-2.6.0-rc1.tar.gz 715384 RMD160 8afcbd8be60e00943afcadc0eb1282c024d99289 SHA1 0bf40f0134695a95032de8cf8305c13dc8d654e5 SHA256 60cc641b124109e510c2397949713cb4a91521d719853b92c13c60f78fedc3ae
 EBUILD freeglut-2.4.0-r1.ebuild 1729 RMD160 2cadb60b2ab465f4e15a42a3427252eb758367e7 SHA1 074dd8dc10747701c1c4592a16d8576f84cc8e54 SHA256 e685e6c099d594d666fbc2483861d3d7906cf0e122ed8a121d7b343ea7096911
 EBUILD freeglut-2.4.0-r2.ebuild 1797 RMD160 64f16972663803f76e5781603d34ae2f7f903993 SHA1 194c88b9a0bd3e351f8a0f4fb12882f23f2d85ca SHA256 d7c1e3ec1fc455f103f12d224266044e2ecbaf7e3f30a6a91f18b5b9e75b6cf0
-EBUILD freeglut-2.6.0_rc1.ebuild 1123 RMD160 ddea1258a35692f70710fe2acfd2073a25eef4cd SHA1 1621610cbaea40410160e5183a7a2b11fc1df6b1 SHA256 54a217ade62bcb135305f3699dd93e4b4366250c080b031432b50aa2d7fc07d9
-MISC ChangeLog 6925 RMD160 262c1f207b361dbff5eacedd56f563dd2aad08b2 SHA1 2567cb7148a0fa1de5d65c254b5d57e1f9101f74 SHA256 09588c649731bfbb8424d53bf8c516254fe49e2a9969b6e5afe4ee00875ee38e
+EBUILD freeglut-2.6.0_rc1.ebuild 1225 RMD160 7d50a9a0992535eef23f074f54f65a316e1cab5e SHA1 cf2405a7609e9027dfb913d7c7470e0c00250095 SHA256 1b78c8b7275f0c40d1b89e33f1122abdd037471e9bd94e7c2b2654d5112a0a68
+MISC ChangeLog 7145 RMD160 8854dbfab3a46eaf20550cf918348e9562d88f76 SHA1 dcc4f4748bf65d31c7217249d08986a0c0e96e30 SHA256 60de8fdf29328371e3afdb7b86f2888bf9cc4c9a87b2d55f7289839ad46b8631
 MISC metadata.xml 425 RMD160 c156d2171334ccbfe68cf0e032e8c9085221f3d2 SHA1 130855d87692166c8e04a8ba6670ff6ee5ca89f3 SHA256 9bbc04ac34ad6352031f12d061385dc2fa77df2decef98c7f0c6c0c7af018d68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqOXa0ACgkQHB6c3gNBRYfbFgCfZbaCbiZrtmWMLa7snzpXQSmP
-MjUAoK8ICas5WsPPOeV/cif4bU0azLjg
-=IlTQ
+iEYEARECAAYFAkq2QJAACgkQvFcC4BYPU0q39gCeJQYxGnuGQ1WXpq5piJ3ue5C5
+W+kAoJwKykVmyVtXDut+dQCGnOgwE5A7
+=QVAm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch b/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
new file mode 100644
index 000000000000..cde788850aeb
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/tracker/?func=detail&aid=2862668&group_id=1032&atid=101032
+
+--- freeglut-2.6.0/src/freeglut_joystick.c.old	2009-09-20 16:28:07 +0200
++++ freeglut-2.6.0/src/freeglut_joystick.c	2009-09-20 16:28:18 +0200
+@@ -1325,7 +1325,7 @@
+         if( joy->error )
+             return;
+ 
+-        snprintf( joyfname, sizeof(buffer), "%s/.joy%drc", getenv( "HOME" ), joy->id );
++        snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
+ 
+         joyfile = fopen( joyfname, "r" );
+         joy->error =( joyfile == NULL );
diff --git a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild b/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
index a7d49ff5f8df..42ab66cb05f6 100644
--- a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
+++ b/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild,v 1.2 2009/08/21 08:41:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild,v 1.3 2009/09/20 14:47:32 aballier Exp $
 
 EAPI="2"
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P/_*/}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-bsd_joystick.patch"
+	epatch "${FILESDIR}/${PN}-2.4.0-bsd-usb-joystick.patch"
 	# Needed for sane .so versionning on bsd, please don't drop
 	elibtoolize
 }