From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-java/jinput/Manifest | 9 +++ dev-java/jinput/files/javah-classpath.patch | 10 +++ dev-java/jinput/files/nostrip.patch | 12 +++ .../jinput/files/remove-getDeviceUsageBits.patch | 90 ++++++++++++++++++++++ dev-java/jinput/files/unbundle.patch | 10 +++ dev-java/jinput/jinput-2.0.6-r1.ebuild | 50 ++++++++++++ dev-java/jinput/metadata.xml | 12 +++ 7 files changed, 193 insertions(+) create mode 100644 dev-java/jinput/Manifest create mode 100644 dev-java/jinput/files/javah-classpath.patch create mode 100644 dev-java/jinput/files/nostrip.patch create mode 100644 dev-java/jinput/files/remove-getDeviceUsageBits.patch create mode 100644 dev-java/jinput/files/unbundle.patch create mode 100644 dev-java/jinput/jinput-2.0.6-r1.ebuild create mode 100644 dev-java/jinput/metadata.xml (limited to 'dev-java/jinput') diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest new file mode 100644 index 000000000000..461ade13453e --- /dev/null +++ b/dev-java/jinput/Manifest @@ -0,0 +1,9 @@ +AUX javah-classpath.patch 469 SHA256 7653b41686f8cea84aa926cc58b796ef3b9474f3208116043026f61779e9f7a5 SHA512 a10b34e593980e24e0d9dbf0419cdacdb9c03059b54d3a811f3dadc8838d223cc3e4800feeb1ad0cf3b65d75117a0dbc7061740b40e051c683c4180a323bc916 WHIRLPOOL ff7806ee4a1e5cda6fba848b6bf5d05ad3af91d9e064b0d12936a1eb6e708e559215a18a6b3f0bfb0e120ba175f78479e6757b5341286b05ec6268a733525713 +AUX nostrip.patch 431 SHA256 f9c1622eb8795429cea8aa91f5f30ab829cadd50215f1f4214bc67d81371c1fe SHA512 0f1cccfef58afca9c1db074ae179bc9d06c0ae758a859671e362c229279d2b3c570356ca2e06bd319f1ba6674f601f4fd15479adf1e1410779a52eec9e1172c9 WHIRLPOOL 5ea4f713e84b9ac2100e86fd9d30ce0f70daf04d41d0e7cdc8dbad0aede1f4efda554d20ed17e3fd87085b06ce1637600e24c1e796bc99cc7b8a3167a9ac04bb +AUX remove-getDeviceUsageBits.patch 4109 SHA256 25cc77c93bc82689ed7f78934c245551a88d3a2fa2d8f4b90174964491e6295d SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176 WHIRLPOOL bd7cd28a387ccae991bf54d94a20229d2d19c00f5ae1fb71d47b12bc7c62a2cb2f25b9e6f89904a8b53689ae34313ec5ae0c0754b075766140f94b42ddcac30f +AUX unbundle.patch 354 SHA256 70ff37191145a870738e4753e9b81c8a7e43820865be26e8d3f8d4f57fd79e44 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e WHIRLPOOL 887840f774dd1aeec353ef965879bfe6a7fbfc96383cd0d9201e0426a0d390a915b77617bdafff5ca1c41483fcb9378eec5fa8cfaccba6dc0370fa5dafc9395e +DIST jinput-2.0.6.tar.gz 1590738 SHA256 220f5cb5c9ab8d3fdce4429393f1cba4fb47f835c5cfb9a982292709d39b02f4 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba WHIRLPOOL 04e487510976980891b588c56be2245bce8d13145579f192761621c2b43511060c7a06fcbc3baf27f3ab31a55d735d0fa66bc0c3e2bdb068032014f118743bd0 +EBUILD jinput-2.0.6-r1.ebuild 1251 SHA256 5da2e24ec9a93c5ff47a10f0c744f0cd61af8d83732751281e66bddae36f702a SHA512 6143fd69d97b780f2ba8b22eb29ceb636bfdc6249a53828981a73c73d29fa6740457ad217f77c4f7944362285ffd7a1349d140ce16e6fb34073816b7e2fb6b70 WHIRLPOOL b098cf98dd4fc78001d470ef5ce4433fc07a5a18264d5625596c8c83badc4fbada99dc38ba23632a83d62ccf5c660d23c54b2aff22e61e0923a8d1c0ea8346af +MISC ChangeLog 2549 SHA256 fe66830f96444cc95560f12cb1163d826caf878e4f0652639b8e8e92366d3485 SHA512 38c7c62ceb4f50b014d143b77d5c347e5b7b67a9e36d6f94d6440d8176877e271748f6b5ccb92fa9a5ca40f8e6573d3f938801fa90f65eb9d160c2da349f2291 WHIRLPOOL ce82f0cce2d0449f7ff43da1d88ba5d12e087f918e9422e9a69e34a7022af1d1fbbd9dea6636e7d3ee76c34974aaed0d6e715b10752f7a9dd725fad3c5a748a9 +MISC ChangeLog-2015 715 SHA256 8917a39820ac3493f1e588a4b264319c334d5eb6b11401fd43945283e99b7bd9 SHA512 b1342ddf51928e5774b4dd51e7c43b35b97469eaa83ceb90446b0155fa072fb460d2bbb35877246ca7d124545d53e21ee327056a7d51276095c26cedef3deedc WHIRLPOOL 9d69e50ab341857f02eff86e7e9751420458b5c508411f8802b1f1c625a7f5c5d1f5324805fa2249abed2f64c9295a52370959e2381cba0a54fc457b119fd483 +MISC metadata.xml 657 SHA256 6c97b9ef40645bde10ca3fa9788dba0a0112f162b96c4d291b77194db8e07a73 SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac WHIRLPOOL 7821c391a431b36328f72b8d74cb29c842f1e69a8fc1e163518c2a914d9e34bc37889de549959fe102654c6b347a5eb0e63238e1f2cd8dc4407e627913788b29 diff --git a/dev-java/jinput/files/javah-classpath.patch b/dev-java/jinput/files/javah-classpath.patch new file mode 100644 index 000000000000..ae90584691b8 --- /dev/null +++ b/dev-java/jinput/files/javah-classpath.patch @@ -0,0 +1,10 @@ +--- plugins/linux/build.xml.orig 2006-07-11 22:07:38.000000000 +0100 ++++ plugins/linux/build.xml 2011-11-16 15:49:21.140789781 +0000 +@@ -56,6 +56,7 @@ + + + ++ + + + diff --git a/dev-java/jinput/files/nostrip.patch b/dev-java/jinput/files/nostrip.patch new file mode 100644 index 000000000000..8627c0d12251 --- /dev/null +++ b/dev-java/jinput/files/nostrip.patch @@ -0,0 +1,12 @@ +--- plugins/linux/src/native/build.xml.orig 2013-03-25 18:01:56.000000000 +0000 ++++ plugins/linux/src/native/build.xml 2015-04-12 17:36:36.020105790 +0100 +@@ -46,9 +46,6 @@ + + + +- +- +- + + + diff --git a/dev-java/jinput/files/remove-getDeviceUsageBits.patch b/dev-java/jinput/files/remove-getDeviceUsageBits.patch new file mode 100644 index 000000000000..038473d5ba00 --- /dev/null +++ b/dev-java/jinput/files/remove-getDeviceUsageBits.patch @@ -0,0 +1,90 @@ +From 3f8a5394be4cddfb5bec584170678aac0f28b763 Mon Sep 17 00:00:00 2001 +From: Endolf +Date: Fri, 22 Aug 2014 14:38:30 +0100 +Subject: [PATCH] Remove usage_bits call as it doesn't work on v3 kernels. + +--- + .../net/java/games/input/LinuxEventDevice.java | 32 ---------------------- + .../native/net_java_games_input_LinuxEventDevice.c | 14 ---------- + 2 files changed, 46 deletions(-) + +diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java +index a28c4c7..41a4fee 100644 +--- a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java ++++ b/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java +@@ -94,34 +94,11 @@ private final static int countComponents(List components, Class id_type, boolean + } + + private final Controller.Type guessType() throws IOException { +- Controller.Type type_from_usages = guessTypeFromUsages(); +- if (type_from_usages == Controller.Type.UNKNOWN) +- return guessTypeFromComponents(); +- else +- return type_from_usages; +- } +- +- private final Controller.Type guessTypeFromUsages() throws IOException { +- byte[] usage_bits = getDeviceUsageBits(); +- if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE)) +- return Controller.Type.MOUSE; +- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD)) +- return Controller.Type.KEYBOARD; +- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD)) +- return Controller.Type.GAMEPAD; +- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK)) +- return Controller.Type.STICK; +- else +- return Controller.Type.UNKNOWN; +- } +- +- private final Controller.Type guessTypeFromComponents() throws IOException { + List components = getComponents(); + if (components.size() == 0) + return Controller.Type.UNKNOWN; + int num_rel_axes = countComponents(components, Component.Identifier.Axis.class, true); + int num_abs_axes = countComponents(components, Component.Identifier.Axis.class, false); +- int num_keys = countComponents(components, Component.Identifier.Key.class, false); + int mouse_traits = 0; + int keyboard_traits = 0; + int joystick_traits = 0; +@@ -342,15 +319,6 @@ private final List getDeviceComponents() throws IOException { + } + private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException; + +- private final byte[] getDeviceUsageBits() throws IOException { +- byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1]; +- if (getVersion() >= 0x010001) { +- nGetDeviceUsageBits(fd, bits); +- } +- return bits; +- } +- private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException; +- + public final synchronized void pollKeyStates() throws IOException { + nGetKeyStates(fd, key_states); + } +diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c +index 90eff09..18913c2 100644 +--- a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c ++++ b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c +@@ -112,20 +112,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_LinuxEventDevice_nGetNumEffects + return num_effects; + } + +-JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) { +-#if EV_VERSION >= 0x010001 +- int fd = (int)fd_address; +- jsize len = (*env)->GetArrayLength(env, usages_array); +- jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL); +- if (usages == NULL) +- return; +- int res = ioctl(fd, EVIOCGUSAGE(len), usages); +- (*env)->ReleaseByteArrayElements(env, usages_array, usages, 0); +- if (res == -1) +- throwIOException(env, "Failed to get device usages (%d)\n", errno); +-#endif +-} +- + JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) { + int fd = (int)fd_address; + jsize len = (*env)->GetArrayLength(env, bits_array); diff --git a/dev-java/jinput/files/unbundle.patch b/dev-java/jinput/files/unbundle.patch new file mode 100644 index 000000000000..1a8686308d71 --- /dev/null +++ b/dev-java/jinput/files/unbundle.patch @@ -0,0 +1,10 @@ +--- build.xml.orig 2013-03-25 18:01:56.000000000 +0000 ++++ build.xml 2015-04-12 17:11:45.869203820 +0100 +@@ -137,7 +137,6 @@ + + + +- + + + diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild new file mode 100644 index 000000000000..c4d0b5e00785 --- /dev/null +++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +COMMIT="790b666" +JAVA_PKG_IUSE="doc source" + +inherit eutils toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot + +DESCRIPTION="An implementation of an API for game controller discovery and polled input" +HOMEPAGE="https://java.net/projects/jinput" +SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/jutils:0" + +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.4 + ${CDEPEND}" + +JAVA_PKG_BSFIX="off" +EANT_BUILD_TARGET="dist" + +src_prepare() { + # http://java.net/jira/browse/JINPUT-44 + # http://java.net/jira/browse/JINPUT-45 + epatch "${FILESDIR}"/{javah-classpath,nostrip,remove-getDeviceUsageBits,unbundle}.patch + + sed -i \ + -e "s/\"cc\"/\"$(tc-getCC)\"/g" \ + -e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \ + plugins/linux/src/native/build.xml || die + + java-pkg_jar-from --into lib jutils +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + java-pkg_doso dist/lib${PN}-*.so + + # Only core API docs, others would conflict. + use doc && java-pkg_dojavadoc coreAPI/apidocs + use source && java-pkg_dosrc */src/java/* */**/src/java/* +} diff --git a/dev-java/jinput/metadata.xml b/dev-java/jinput/metadata.xml new file mode 100644 index 000000000000..bf2bb954c526 --- /dev/null +++ b/dev-java/jinput/metadata.xml @@ -0,0 +1,12 @@ + + + + + java@gentoo.org + Java + + The JInput Project hosts an implementation of an API for game controller discovery and polled input. It is part of a suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems with intention of making the development of high performance games in Java a reality. + + jinput/jinput + + -- cgit v1.2.3