Disable bsd usb joystick support because it does not link properly, run elibtoolize to get a sane .so versionning on bsd and keyword it ~x86-fbsd

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 45 insertions, 7 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 06312c00009b..ebf57153596d 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.52 2008/01/31 03:39:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.53 2008/08/08 16:22:08 aballier Exp $
+
+  08 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/freeglut-2.4.0-bsd-usb-joystick.patch, freeglut-2.4.0-r1.ebuild:
+  Disable bsd usb joystick support because it does not link properly, run
+  elibtoolize to get a sane .so versionning on bsd and keyword it ~x86-fbsd
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   -freeglut-2.2.0.ebuild, -freeglut-2.4.0.ebuild:
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 0a5a01ec9382..045bdfbf17b4 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
-EBUILD freeglut-2.4.0-r1.ebuild 1517 RMD160 dbe8bdf77a7a06695c599258c532f4b9c91276dd SHA1 143994b0c3948e6ea7d741acf43fbacb082f5e43 SHA256 b144dd8209eda74f0563fbbf0c5c0c58294546c1fd6ea2c36c5d3dbbee08efcc
-MISC ChangeLog 6353 RMD160 a954d7e51342118c37346fb317c8bab4a00f36ef SHA1 6f904eea0067a8f2264c7e65b63e1cf6116032cf SHA256 3355ffb3750ef12b0f4235015084019525178620dfa32d9c789c855b7c0c4447
+EBUILD freeglut-2.4.0-r1.ebuild 1728 RMD160 1c14a047125423b4f1d4abdac2bdef3023a8f5f8 SHA1 a3d4dad4a10555d65c094559a980f3cc8df4ff29 SHA256 8bbe22464600bb99a42ad56aa62d875c6bf12d45b9e8757016d4ef7470a29c24
+MISC ChangeLog 6629 RMD160 ed2f6eb90e87876aad3551a94650dfc01cdd69d8 SHA1 927fbf56160188d104b795481709463478f87b29 SHA256 70be2bcc399ca17151f87015c5371389f216ab3fcb6498a1c3085fbbef560bb9
 MISC metadata.xml 425 RMD160 c156d2171334ccbfe68cf0e032e8c9085221f3d2 SHA1 130855d87692166c8e04a8ba6670ff6ee5ca89f3 SHA256 9bbc04ac34ad6352031f12d061385dc2fa77df2decef98c7f0c6c0c7af018d68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiccrUACgkQvFcC4BYPU0rgzACgnegC2Ub3g4+ByvQig73VEDnz
+px4An2Sj2jPMXXBcDNH9qju//9tvJSoO
+=tUkR
+-----END PGP SIGNATURE-----
diff --git a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch b/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
new file mode 100644
index 000000000000..08aa1326ebc5
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
@@ -0,0 +1,16 @@
+We disable BSD usb joystick support until upstream has a better support for it
+so that it can at least build. For now it builds but does not link to libusbhid
+so that libglut.so has undefined references to hid_* symbols and causes linking
+errors later on in the build process.
+
+--- freeglut-2.4.0/src/freeglut_joystick.c.old	2008-08-08 15:26:15 +0000
++++ freeglut-2.4.0/src/freeglut_joystick.c	2008-08-08 15:26:32 +0000
+@@ -78,7 +78,7 @@
+ #    include <errno.h>
+ #    if defined(__FreeBSD__) || defined(__NetBSD__)
+ /* XXX The below hack is done until freeglut's autoconf is updated. */
+-#        define HAVE_USB_JS    1
++#        undef HAVE_USB_JS
+ 
+ #        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+ #            include <sys/joystick.h>
diff --git a/media-libs/freeglut/freeglut-2.4.0-r1.ebuild b/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
index 3ca8961f13b5..aed1ba1ac64d 100644
--- a/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0-r1.ebuild,v 1.12 2007/09/28 04:02:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0-r1.ebuild,v 1.13 2008/08/08 16:22:08 aballier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
 HOMEPAGE="http://freeglut.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freeglut/${P}.tar.gz"
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/opengl
@@ -42,8 +42,14 @@ src_unpack() {
 	# (#140542) fix cursor handling so flightgear works
 	epatch "${FILESDIR}"/${PV}-cursor.patch
 
+	# Disable BSD's usb joystick support, see reasons in the patch
+	epatch "${FILESDIR}"/${P}-bsd-usb-joystick.patch
+
 	# bug #134586
 	replace-flags -O3 -O2
+
+	# Needed for sane .so versionning on bsd, please don't drop
+	elibtoolize
 }
 
 src_compile() {