From 56106258da440c6f89556662812df5b497eec20c Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 26 May 2010 23:00:11 -0500 Subject: desktop/recordmydesktop: Fixed build on 13.1. Thanks to Gentoo for the (obvious in hindsight) tip. --- desktop/recordmydesktop/recordmydesktop.SlackBuild | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'desktop/recordmydesktop/recordmydesktop.SlackBuild') diff --git a/desktop/recordmydesktop/recordmydesktop.SlackBuild b/desktop/recordmydesktop/recordmydesktop.SlackBuild index 6f743637f4..9158a25d73 100644 --- a/desktop/recordmydesktop/recordmydesktop.SlackBuild +++ b/desktop/recordmydesktop/recordmydesktop.SlackBuild @@ -9,10 +9,19 @@ PRGNAM=recordmydesktop VERSION=0.3.8.1 -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -27,6 +36,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -44,6 +56,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fixup xextproto rearrangement issues - thanks to the Gentoo guys for the tip +sed -i -e 's:shmstr.h:shmproto.h:g' src/rmd_{getzpixmap.c,update_image.c} + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ -- cgit v1.2.3