FreeBSD Bugzilla – Attachment 209841 Details for
Bug 239415
games/lwjgl: update to latest snapshot
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update4-lwjgl
lwjgl.diff (text/plain), 8.75 KB, created by
voidanix
on 2019-12-10 19:54:02 UTC
(
hide
)
Description:
update4-lwjgl
Filename:
MIME Type:
Creator:
voidanix
Created:
2019-12-10 19:54:02 UTC
Size:
8.75 KB
patch
obsolete
>Index: games/lwjgl/Makefile >=================================================================== >--- games/lwjgl/Makefile (revision 519625) >+++ games/lwjgl/Makefile (working copy) >@@ -1,85 +1,77 @@ >-# Created by: loader <loader@freebsdmall.com> > # $FreeBSD$ > > PORTNAME= lwjgl >-DISTVERSION= 2.9.3 >+DISTVERSION= 20161208 > CATEGORIES= games java >-MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:tu}%20${PORTVERSION}/ >-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ >- ${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX} > > MAINTAINER= freebsd@skinc.ru > COMMENT= Lightweight Java Game Library > > LICENSE= BSD3CLAUSE > > ONLY_FOR_ARCHS= amd64 i386 powerpc64 >-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld >-BROKEN_i386= ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment >-.endif > >-BUILD_DEPENDS= ${JAVALIBDIR}/jutils/jutils.jar:games/jutils \ >- ${JAVALIBDIR}/jinput/jinput.jar:games/jinput >+BUILD_DEPENDS= ${JAVAJARDIR}/jutils/jutils.jar:games/jutils \ >+ ${JAVAJARDIR}/jinput/jinput.jar:games/jinput > RUN_DEPENDS:= ${BUILD_DEPENDS} > >-WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} >-EXTRACT_AFTER_ARGS= -d ${WRKSRC} >+USES= dos2unix xorg >+USE_GITHUB= yes >+GH_ACCOUNT= LWJGL >+GH_TAGNAME= 2df01dd > >-USES= dos2unix zip xorg >-DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$ >+DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$ > USE_JAVA= yes > USE_LDCONFIG= yes >-JAVA_OS= native >-JAVA_VENDOR= openjdk > USE_ANT= yes > USE_XORG= xcursor xrandr xxf86vm >-MAKE_ENV+= CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/ >+MAKE_ENV+= CLASSPATH=${JAVAJARDIR}/jutils/jutils.jar:${JAVAJARDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/ > ALL_TARGET= jars compile_native > >-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar \ >- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_test.jar \ >- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_util.jar \ >- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_util_applet.jar >-PLIST_DIRS= %%JAVAJARDIR%%/${PORTNAME} \ >- lib/${PORTNAME}${PORTVERSION} >+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar \ >+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_test.jar \ >+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util.jar \ >+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util_applet.jar >+PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME} \ >+ lib/${PORTNAME} > > .include <bsd.port.pre.mk> > > .if ${ARCH} == i386 >-PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}.so >+PLIST_FILES+= lib/${PORTNAME}/lib${PORTNAME}.so > .endif > > .if ${ARCH} == amd64 || ${ARCH} == powerpc64 >-PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so >+PLIST_FILES+= lib/${PORTNAME}/lib${PORTNAME}64.so > .endif > > .if ${ARCH} == powerpc64 > MAKE_ARGS+= -Dbuild.64bit.only=1 > .endif > > post-patch: > @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' \ > -e '/executable/s/cc/${CC}/g' \ > ${WRKSRC}/platform_build/bsd_ant/build.xml > .if ${ARCH} == powerpc64 > @${REINPLACE_CMD} -e 's|amd64|ppc64|g' \ > ${WRKSRC}/platform_build/bsd_ant/build.xml > .endif > > do-install: > @${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME} > .for _jar in ${PLIST_FILES:M*.jar} > ${INSTALL_DATA} ${WRKSRC}/libs/${_jar:T} \ > ${STAGEDIR}${JAVAJARDIR}/${PORTNAME} > .endfor >- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION} >+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} > .if ${ARCH} == i386 > ${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so \ >- ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION} >+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME} > .endif > .if ${ARCH} == amd64 || ${ARCH} == powerpc64 > ${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so \ >- ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION} >+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME} > .endif > > .include <bsd.port.post.mk> >Index: games/lwjgl/distinfo >=================================================================== >--- games/lwjgl/distinfo (revision 519625) >+++ games/lwjgl/distinfo (working copy) >@@ -1,4 +1,3 @@ >-SHA256 (lwjgl-2.9.3.zip) = 4354432ca5da11d3ec57a09228918b995f3de2761c975e68fa27a5fe0fb62f4c >-SIZE (lwjgl-2.9.3.zip) = 7805314 >-SHA256 (lwjgl-source-2.9.3.zip) = 098696a3752321979e6b1dc798c694d4d3daf64a71217ee8d7b04123b5b18a5a >-SIZE (lwjgl-source-2.9.3.zip) = 3183783 >+TIMESTAMP = 1563967229 >+SHA256 (LWJGL-lwjgl-20161208-2df01dd_GH0.tar.gz) = a4d03e9244a9e253abcfe7ee75d4413bd3db1fd8c38e67eedbd0c6c313c4e504 >+SIZE (LWJGL-lwjgl-20161208-2df01dd_GH0.tar.gz) = 15052370 >Index: games/lwjgl/files/patch-platform_build__bsd_ant__build.xml >=================================================================== >--- games/lwjgl/files/patch-platform_build__bsd_ant__build.xml (revision 519625) >+++ games/lwjgl/files/patch-platform_build__bsd_ant__build.xml (working copy) >@@ -1,14 +1,22 @@ >---- platform_build/bsd_ant/build.xml.orig 2015-12-19 18:22:18 UTC >+--- platform_build/bsd_ant/build.xml.orig 2019-12-10 20:24:26 > +++ platform_build/bsd_ant/build.xml >- > @@ -4,8 +4,8 @@ > <property name="native" location="../../src/native"/> > <property name="libname32" value="liblwjgl.so"/> > <property name="libname64" value="liblwjgl64.so"/> > - <property name="libs32" value="-L/usr/X11R6/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" /> > - <property name="libs64" value="-L/usr/X11R6/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" /> > + <property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" /> > + <property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" /> > <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> > > <target name="clean"> >+@@ -39,7 +39,7 @@ >+ <os name="SunOS" /> >+ </condition> >+ >+- <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> >++ <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -z notext -o ${libname32} ${libs32} ${xf86vm_lib}"/> >+ <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> >+ >+ <condition property="build.32bit.only"> >Index: games/lwjgl/pkg-descr >=================================================================== >--- games/lwjgl/pkg-descr (revision 519625) >+++ games/lwjgl/pkg-descr (working copy) >@@ -1,3 +1,3 @@ > The Lightweight Java Game Library > >-WWW: http://www.lwjgl.org >+WWW: http://legacy.lwjgl.org >Index: games/minecraft-client/files/minecraft-runtime >=================================================================== >--- games/minecraft-client/files/minecraft-runtime (revision 519625) >+++ games/minecraft-client/files/minecraft-runtime (working copy) >@@ -1,44 +1,44 @@ > #!/bin/sh > >-LWJGL_JLP_OVRD="/usr/local/lib/lwjgl2.9.3" >+LWJGL_JLP_OVRD="/usr/local/lib/lwjgl" > LWJGL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl.jar" > LWJGL_UTIL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl_util.jar" > > export JAVA_HOME=/usr/local/openjdk8 > > build_classpath() { > local IFS=":" > for p in ${1} > do > case "${p}" in > *lwjgl-*) > cp="${cp}:${LWJGL_OVRD}" > ;; > *lwjgl_util*) > cp="${cp}:${LWJGL_UTIL_OVRD}" > ;; > *) > cp="${cp}:${p}" > ;; > esac > done > cp=${cp#?} > } > > for var in "${@}" > do > case "${var}" in > -Djava.library*) > args="${args} -Djava.library.path=${LWJGL_JLP_OVRD}" > ;; > *lwjgl_util*) > build_classpath "${var}" > args="${args} ${cp}" > ;; > *) > args="${args} ${var}" > ;; > esac > done > > ${JAVA_HOME}/jre/bin/java ${args} >Index: games/multimc/Makefile >=================================================================== >--- games/multimc/Makefile (revision 519625) >+++ games/multimc/Makefile (working copy) >@@ -1,35 +1,35 @@ > # $FreeBSD$ > > PORTNAME= multimc > DISTVERSION= 0.6.7 > CATEGORIES= games java > > MAINTAINER= me@tsundoku.ne.jp > COMMENT= Minecraft launcher with the ability to manage multiple instances > > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/COPYING.md > > RUN_DEPENDS= lwjgl>=2.9.3:games/lwjgl > > USES= cmake compiler:c++14-lang qt:5 > USE_GITHUB= yes > GH_ACCOUNT= MultiMC > GH_PROJECT= MultiMC5 > GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \ > MultiMC:quazip:3691d57:quazip/libraries/quazip > USE_LDCONFIG= yes > USE_JAVA= 1.8+ > USE_QT= core concurrent gui network testlib_build widgets xml \ > buildtools_build qmake_build > > CMAKE_ARGS= -DMultiMC_LAYOUT="lin-system" > CMAKE_OFF= MultiMC_UPDATER > CXXFLAGS+= -Wno-inconsistent-missing-override \ > -Wno-delete-non-virtual-dtor \ >- -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl2.9.3\"' >+ -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl\"' > > post-install: > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libMultiMC_*.so > > .include <bsd.port.mk>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 239415
:
206023
|
206034
|
209830
|
209841
|
209844