libquicktime version bump

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2185 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/media/libs/libquicktime/Manifest b/media/libs/libquicktime/Manifest
new file mode 100644 (file)
index 0000000..9c15a73
--- /dev/null
+++ b/media/libs/libquicktime/Manifest
@@ -0,0 +1,5 @@
+DIST libquicktime-1.1.1.tar.gz 1009816 MD5 88df838a450b6c6768819d45bacc0926 RMD160 d028b7c61d218de89103d322519421607e88cd70 SHA1 13666f7b82d8045a03e925966cf8098674814041 SHA256 90efa1a836133680669cac743b726608720ad8f3aadcdb71ff1e29e510bd0d13 SHA512 6358af15c7fd93cab06c963f5a239ca210b973c3f9748f4810a655220940cb47d847ed2ee6aca4cd3ff28a0c052d75209a66f0158f1c7cb8d152baca9443d5aa
+MKBUILD libquicktime.mkbuild 2932 MD5 0aca78209b412de8b722049cd644d726 RMD160 dcc76b66de012f9862417aba95f811cc9a36cde6 SHA1 69bf63bbf669ecd279001c9f5183e2cc7142a2a4 SHA256 b3dcf4192bba27a136183c7a4bff45defdd2683834b756497b130c93bca84b7f SHA512 32f1910b1195688b75a56c0066355f39a2bcae159e279154422db723bfe1a3bddf4d3bc08c65f924bc1af6f3d01a8ffc40a0d31d166ff4857369e5f7261d1ff3
+PATCH libquicktime-0.9.10.diff 1759 MD5 8770acadd1c0d35a55d7e6d62534ba0f RMD160 1e319d133115a4653ed0e86dc0738e0df4b8e529 SHA1 e0037c6950595ebd4a5f7c2be5a91b282c58e216 SHA256 2de7b233a70439206bb5a464df7275875bba5a0885fc0a5dd0eedc3b9eb51e01 SHA512 18007bed2d05a71e400f4153842096e4a2d7cad0918a8ee1d27fc7da8280d6c325f625d0989f2bdf76204e5ee2fff6f31ec86ab92de0a69b17a708f58f667d7b
+SLACK-REQUIRED slack-required 84 MD5 68ac4b8b2d410b368135bffcac189d57 RMD160 6eeb6640b37b4beb999f823aa4444098ff252a9e SHA1 dfb45dfc23a4297d27724ad46f9f212ce62cd8e3 SHA256 820e7fac5fcdf1beef1d6199bcf2a280d463d354207220aaeaa884e30a694bc6 SHA512 30a3b87ceeebf12e1e9537d4d514380c71b6739425ede1b6168e51935720d1feb2471f90e534cd94caaca9923ef677988687e1cb370f5bb1b214ade0c18c5feb
+SLACKBUILD libquicktime.SlackBuild 6136 MD5 3a6463a7c03c54794e42ac1743c8bddd RMD160 2a1cc93d6d0a6384d8cd8064055efc8ae7c30963 SHA1 43b589625d1ffc7422eb70e31c1a6681d670ee5c SHA256 875c774410812bc1aec67113eef9ff4e935de2040ee58833fa64afeed959124b SHA512 97f4580ab08349f01ec200059edb0647167836c1069ecc438863d6afb1e313e1ccdd16c6c6679db3377be48918570ecf9ecb721c07b30f6de37bcdb0cf279793

diff --git a/media/libs/libquicktime/libquicktime.SlackBuild b/media/libs/libquicktime/libquicktime.SlackBuild
index f72baee49c956aa06faac9001d612e9a6a70011e..0034b65035e52630fa7575a4d7667ce700dfac90 100755 (executable)
--- a/media/libs/libquicktime/libquicktime.SlackBuild
+++ b/media/libs/libquicktime/libquicktime.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for libquicktime, by Silvio Rhatto
 # requires: libx264 
-# tested: libquicktime-1.0.3
+# tested: libquicktime-1.1.1
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -31,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="libquicktime"
 PKG_NAME="libquicktime"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.0.3}
+SRC_VERSION=${VERSION:=1.1.1}
 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
@@ -65,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
@@ -91,10 +93,11 @@ 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
@@ -103,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
@@ -119,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
 CFLAGS="$SLKCFLAGS" \