From 28896d79e94f53e6746d1d5c843e8f53e1786288 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 13 Aug 2012 20:36:19 +0000 Subject: Update to 0.6.0 for Slackware 14 --- phonon-vlc/build/phonon-vlc.SlackBuild | 44 ++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'phonon-vlc') diff --git a/phonon-vlc/build/phonon-vlc.SlackBuild b/phonon-vlc/build/phonon-vlc.SlackBuild index 3085fe3a..b0680340 100755 --- a/phonon-vlc/build/phonon-vlc.SlackBuild +++ b/phonon-vlc/build/phonon-vlc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2010 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,9 +32,11 @@ # Changelog: # 20101213-1: 14/Dec/2010 by Eric Hameleers # * Initial build. +# 0.6.0-1: 13/aug/2012 by Eric Hameleers +# * Update for Slackware 14 (note: does not compile on 13.37). # # Run 'sh phonon-vlc.SlackBuild' to build a Slackware package. -# The package (.tgz) and .txt file as well as build logs are created in /tmp . +# The package (.txz) and .txt file as well as build logs are created in /tmp . # Install it using 'installpkg'. # # ----------------------------------------------------------------------------- @@ -51,7 +53,7 @@ TAG=${TAG:-alien} # "yyyymmdd" - like "20101126", if want code for a specific day checked out, # "X.Y.Z" - like "3.2.99.3", meaning git release tag. #SRCVER=${SRCVER:-HEAD} -SRCVER=${SRCVER:-20101214} +SRCVER=${SRCVER:-0.6.0} # If we pull a git shapshot, use today's date as the VERSION: if [ "$SRCVER" = "HEAD" ]; then @@ -71,8 +73,8 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" -SRCURL="" -GITURI="git://gitorious.org/phonon/${PRGNAM}.git" +SRCURL="http://ftp.kde.org/stable/phonon/phonon-backend-vlc/${VERSION}/src/phonon-backend-vlc-${VERSION}.tar.xz" +GITURI="git://anongit.kde.org/phonon-${PRGNAM}" # Use the src_checkout() function if no downloadable tarball exists. # This function checks out sources from SVN/CVS and creates a tarball of them. @@ -126,12 +128,16 @@ src_checkout() { ## # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + armv6hl) export ARCH=$MARCH ;; + armv5hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -142,11 +148,25 @@ case "$ARCH" in x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv5hl) SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; esac +case "ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -206,7 +226,7 @@ echo "++" cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} -cd ${PRGNAM}-${VERSION} +cd phonon-*vlc-${VERSION} chown -R root:root . chmod -R u+w,go+r-w,a+X-s . @@ -243,9 +263,9 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep -- cgit v1.2.3