diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-06-20 12:45:21 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-06-20 12:45:21 +0000 |
| commit | 754b2edf9c94634d4976f9d26751dd911d9bbbcf (patch) | |
| tree | 32bcfea4536cb696b9883152d0943eb585830d21 /minidlna | |
| parent | 001fcba1ddcaaaa04298b31e8ba3a206fdd58adf (diff) | |
| download | asb-754b2edf9c94634d4976f9d26751dd911d9bbbcf.tar.gz asb-754b2edf9c94634d4976f9d26751dd911d9bbbcf.tar.xz | |
Update to 1.0.25, add patch for compilation against ffmpeg-1.x
Diffstat (limited to 'minidlna')
| -rwxr-xr-x | minidlna/build/minidlna.SlackBuild | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/minidlna/build/minidlna.SlackBuild b/minidlna/build/minidlna.SlackBuild index f7439ade..0c5470f3 100755 --- a/minidlna/build/minidlna.SlackBuild +++ b/minidlna/build/minidlna.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -37,6 +37,8 @@ # seems to stagnate. # 1.0.21-1: 11/aug/2011 by Eric Hameleers <alien@slackware.com> # * Update. +# 1.0.25-1: 20/jun/2013 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh minidlna.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -44,10 +46,8 @@ # # ----------------------------------------------------------------------------- -# Set initial variables: - PRGNAM=minidlna -VERSION=${VERSION:-1.0.21} +VERSION=${VERSION:-1.0.25} #VERSION=${VERSION:-HEAD} [ "$VERSION" = "HEAD" ] && SRCVER=$(date +%Y%m%d) || SRCVER=$VERSION BUILD=${BUILD:-1} @@ -112,12 +112,15 @@ 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 ;; + 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 @@ -128,6 +131,12 @@ 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="" + ;; *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; @@ -198,6 +207,11 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do tar -xvf ${SOURCE[$i]} done cd ${PRGNAM} || cd ${PRGNAM}* + +# Needs a patch to compile against ffmpeg-1.x: +cat $SRCDIR/minidlna_1.0.25_ffmpeg-1.patch | patch -p1 --verbose \ + 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log + chown -R root:root . chmod -R u+w,go+r-w,a+X-s . |