From 2c3b7d9723d4f896063813c00dee55e66ac1a9a4 Mon Sep 17 00:00:00 2001 From: Philip Miess Date: Sun, 30 Jun 2024 16:49:54 -0400 Subject: update lwjgl to eapi7 Signed-off-by: Philip Miess --- dev-java/lwjgl/Manifest | 2 +- dev-java/lwjgl/lwjgl-2.9.3-r1.ebuild | 84 ------------------------------------ dev-java/lwjgl/lwjgl-2.9.3-r2.ebuild | 83 +++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 dev-java/lwjgl/lwjgl-2.9.3-r1.ebuild create mode 100644 dev-java/lwjgl/lwjgl-2.9.3-r2.ebuild diff --git a/dev-java/lwjgl/Manifest b/dev-java/lwjgl/Manifest index 0e2e9e3..84af361 100644 --- a/dev-java/lwjgl/Manifest +++ b/dev-java/lwjgl/Manifest @@ -1,4 +1,4 @@ AUX asm-4.patch 1869 BLAKE2B eb820dcb22a842a9ce83489068d84a5180a822e30416064ea3525c4f776a7bff060442b60050f1447fe24f6eefe3b255a8468ad6322c238a4edbde8878d88c66 SHA512 26ba312fc0fc224eceae644652508d37474195987c836bb052742ed8d7fc5af92520e37a3505cae840c104cf14412ef4e7b213cd36ec1fc715c98221aa761ff0 DIST lwjgl-source-2.9.3.zip 3183783 BLAKE2B 009db0c9f71d1a22894b02899dd7e3470a892df76dbe7d5e3c9deb750e98c77d5aec5673a145431c017504c9720361a3a0a485b4cf7065aa9a38a34492b9d079 SHA512 271b1a5f3824265137bfab6144b4c4d28204051ef82a5ae5e08c05077710a70fd445b4778489ed1c18170d84b8a263e721bcd12d0f24e0c44f0b79444fa76f43 -EBUILD lwjgl-2.9.3-r1.ebuild 2230 BLAKE2B 17bc0bc34f0072a56e5768f0ca7f9ec5b48166ac7851c70b657eabcf7d09eccfc47434384c283a8f6e2535ef9840297f760e0acb25e7ce5fb7e7bf47ac33ed0c SHA512 76e1b22a0ba22debeb6487cb34658a1d4625c791d784d64d4c0834d5b156262a1a303797a5b5e3e7bc69feb338ddd1b6994c76a0c9f31904518bf914c155db82 +EBUILD lwjgl-2.9.3-r2.ebuild 2201 BLAKE2B baf635b8e87f74fbade468d1db1109c6eafd921147abeefc1862d3b7bd934c41bbe0b9c8f842a4fbaf5ecd69d7ef2c6815986e5417557057fa3975d06d8e3e65 SHA512 3b9e4b6d44e76741ad168d701bd4658ee5dc77342188530f41db2bde5e0308523b963fc7cd672e8e1ea7f4a595aa514f4b59caa97b5d3c8d6a0ec0c6237944d2 MISC metadata.xml 826 BLAKE2B a1ee3e333f68a12f6d55eb8eb31321e669d90c5a10b009af2cc3fe8de57038c08fb561720c58f438e00494676d8a402bf0068328b923ec01df4f9abcde0a43e2 SHA512 6ca56c6f755a8596ad17a7e636c4e433892afeab172f4c068035acfb90087407a7ce54607be95450966dc6f7eae01523bf9a04c3a75aa2e7536842c57cffc736 diff --git a/dev-java/lwjgl/lwjgl-2.9.3-r1.ebuild b/dev-java/lwjgl/lwjgl-2.9.3-r1.ebuild deleted file mode 100644 index 2c1146d..0000000 --- a/dev-java/lwjgl/lwjgl-2.9.3-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="The Lightweight Java Game Library (LWJGL)" -HOMEPAGE="http://www.lwjgl.org" -SRC_URI="mirror://sourceforge/java-game-lib/Official%20Releases/LWJGL%20${PV}/${PN}-source-${PV}.zip" -LICENSE="BSD" -SLOT="2.9" -KEYWORDS="~amd64 ~x86" -IUSE="gles" - -CDEPEND="dev-java/apple-java-extensions-bin:0 - dev-java/apt-mirror:0 - dev-java/asm:4 - dev-java/jinput:0 - dev-java/jutils:0 - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXxf86vm - gles? ( media-libs/mesa[egl,gles2] )" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.7 - x11-proto/xproto" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.7 - media-libs/openal - virtual/opengl - x11-apps/xrandr" - -S="${WORKDIR}" - -JAVA_PKG_BSFIX_NAME="build.xml build-generator.xml" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,apt-mirror,asm-4,jinput,jutils" - -java_prepare() { - # We don't want a prerelease in the tree. - epatch "${FILESDIR}/asm-4.patch" - - # This file is missing. - # Output separate JARs for GLES. - sed -i -r \ - -e "/build-updatesite\.xml/d" \ - -e '//,/<\/target>/s/lwjgl([^.]*\.jar)/lwjgles\1/g' \ - build.xml || die -} - -compile_native() { - # Their native build script sucks. - cd "${S}/src/native" || die - LIBRARY_PATH="$(java-config -g LDPATH)" gcc -shared -fPIC -std=c99 -pthread -Wall -Wl,--version-script=linux/${PN}.map -Wl,-z -Wl,defs ${CFLAGS} ${LDFLAGS} $(java-pkg_get-jni-cflags) -I{common,linux}{,/open$2} {common,linux}{,/open$2}/*.c generated/open{al,cl,$2}/*.c $3 -lm -lX11 -lXcursor -lXrandr -lXxf86vm -ljawt -ldl -o lib${PN%gl}$2$1.so || die -} - -src_compile() { - EANT_BUILD_TARGET="headers jars" - use gles && EANT_BUILD_TARGET+=" jars_es" - - # Build the JARs and headers. - java-pkg-2_src_compile - - # Add "64" for amd64. - local BITS= - use amd64 && BITS=64 - - compile_native "${BITS}" "gl" "" - use gles && compile_native "${BITS}" "gles" "-lEGL" -} - -src_install() { - java-pkg_dojar libs/${PN}*.jar - java-pkg_doso src/native/lib${PN}*.so - - use doc && java-pkg_dojavadoc doc/javadoc - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/lwjgl/lwjgl-2.9.3-r2.ebuild b/dev-java/lwjgl/lwjgl-2.9.3-r2.ebuild new file mode 100644 index 0000000..2fc863c --- /dev/null +++ b/dev-java/lwjgl/lwjgl-2.9.3-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="The Lightweight Java Game Library (LWJGL)" +HOMEPAGE="http://www.lwjgl.org" +SRC_URI="mirror://sourceforge/java-game-lib/Official%20Releases/LWJGL%20${PV}/${PN}-source-${PV}.zip" +LICENSE="BSD" +SLOT="2.9" +KEYWORDS="~amd64 ~x86" +IUSE="gles" + +CDEPEND="dev-java/apple-java-extensions-bin:0 + dev-java/apt-mirror:0 + dev-java/asm:4 + dev-java/jinput:0 + dev-java/jutils:0 + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXxf86vm + gles? ( media-libs/mesa[gles2] )" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.7" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.7 + media-libs/openal + virtual/opengl + x11-apps/xrandr" + +S="${WORKDIR}" + +JAVA_PKG_BSFIX_NAME="build.xml build-generator.xml" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,apt-mirror,asm-4,jinput,jutils" + +java_prepare() { + # We don't want a prerelease in the tree. + epatch "${FILESDIR}/asm-4.patch" + + # This file is missing. + # Output separate JARs for GLES. + sed -i -r \ + -e "/build-updatesite\.xml/d" \ + -e '//,/<\/target>/s/lwjgl([^.]*\.jar)/lwjgles\1/g' \ + build.xml || die +} + +compile_native() { + # Their native build script sucks. + cd "${S}/src/native" || die + LIBRARY_PATH="$(java-config -g LDPATH)" gcc -shared -fPIC -std=c99 -pthread -Wall -Wl,--version-script=linux/${PN}.map -Wl,-z -Wl,defs ${CFLAGS} ${LDFLAGS} $(java-pkg_get-jni-cflags) -I{common,linux}{,/open$2} {common,linux}{,/open$2}/*.c generated/open{al,cl,$2}/*.c $3 -lm -lX11 -lXcursor -lXrandr -lXxf86vm -ljawt -ldl -o lib${PN%gl}$2$1.so || die +} + +src_compile() { + EANT_BUILD_TARGET="headers jars" + use gles && EANT_BUILD_TARGET+=" jars_es" + + # Build the JARs and headers. + java-pkg-2_src_compile + + # Add "64" for amd64. + local BITS= + use amd64 && BITS=64 + + compile_native "${BITS}" "gl" "" + use gles && compile_native "${BITS}" "gles" "-lEGL" +} + +src_install() { + java-pkg_dojar libs/${PN}*.jar + java-pkg_doso src/native/lib${PN}*.so + + use doc && java-pkg_dojavadoc doc/javadoc + use source && java-pkg_dosrc src/java/org +} -- cgit v1.2.3-65-gdbad