summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2022-01-04 21:33:13 +0100
committer Eric Hameleers <alien@slackware.com>2022-01-04 21:33:13 +0100
commit47f4e1fa580e581bd8720cd4c2fea2dd3ff18d0c (patch)
tree73ed1900bb6535c8baf1127c815c41b05086c7f7
parentb727a6dd2e7776cfc7fac90bdb7ca0d9599e8db9 (diff)
downloadliveslak-47f4e1fa580e581bd8720cd4c2fea2dd3ff18d0c.tar.gz
liveslak-47f4e1fa580e581bd8720cd4c2fea2dd3ff18d0c.tar.xz
contrib: enhance contrib/scripts/makemod_wine
Now it creates a more usable wine module including the previously missing FAudio and vkd3d packages from my own repository.
-rw-r--r--contrib/scripts/makemod_wine22
1 files changed, 16 insertions, 6 deletions
diff --git a/contrib/scripts/makemod_wine b/contrib/scripts/makemod_wine
index c2fbf95..81c6e6c 100644
--- a/contrib/scripts/makemod_wine
+++ b/contrib/scripts/makemod_wine
@@ -3,26 +3,36 @@
# Root of all my slackbuilds:
SBROOT=${SBROOT:-"/home/slackbuilds"}
-# Package versions for wine and SDL_sound/OpenAL:
+# The makemod script:
+MAKEMOD=${MAKEMOD:-"/usr/local/sbin/makemod"}
+
+# Current directory:
+CWD=$(pwd)
+
+# Package versions for wine and FAudio/vkd3d:
WINEREL=$(ls ${SBROOT}/wine/pkg64/current/wine-*.t?z |rev |cut -f3 -d- |rev)
FAUDIOREL=$(ls ${SBROOT}/FAudio/pkg/current/FAudio-*.t?z |rev |cut -f3 -d- |rev)
VKD3DREL=$(ls ${SBROOT}/vkd3d/pkg/current/vkd3d-*.t?z |rev |cut -f3 -d- |rev)
# Package locations for wine vkd3d and FAudio:
WINEPKG=$(ls ${SBROOT}/wine/pkg64/current/wine-*.t?z)
-FAUDIOPKG=$(ls ${SBROOT}/FAudio/pkg/current/FAudio-*.t?z)
-VKD3DPKG=$(ls ${SBROOT}/vkd3d/pkg/current/vkd3d-*.t?z)
+FAUDIOPKG=$(ls ${SBROOT}/FAudio/pkg64/current/FAudio-*.t?z)
+FAUDIOPKG32=$(ls ${SBROOT}/FAudio/pkg/current/FAudio-*.t?z)
+VKD3DPKG=$(ls ${SBROOT}/vkd3d/pkg64/current/vkd3d-*.t?z)
+VKD3DPKG32=$(ls ${SBROOT}/vkd3d/pkg/current/vkd3d-*.t?z)
# Convert the 32bit FAudio into a 'compat32' package:
-convertpkg-compat32 -i ${FAUDIOPKG} -d /tmp
+convertpkg-compat32 -i ${FAUDIOPKG32} -d /tmp
# Convert the 32bit vkd3d into a 'compat32' package:
-convertpkg-compat32 -i ${VKD3DPKG} -d /tmp
+convertpkg-compat32 -i ${VKD3DPKG32} -d /tmp
# Create the SXZ module:
SCRATCHDIR=$(mktemp -t -d makesxz.XXXXXX)
installpkg --root $SCRATCHDIR ${WINEPKG}
+installpkg --root $SCRATCHDIR ${FAUDIOPKG}
+installpkg --root $SCRATCHDIR ${VKD3DPKG}
installpkg --root $SCRATCHDIR /tmp/FAudio-compat32-${FAUDIOREL}-x86_64-*compat32.txz
installpkg --root $SCRATCHDIR /tmp/vkd3d-compat32-${VKD3DREL}-x86_64-*compat32.txz
-./makemod $SCRATCHDIR ./optional/0060-wine-${WINEREL}-current-x86_64.sxz
+$MAKEMOD $SCRATCHDIR $CWD/0060-wine-${WINEREL}-current-x86_64.sxz
rm -r $SCRATCHDIR