From c70453376604a3a1625770c3ec58cc8694eca4e0 Mon Sep 17 00:00:00 2001 From: rafael2k Date: Thu, 2 Apr 2009 15:23:25 +0000 Subject: faac and faad2 version bump git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2133 370017ae-e619-0410-ac65-c121f96126d4 --- media/libs/faac/Manifest | 5 +++++ media/libs/faac/faac.SlackBuild | 42 +++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 media/libs/faac/Manifest (limited to 'media/libs/faac') diff --git a/media/libs/faac/Manifest b/media/libs/faac/Manifest new file mode 100644 index 00000000..968d1223 --- /dev/null +++ b/media/libs/faac/Manifest @@ -0,0 +1,5 @@ +DIST faac-1.28.tar.gz 678891 MD5 80763728d392c7d789cde25614c878f6 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b +MKBUILD faac.mkbuild 2720 MD5 474f7bcc06eb4396f983efce7fd0bf54 RMD160 984af43577bd7ab29ae42972c1378617650d529d SHA1 2920ddcd948f218a29d8494b86a804581904175b SHA256 8d41b2907bd6c2e64ff4d21c7a829ebad32f55a0f74238dee2b5a50895dfb6a2 SHA512 6f0dd4faed330a442b6be046f2edeae356c934bc5b31bcc336a9ab7d6778d2b589c6068d90b88ba24e6d1c5a7abeef2f373130db603e58173dd94a910a6b695f +PATCH faac-1.24.diff.gz 296212 MD5 5f53b4ee031873dffb1101b59aa05bcf RMD160 9b16bd34aa810661fb69674d76191df8507264a0 SHA1 6e66751f8eecd1e0bc439482879a93d26de97470 SHA256 ffd125a90ffb2f7767329a6b4ab682864abc9bb498032044e775a3c8b33eb7bf SHA512 5344c57f2ecee2edecbbb6c5593d6891f03e19c96efdbeb37950826d7000746fd2e0cd613d2b2922ded21587dce884f0740bf3edea6966c58e5dd6db86d31a3e +PATCH faac-1.25.diff.gz 290557 MD5 4ab74a1aef1353319e1c9090759f254b RMD160 e950088ed15b0e57b7d9ec580cdd4c76b3b23842 SHA1 a99184f42e8ce9d4e77c8df9769029b12a416c37 SHA256 55f1ebd31ca692c0531ea169582d8ffaefc7662cb4291bfd91ad16be42093c3d SHA512 3139d989036faaf214977ec32d3048aac5d294a27abe1bf8b87cb5f7bf35b900e9bc3b7b2966dbafc12c89c3551f0a71d97812c5c41b568e17767bda8db396d8 +SLACKBUILD faac.SlackBuild 5789 MD5 c12494a2af257be2082804f6cdd72f20 RMD160 87e24a0453d83624034ffea0057873e501403dc8 SHA1 1b7887d6713199e90fa7807c7e5d64b8ab7e21ec SHA256 d1b23a2d57f5bf0d0dad8c29d3acd2f75240ecd1f9c084aed47c708e7042813c SHA512 1f02365fc37356a06be3d9a25fc954e7dea9fe87fba13f73f74ac5df10dc02ff99a4f34dfea75ce39a6d0f86a22445a1632faaf15bb8ae476f505b2df422ed08 diff --git a/media/libs/faac/faac.SlackBuild b/media/libs/faac/faac.SlackBuild index 4b467de2..48d1d78b 100755 --- a/media/libs/faac/faac.SlackBuild +++ b/media/libs/faac/faac.SlackBuild @@ -10,13 +10,14 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General # Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for faac, by Silvio Rhatto # requires: -# tested: faac-1.25, faac-1.26 +# tested: faac-1.28 +# model: generic.mkSlackBuild $Rev: 784 $ # # Look for slackbuildrc @@ -31,7 +32,7 @@ CWD="$(pwd)" SRC_NAME="faac" PKG_NAME="faac" ARCH=${ARCH:=i486} -SRC_VERSION=${VERSION:=1.26} +SRC_VERSION=${VERSION:=1.28} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1rha} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME @@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""} LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + SLKCFLAGS="-O2 -march=i386 -mtune=i686" elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mcpu=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686" elif [ "$ARCH" = "s390" ]; then @@ -57,6 +58,7 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIR="$PREFIX/lib64" + LDFLAGS="-L/lib64 -L/usr/lib64" fi # Set error codes (used by createpkg) @@ -64,6 +66,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 +ERROR_MANIFEST=43; # Clean up any leftovers of previous builds rm -rf "$PKG_WORK" 2> /dev/null @@ -86,14 +89,15 @@ fi # Untar cd "$PKG_WORK" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR -PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`" +PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" cd "$PKG_SRC" # Patch source -patches=" +patches=" [[PATCH URLS]] $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff" for patch in $patches; do + patch="`basename $patch`" if [ -f "$CWD/$patch" ]; then patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH elif [ -f "$CWD/patches/$patch" ]; then @@ -102,15 +106,7 @@ for patch in $patches; do gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH elif [ -f "$CWD/patches/$patch.gz" ]; then gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH - fi -done - -if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then - for patch_url in [[PATCH URLS]]; do - patch="`basename $patch_url`" - if [ ! -s "$SRC_DIR/$patch" ]; then - wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET - fi + elif [ -f "$SRC_DIR/$patch" ]; then if [ "`basename $patch .gz`" != "$patch" ]; then gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH elif [ "`basename $patch .bz2`" != "$patch" ]; then @@ -118,8 +114,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then else patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH fi - done -fi + fi +done # Configure sh ./bootstrap @@ -156,9 +152,9 @@ done mkdir -p "$PKG/install" || exit $ERROR_MKDIR cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must +# on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. @@ -181,6 +177,6 @@ cd "$PKG" makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories if requested -if [ "$CLEANUP" == "yes" ]; then +if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then rm -rf "$PKG_WORK" "$PKG" fi -- cgit v1.2.3