diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-04-07 21:36:13 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-04-07 21:36:13 +0000 |
| commit | 98aae55af2313644978f36dff105a9c28bcee3d8 (patch) | |
| tree | 53e2a5145bb3258a5e976cfe9d5bee1ee5940725 /pipelight | |
| parent | 7fc0f237a60a4a605c472926d888fff75b1f13a0 (diff) | |
| download | asb-98aae55af2313644978f36dff105a9c28bcee3d8.tar.gz asb-98aae55af2313644978f36dff105a9c28bcee3d8.tar.xz | |
Update to 0.2.6. On 64-bit Slackware, allow 64-bit plugin support.
Diffstat (limited to 'pipelight')
| -rwxr-xr-x | pipelight/build/pipelight.SlackBuild | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pipelight/build/pipelight.SlackBuild b/pipelight/build/pipelight.SlackBuild index a85fa087..675161a7 100755 --- a/pipelight/build/pipelight.SlackBuild +++ b/pipelight/build/pipelight.SlackBuild @@ -44,8 +44,11 @@ # 0.2.4.2-1: 20/jan/2014 by Eric Hameleers <alien@slackware.com> # * After a manual update, patch the install-dependency script # to use Slackware's version of mktemp. -# 0.2.5-1: 22/jfeb2014 by Eric Hameleers <alien@slackware.com> +# 0.2.5-1: 22/feb/2014 by Eric Hameleers <alien@slackware.com> # * Update, together with wine-pipelight 1.7.13. +# 0.2.6-1: 08/apr/2014 by Eric Hameleers <alien@slackware.com> +# * Update, together with wine-pipelight 1.7.17. On 64-bit +# Slackware, enable 64-bit Wine plugin support. # # Run 'sh pipelight.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -54,12 +57,16 @@ # ----------------------------------------------------------------------------- PRGNAM=pipelight -VERSION=${VERSION:-0.2.5} +VERSION=${VERSION:-0.2.6} TRUNKVERSION=$(echo $VERSION | cut -f1,2 -d'.') BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} +# If you do not want wine64 on Slackware64, set this to "no". +# Be sure to match this setting with the wine-pipelight build! +DO_WINE64=${DO_WINE64:-"yes"} + # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -127,6 +134,12 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac +if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then + ARCH_OPTS="--win32-prebuilt --win64-prebuilt --with-win64" +else + ARCH_OPTS="--win32-prebuilt" +fi + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -215,8 +228,9 @@ export CFLAGS="$SLKCFLAGS" --prefix=/usr \ --wine-path=$WPREFIX \ --moz-plugin-path=/usr/lib${LIBDIRSUFFIX}/mozilla/plugins \ - --win32-prebuilt \ --gcc-runtime-dlls="" \ + --show-installation-dialogs \ + ${ARCH_OPTS} \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make SUBDIRS=src/linux $NUMJOBS \ @@ -227,6 +241,9 @@ make SUBDIRS=src/linux DESTDIR=$PKG install \ # Install the pre-built windows binary: mkdir -p $PKG/usr/share/pipelight install -m0755 src/windows/pluginloader.exe $PKG/usr/share/pipelight +if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then + install -m0755 src/windows/pluginloader64.exe $PKG/usr/share/pipelight +fi # Create the doinst.sh script: mkdir -p $PKG/install |