graphics/luxcorerender: Add missing desktop file.

Move ARCH check to correct place after setting the var.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 21 insertions, 16 deletions

diff --git a/graphics/luxcorerender/doinst.sh b/graphics/luxcorerender/doinst.sh
index dfa772beb5..2eea248173 100644
--- a/graphics/luxcorerender/doinst.sh
+++ b/graphics/luxcorerender/doinst.sh
@@ -15,4 +15,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/graphics/luxcorerender/luxcorerender.SlackBuild b/graphics/luxcorerender/luxcorerender.SlackBuild
index b5f1bfdb69..6e1a9625dd 100644
--- a/graphics/luxcorerender/luxcorerender.SlackBuild
+++ b/graphics/luxcorerender/luxcorerender.SlackBuild
@@ -27,7 +27,6 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=luxcorerender
-SHORTNAM=LuxCore
 SHORT=luxcore
 VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
@@ -36,17 +35,12 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) echo "This package is available for x86_64 only." && exit 1
-	  ;;
-    arm*) echo "This package is available for x86_64 only." && exit 1
-	  ;;
-       *) ARCH=$( uname -m )
-	  LIBDIRSUFFIX="64"
-	  ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# If PRINT_PACKAGE_NAME is set, print name of package
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -56,6 +50,11 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" != "x86_64" ]; then
+  echo "This package is available for x86_64 only."
+  exit 1
+fi
+
 set -e
 
 rm -rf $PKG
@@ -66,7 +65,6 @@ mkdir $PRGNAM-$VERSION
 tar xvjf $CWD/$PRGNAM-v"$VERSION"-linux64.tar.bz2 \
     --strip-components=1 -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,12 +79,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir $PKG/opt
 mv $TMP/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION
 
-# if user requests it using OPENCL=yes, then set doinst.sh to
-# rename dummy OpenCL definition so Lux can find valid OpenCL device
+# if OPENCL=yes, then set doinst.sh to rename dummy OpenCL
+# definition so Lux can find valid OpenCL device
 if [ $OPENCL ]; then
-    cat <<EOF >>$CWD/doinst.sh
+  cat <<EOF >> $CWD/doinst.sh
 if [ -e /etc/OpenCL/vendors/mesa.icd ]; then
-    mv /etc/OpenCL/vendors/mesa.icd /etc/OpenCL/vendors/mesa.icd-dummy
+  mv /etc/OpenCL/vendors/mesa.icd /etc/OpenCL/vendors/mesa.icd-dummy
 fi
 EOF
 fi
diff --git a/graphics/luxcorerender/pyluxcoretools.desktop b/graphics/luxcorerender/pyluxcoretools.desktop
new file mode 100644
index 0000000000..315267ff3c
--- /dev/null
+++ b/graphics/luxcorerender/pyluxcoretools.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Lux Core Net Node UI
+GenericName=Lux Core Net Node UI
+Comment=LuxCore Nodes
+Exec=PYTHONPATH=$PYTHONPATH:/opt/luxcorerender-2.6 python3 /opt/luxcorerender-2.6/pyluxcoretools.zip netnodeui
+Icon=/usr/share/icons/hicolor/scalable/apps/luxcore.svg
+Terminal=false
+Type=Application
+Categories=Graphics;3DGraphics;
diff --git a/graphics/luxcorerender/pyluxcoretools.sh b/graphics/luxcorerender/pyluxcoretools.sh
index 9e7fde118e..f1fb47802d 100644
--- a/graphics/luxcorerender/pyluxcoretools.sh
+++ b/graphics/luxcorerender/pyluxcoretools.sh
@@ -9,4 +9,3 @@ fi
 
 PYTHONPATH=$PYTHONPATH:/opt/luxcorerender-2.6 python3 \
 	  /opt/luxcorerender-2.6/pyluxcoretools.zip "$@"
-