From 417d6031bafdf71db419fbd004b382a1db18b265 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 29 Dec 2021 12:04:22 +0000 Subject: faac: updated for Slackware 15.0 --- faac/build/faac.SlackBuild | 73 +++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/faac/build/faac.SlackBuild b/faac/build/faac.SlackBuild index ed5a63b5..0037530f 100755 --- a/faac/build/faac.SlackBuild +++ b/faac/build/faac.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2009,2010 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2021 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -27,7 +27,7 @@ # By: Eric Hameleers # For: faac # Descr: AAC audio encoder -# URL: http://www.audiocoding.com/ +# URL: https://sourceforge.net/projects/faac # Needs: # Changelog: # 1.28-1: 19/May/2009 by Eric Hameleers @@ -36,9 +36,11 @@ # * Rebuild. # 1.28-3: 02/jun/2010 by Eric Hameleers # * Rebuilt for Slackware 13.1. +# 1.30-1: 29/dec/2021 by Eric Hameleers +# * Updated for Slackware 15.0. # # Run 'sh faac.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'. # # ----------------------------------------------------------------------------- @@ -46,9 +48,10 @@ # Set initial variables: PRGNAM=faac -VERSION=${VERSION:-1.28} -BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:" -j4 "} +SRCVER=${SRCVER:-1_30} +VERSION=$(echo $SRCVER | tr _ .) +BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} DOCS="AUTHORS COPYING ChangeLog NEWS README TODO" @@ -61,8 +64,8 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" -SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" +SOURCE="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2" +SRCURL="https://github.com/knik0/${PRGNAM}/archive/refs/tags/${SRCVER}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -70,24 +73,34 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; - *) SLKCFLAGS="-O2" + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; + *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} + SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + ;; +esac + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; esac # Exit the script on errors: @@ -107,17 +120,18 @@ mkdir -p $TMP/tmp-$PRGNAM # location to build the source mkdir -p $PKG # place for the package to be built rm -rf $PKG/* # always erase old package's contents rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build -rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log +rm -rf $OUTPUT/{bootstrap,configure,make,install,error,makepkg}-$PRGNAM.log # remove old log files # Source file availability: if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" - wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true + wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -129,6 +143,7 @@ if ! [ -f ${SOURCE} ]; then fi fi + if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 @@ -143,16 +158,18 @@ echo "++" cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} -cd ${PRGNAM}-${VERSION} - -# Newer gcc/glibc will bail out otherwise: -cat $SRCDIR/faac_gcc44.diff | patch -p1 --verbose \ - 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +cd ${PRGNAM}-${SRCVER} chown -R root:root . chmod -R u+w,go+r-w,a+X-s . echo Building ... +# Fix for automake >= 1.13 +sed -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|" -i configure.ac + +./bootstrap \ + 2>&1 | tee $OUTPUT/bootstrap-${PRGNAM}.log + LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -165,7 +182,6 @@ CFLAGS="$SLKCFLAGS" \ --enable-static \ --enable-shared \ --enable-drm \ - --with-mp4v2 \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux \ @@ -188,6 +204,9 @@ if [ -d $PKG/usr/man ]; then for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -198,9 +217,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -- cgit v1.2.3-65-gdbad