Fabio Castelli pushed to branch main at Arch Linux / Packaging / Packages / sweethome3d
Commits: 77ae0ed7 by Enrique Hernández Bello at 2023-06-23T13:42:30+01:00 fix installation of yafray libraries - - - - - 3f89b54e by Fabio Castelli (Muflone) at 2023-08-07T13:35:16+02:00 Added YafaRay rendered libraries, fixes FS#78869 - - - - - 0a5490f2 by Fabio Castelli (Muflone) at 2023-08-07T13:36:58+02:00 upgpkg: 7.1-3: 7.1-3 Dependencies fix - - - - - 2 changed files: - PKGBUILD - sweethome3d.sh Changes: ===================================== PKGBUILD ===================================== @@ -7,23 +7,28 @@ pkgname=sweethome3d pkgver=7.1 -pkgrel=2 +pkgrel=3 pkgdesc="An interior design application to draw the plan of your house in a 3D environment" arch=('x86_64') url="http://www.sweethome3d.com/" license=('GPL' 'custom') -depends=('java-runtime<17' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') -makedepends=('ant' 'strip-nondeterminism') +depends=('java-runtime' 'shared-mime-info' 'desktop-file-utils' 'libxext' 'libgl' 'libxrender' 'libnsl') +makedepends=('java-environment<20' 'ant' 'strip-nondeterminism') source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip" "${pkgname}.sh" "${pkgname}.desktop" "${pkgname}.xml") sha256sums=('04b7453410ec918971cf69aeb5d0a8d1284369ffe544f8d49e8b81d2bd39b2a2' - '1e037cbb981dbd5d686a5b85cae43656193c3fcb543a1b46f93ef739551dcd65' + '9e95ebf426abffe91fe3046e024796d0408fee2987a458fd2782dc0b75124e03' '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e' 'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5') install="${pkgname}.install" +prepare() { + # Avoid the use of any Java 20, actually incompatible with the build + export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '20-' -m 1)" +} + build() { cd "SweetHome3D-${pkgver}-src" ant application textures furniture examples help java3dLibraries @@ -57,4 +62,11 @@ package() { install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/*.jar install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/java3d-1.6" java3d-1.6/linux/amd64/*.so + # Yafaray libraries + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/yafaray" + install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/yafaray" yafaray/linux/x64/*.so + # Yafaray plugins + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/yafaray/yafaray-plugins" + install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/yafaray/yafaray-plugins" yafaray/linux/x64/yafaray-plugins/*.so + } ===================================== sweethome3d.sh ===================================== @@ -37,10 +37,10 @@ fi APP_CLASSPATH="SweetHome3D.jar:Furniture.jar:Textures.jar:Examples.jar:Help.jar:iText-2.1.7.jar:freehep-vectorgraphics-svg-2.1.1c.jar:sunflow-0.07.3i.jar:jmf.jar:batik-svgpathparser-1.7.jar:jeksparser-calculator.jar:jnlp.jar" if [ "${SWEETHOME3D_JAVA3D}" = "1.6" ] then - JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.6 -Djogamp.gluegen.UseTempJarCache=false" + JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.6:/usr/lib/sweethome3d/yafaray -Djogamp.gluegen.UseTempJarCache=false" APP_CLASSPATH="${APP_CLASSPATH}:/usr/lib/sweethome3d/java3d-1.6/j3dcore.jar:/usr/lib/sweethome3d/java3d-1.6/j3dutils.jar:/usr/lib/sweethome3d/java3d-1.6/vecmath.jar:/usr/lib/sweethome3d/java3d-1.6/gluegen-rt.jar:/usr/lib/sweethome3d/java3d-1.6/jogl-all.jar" else - JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.5" + JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/lib/sweethome3d/java3d-1.5:/usr/lib/sweethome3d/yafaray" APP_CLASSPATH="${APP_CLASSPATH}:/usr/lib/sweethome3d/java3d-1.5/j3dcore.jar:/usr/lib/sweethome3d/java3d-1.5/j3dutils.jar:/usr/lib/sweethome3d/java3d-1.5/vecmath.jar" fi View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/sweethome3d/-/compare/71b184200556247d0a91992fe68124204168e7c9...0a5490f235353361af471dcb8c20cfe7c9a6b826 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/sweethome3d/-/compare/71b184200556247d0a91992fe68124204168e7c9...0a5490f235353361af471dcb8c20cfe7c9a6b826 You're receiving this email because of your account on gitlab.archlinux.org.