3 files changed, 42 insertions, 27 deletions
diff --git a/academic/siril/README b/academic/siril/README
index 9d75056201..bdd99c4b52 100644
--- a/academic/siril/README
+++ b/academic/siril/README
@@ -5,3 +5,5 @@ reduction and improving the signal/noise ratio of an image
 from multiple captures as required in astronomy.  SIRIL can align
 automatically or manually, stack and enhance pictures from various file
 formats, even images sequences (movies and SER files).
+
+libheif is an optional dependency.
diff --git a/academic/siril/siril.SlackBuild b/academic/siril/siril.SlackBuild
index 03073692f2..2da99a2d8e 100644
--- a/academic/siril/siril.SlackBuild
+++ b/academic/siril/siril.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for siril
 
@@ -22,10 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=siril
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-1.0.0_rc2}
+SRCVER=$(echo $VERSION | tr _ - )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +70,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+mkdir -p $PRGNAM-$SRCVER
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,21 +81,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sh ./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make DESTDIR=$PKG install
+mkdir compile
+cd compile
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  DESTDIR=$PKG "${NINJA:=ninja}" install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -91,12 +103,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+rm -fR $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS README.md ChangeLog NEWS LICENSE COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS README.md ChangeLog NEWS LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/academic/siril/siril.info b/academic/siril/siril.info
index 68b04e4792..743f994968 100644
--- a/academic/siril/siril.info
+++ b/academic/siril/siril.info
@@ -1,8 +1,8 @@
 PRGNAM="siril"
-VERSION="0.9.6"
-HOMEPAGE="https://free-astro.org/index.php?title=Main_Page"
-DOWNLOAD="https://free-astro.org/download/siril-0.9.6.tar.bz2"
-MD5SUM="aaa649ba5a57738ab8fb8c4223ed83dd"
+VERSION="1.0.0_rc2"
+HOMEPAGE="https://siril.org"
+DOWNLOAD="https://free-astro.org/download/siril-1.0.0-rc2.tar.bz2"
+MD5SUM="764767e35ea835fe2206d2dadf79dee6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"