Use lwjgl 2.7 with Minecraft.

svn path=/java-overlay/; revision=8395

4 files changed, 24 insertions, 7 deletions

diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog
index 8529af55..2a918626 100644
--- a/games-action/minecraft/ChangeLog
+++ b/games-action/minecraft/ChangeLog
@@ -2,14 +2,27 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*minecraft-20110223-r1 (2 Jun 2011)
+
+  2 Jun 2011; James Le Cuirot <chewi@aura-online.co.uk>
+  -minecraft-20110223.ebuild, +minecraft-20110223-r1.ebuild:
+  Use lwgjl 2.7 now since it seems to work. With any luck, this will fix the
+  reported high pitched noises with OpenAL 1.13.
+
+*minecraft-20110223 (23 Feb 2011)
+
   23 Feb 2011; James Le Cuirot <chewi@aura-online.co.uk>
   -minecraft-20110221.ebuild, +minecraft-20110223.ebuild:
   Damn, they've updated the launcher again already.
 
+*minecraft-20110221 (21 Feb 2011)
+
   21 Feb 2011; James Le Cuirot <chewi@aura-online.co.uk>
   -minecraft-20101219-r2.ebuild, +minecraft-20110221.ebuild:
   Version bump for the new launcher. I can't believe the same hack still works!
 
+*minecraft-20101219-r2 (3 Feb 2011)
+
   3 Feb 2011; James Le Cuirot <chewi@aura-online.co.uk>
   -minecraft-20101219-r1.ebuild, +minecraft-20101219-r2.ebuild:
   Use lwgjl 2.6 instead of 2.4 because of reports that it fixes a bug where
@@ -27,11 +40,15 @@
   minecraft-20101219-r1.ebuild:
   Fix QA violation.
 
+*minecraft-20101219-r1 (30 Dec 2010)
+
   30 Dec 2010; James Le Cuirot <chewi@aura-online.co.uk>
   -minecraft-20101219.ebuild, +minecraft-20101219-r1.ebuild:
   Add -Djava.net.preferIPv4Stack=true to fix connection for dual stack users.
   I'm guessing Minecraft's authentication server doesn't support IPv6.
 
+*minecraft-20101219 (20 Dec 2010)
+
   20 Dec 2010; James Le Cuirot <chewi@aura-online.co.uk>
   +minecraft-20101219.ebuild, +files/minecraft.png,
   +files/native-symlinks.sh:
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index cdda59c6..a7ce270f 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,6 +1,6 @@
 AUX minecraft.png 20345 RMD160 f35196576246eff41f0e1383829a954cb835a5f6 SHA1 e01d89bab2f28f7b2436b1d379bad311d214deb9 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b
-AUX native-symlinks.sh 719 RMD160 bddc31159c167b08c5eb9a16a36746385b9de1cc SHA1 8fb97ffa645bf31664c552d2afa485d74f5ff82b SHA256 62da310c51f026bb82e210dc040cfc38c659270d2c5c6e58f855c80d55a5d799
+AUX native-symlinks.sh 719 RMD160 1dd2565fb4e66abdd6d4ec19ba5c5bfb8d445ca4 SHA1 ea58bf416fadc5c38bc2dff076266b66a34f8463 SHA256 5111e875b6b70908e7c36b7a7a40b2838ae18586416c8c0696baa4e9493f76d0
 DIST minecraft-20110223.jar 89406 RMD160 ffa47adc3b4f322c8eba2aad178664ceebbb2d22 SHA1 80055b408e0cbe42ca2fe29667c5616153cff634 SHA256 d275a1895b5d18e5a913d637d941cc1df83097add76103c2e02e4e513ceb982a
-EBUILD minecraft-20110223.ebuild 2197 RMD160 8009028b72c475230132cfd418659fbeafa6e2a3 SHA1 a0dc582407bce2b95e7b777ba0638039d73ab819 SHA256 0517ab1bb82d644d7730f63c6c073b4c631e1d62c67f6e4800e599278fcfebf0
-MISC ChangeLog 2052 RMD160 fd2906260629b6577ab88ee70fcdcf692b892242 SHA1 1be899b8f9e01fad61d552f0a0bbefac7a86f7ce SHA256 38204919650ae64c5265e400ff9dcd9465623da66349abc3aa254dc5caa0a369
+EBUILD minecraft-20110223-r1.ebuild 2189 RMD160 b8b5f8aa50f639042296554f983afbaf222b83e4 SHA1 0ffd642e1acd1d55ed4040e6822ee7f53d80228f SHA256 462eee0ff44f3afd6bbe2c7fbaf83c63f422d89ed80b014ea6e68e0d730690a2
+MISC ChangeLog 2513 RMD160 74c4c89f6455c7980a083aa2e163e0db29e6998b SHA1 80007f1aa1063ac9204d79cff0ae370ac5eff1a6 SHA256 12336eb3ac386d1d82119630fd387279d1bab9b94fbf26a5f8609e4754005ac4
 MISC metadata.xml 525 RMD160 499e41f9c749ddc7d030d0ef07be4b75586a8628 SHA1 f60ada485166ca0f1aacecac04cc5aadcd298de0 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918
diff --git a/games-action/minecraft/files/native-symlinks.sh b/games-action/minecraft/files/native-symlinks.sh
index 14f2827c..927aa201 100644
--- a/games-action/minecraft/files/native-symlinks.sh
+++ b/games-action/minecraft/files/native-symlinks.sh
@@ -10,7 +10,7 @@ chmod +w "${NATIVES}"
 
 ln -snf /usr/lib/libopenal.so "${NATIVES}"/libopenal.so
 ln -snf /usr/lib/jinput/libjinput-linux*.so "${NATIVES}"/libjinput-linux.so
-ln -snf /usr/lib/lwjgl-2.6/liblwjgl*.so "${NATIVES}"/liblwjgl.so
+ln -snf /usr/lib/lwjgl-2.7/liblwjgl*.so "${NATIVES}"/liblwjgl.so
 
 ln -snf libopenal.so "${NATIVES}"/libopenal64.so
 ln -snf libjinput-linux.so "${NATIVES}"/libjinput-linux64.so
diff --git a/games-action/minecraft/minecraft-20110223.ebuild b/games-action/minecraft/minecraft-20110223-r1.ebuild
index d45fe479..3956237f 100644
--- a/games-action/minecraft/minecraft-20110223.ebuild
+++ b/games-action/minecraft/minecraft-20110223-r1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
-# lwjgl 2.4 is used by upstream but we're using 2.6 because of reports
+# lwjgl 2.4 is used by upstream but we're using 2.6+ because of reports
 # that it fixes a bug where keyboard controls get stuck. You can
 # determine what version upstream uses by looking for the version number
 # near the top of...
@@ -24,7 +24,7 @@ RESTRICT="mirror"
 DEPEND="virtual/jdk:1.6"
 
 RDEPEND=">=dev-java/jinput-1_pre20100416
-	>=dev-java/lwjgl-2.6-r1:2.6
+	dev-java/lwjgl:2.7
 	|| ( dev-java/icedtea6-bin[X]
 		dev-java/icedtea:6
 		dev-java/sun-jre-bin:1.6[X]
@@ -47,7 +47,7 @@ src_prepare() {
 }
 
 src_install() {
-	java-pkg_register-dependency jinput,lwjgl-2.6
+	java-pkg_register-dependency jinput,lwjgl-2.7
 	java-pkg_dojar "${PN}.jar"
 
 	# Launching with -jar seems to create classpath problems.