diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-02-18 18:06:50 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-19 12:10:40 +0700 |
| commit | b08754ba17785d8200ba2d8e596509c36ff4be98 (patch) | |
| tree | 1aa4bbe5c824dde8f85557989faec5a719162f69 /system/xboxdrv-linux/xboxdrv-linux.SlackBuild | |
| parent | b933c905c2486b640c9d6120d37c74da10ba2eff (diff) | |
system/xboxdrv-linux: Fix 15.0 build.
Apply some patches from arch to fix build with py3 scons on 15.0.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/xboxdrv-linux/xboxdrv-linux.SlackBuild')
| -rw-r--r-- | system/xboxdrv-linux/xboxdrv-linux.SlackBuild | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild index 24abf36b03d6..731080f529fa 100644 --- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild +++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild @@ -26,17 +26,20 @@ # 20220209 bkw: Modified by SlackBuilds.org: handle both possibilities for # the tarball filename. However, this is *still broken* due to scons issues. +# 20220218 acl: Modified by SlackBuilds.org: fix scons issues with arch +# patches. Update homepage to gitlab. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xboxdrv-linux VERSION=${VERSION:-0.8.8} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -54,8 +57,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,24 +73,23 @@ fi set -e -# 20220209 bkw: different clients (browsers, wget, curl) save the file with -# a different filename, depending on whether they respect Content-disposition. -TARBALL=$CWD/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz -[ -e "$TARBALL" ] || TARBALL=$CWD/xboxdrv-6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION -tar xvf $TARBALL --strip-components 1 -C $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION +# thanks arch maintainers +patch -p1 < "$CWD/fix-60-sec-delay.patch" +patch -p1 < "$CWD/scons-py3.patch" +patch -p1 < "$CWD/scons-v4.2.0.patch" +patch -p1 < "$CWD/xboxdrvctl-py3.patch" chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; scons \ CFLAGS="$SLKCFLAGS" \ |