1 files changed, 39 insertions, 14 deletions
diff --git a/libraries/vmaf/vmaf.SlackBuild b/libraries/vmaf/vmaf.SlackBuild
index d487f0a79d..fa23526fff 100644
--- a/libraries/vmaf/vmaf.SlackBuild
+++ b/libraries/vmaf/vmaf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vmaf
 
-# Copyright 2022-2024 Vijay Marcel
+# Copyright 2022-2025 Vijay Marcel
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vmaf
 VERSION=${VERSION:-3.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -77,23 +77,48 @@ 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 {} \;
 
-mkdir -pv $TMP/$PRGNAM-$VERSION/libvmaf/build
-
-meson setup libvmaf/build libvmaf  --buildtype release  --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} -Denable_float=true && \
-
-ninja -v -C libvmaf/build
-
-DESTDIR=$PKG ninja -v -C $TMP/$PRGNAM-$VERSION/libvmaf/build install
-
-mkdir -pv $PKG/usr/share/$PRGNAM-$VERSION
-
-cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/model "$PKG/usr/share/$PRGNAM-$VERSION/"
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" meson build libvmaf \
+    -Dprefix=/usr \
+    -Dlibdir=/usr/lib${LIBDIRSUFFIX} \
+    -Dlocalstatedir=/var \
+    -Dmandir=/usr/man \
+    -Dsysconfdir=/etc \
+    -Denable_float=true \
+    -Dbuildtype=release \
+    -Dstrip=true
+
+ninja -v -C build
+DESTDIR=$PKG ninja -v -C build install
+
+mkdir -pv $PKG/usr/bin
+install -Dvm 0755 build/tools/vmaf -t $PKG/usr/bin
+
+# copy the models that compiled during our build
+# vmaf now use .json based model files.
+mkdir -pv $PKG/usr/share/$PRGNAM-$VERSION/model
+
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_4k_v0.6.1.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_4k_v0.6.1neg.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_b_v0.6.3.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_float_4k_v0.6.1.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_float_b_v0.6.3.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_float_v0.6.1.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_float_v0.6.1neg.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_v0.6.1.json "$PKG/usr/share/$PRGNAM-$VERSION/model"
+cp -dr --no-preserve='ownership' $TMP/$PRGNAM-$VERSION/build/src/vmaf_v0.6.1neg.json  "$PKG/usr/share/$PRGNAM-$VERSION/model"
+
+find $TMP/$PRGNAM-$VERSION/model/other_models -name '*.json' -type f -exec install -D -v -m0644 {} -t "$PKG/usr/share/$PRGNAM-$VERSION/model" \;
+find $TMP/$PRGNAM-$VERSION/model/vmaf_4k_rb_v0.6.2 -name '*.json' -type f -exec install -D -v -m0644 {} -t "$PKG/usr/share/$PRGNAM-$VERSION/model" \;
+find $TMP/$PRGNAM-$VERSION/model/vmaf_rb_v0.6.2 -name '*.json' -type f -exec install -D -v -m0644 {} -t "$PKG/usr/share/$PRGNAM-$VERSION/model" \;
+find $TMP/$PRGNAM-$VERSION/model/vmaf_rb_v0.6.3 -name '*.json' -type f -exec install -D -v -m0644 {} -t "$PKG/usr/share/$PRGNAM-$VERSION/model" \;
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true
 
 # Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+#cd $TMP/$PRGNAM-$VERSION
 
 mkdir -pv  $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG.md LICENSE README.md    $PKG/usr/doc/$PRGNAM-$VERSION