Gallium-nine patches obtained from another source.

1 files changed, 18 insertions, 47 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 5f659375..f0025735 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -109,8 +109,8 @@
 #               for some corner cases (modern Radeon GPU's), see also
 #               https://www.phoronix.com/scan.php?page=news_item&px=Wine-D3D9-Gallium-Nine-Opposed
 # 1.9.15-1    25/jul/2016 by Eric Hameleers <alien@slackware.com>
-#             * Update. Gallium-nine patches are now part of wine-staging.
-# 
+#             * Update. Gallium-nine patches obtained from another source.
+#
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
@@ -198,6 +198,13 @@ SOURCE[$DLI]="$SRCDIR/${PRGNAM}-staging-${SRCVER}.tar.gz"
 SRCURL[$DLI]="https://github.com/${PRGNAM}-compholio/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz"
 STAGINGSRC="${SOURCE[$DLI]}"
 
+if [ "$USE_NINE" = "YES" ]; then
+  DLI=$(($DLI+1))
+  SOURCE[$DLI]="$SRCDIR/${PRGNAM}-d3d9-${SRCVER}.tar.gz"
+  SRCURL[$DLI]="https://github.com/sarnex/wine-d3d9-patches/archive/${PRGNAM}-d3d9-${SRCVER}.tar.gz"
+  NINESRC="${SOURCE[$DLI]}"
+fi
+
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
 SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine_gecko-${GECKO}-x86.msi"
@@ -210,46 +217,6 @@ if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
   GECKO64SRC="${SOURCE[$DLI]}"
 fi
 
-# Use the src_checkout() function if no downloadable tarball exists.
-src_checkout() {
-  # Param #1 : index in the SOURCE[] array.
-  # Param #2 : full path to where SOURCE[$1] should be created.
-  # Determine the tarball extension:
-  # Determine the directory name to create for the archive root:
-  PBASE=$(basename ${2} .patch)
-  # Determine the directory where we create our checkout:
-  CODIR=$(dirname ${2})
-  case ${1} in
-  2) # Check out sources from GIT.
-     echo "** This checkout will take a long time **"
-     GITURI="https://github.com/NP-Hardass/wine-d3d9-patches.git"
-     RETDIR=$(pwd)
-     if [ -z "$(git config user.email)" ]; then
-       git config --global user.email "$USER@localhost"
-     fi
-     if [ -z "$(git config user.name)" ]; then
-       git config --global user.name "$USER"
-     fi
-     mkdir -p $CODIR/${PRGNAM}_temp_checkout_$$ \
-       && cd $CODIR/${PRGNAM}_temp_checkout_$$
-     mkdir ${PBASE} \
-       && cd ${PBASE} \
-     && \
-       # Checkout without downloading version history (fast!):
-       echo "Checking out HEAD from '$GITURI':"
-       git clone --depth=1 ${GITURI} . \
-       && chown -R root:root . \
-       && ./generate-d3d9-patch.sh ${VERSION} \
-            2>&1 | tee $OUTPUT/${PRGNAM}_d3d9.patch.log \
-       && cp wine-d3d9-latest.patch ${2}
-     cd $RETDIR
-     rm -rf $CODIR/${PRGNAM}_temp_checkout_$$ || true
-     ;;
-  *) # Do nothing
-     ;;
-  esac
-}
-
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED on line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -285,11 +252,6 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
         exit 1
       fi
-    else
-      # Try if we have a GIT download routine for ${SOURCE[$i]}
-      echo "Will checkout sources to $(dirname $SOURCE[$i])"
-      src_checkout $i "${SOURCE[$i]}" \
-        2>&1 > $OUTPUT/checkout-$(basename ${SOURCE[$i]}).log
     fi
     if [ ! -f "${SOURCE[$i]}" -o ! -s "${SOURCE[$i]}" ]; then
       echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
@@ -346,6 +308,15 @@ echo -e "\n**\n** wine-staging:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
 tar -xf ${STAGINGSRC} --strip-components 1
 ./patches/patchinstall.sh DESTDIR="$(pwd)" --all \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+if [ "$USE_NINE" = "YES" ]; then
+  # Apply the Direct3D9 patch set:
+  echo -e "\n**\n** direct3d9:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
+  tar xvf ${NINESRC} --strip-components 1
+  cat staging-helper.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+  cat wine-d3d9.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .