From f4b5164186bb445931c0abc9eb2e475b7d1b795f Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Mon, 4 May 2009 13:54:56 +0000
Subject: libquicktime: add a fix from upstream to build with ffmpeg trunk
 (thanks to gentoo)

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2190 370017ae-e619-0410-ac65-c121f96126d4
---
 media/video/ffmpeg/Manifest          | 22 +++++++++++++++++++++-
 media/video/ffmpeg/ffmpeg.SlackBuild |  8 +++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'media/video')

diff --git a/media/video/ffmpeg/Manifest b/media/video/ffmpeg/Manifest
index 132af433..c7a52017 100644
--- a/media/video/ffmpeg/Manifest
+++ b/media/video/ffmpeg/Manifest
@@ -1,3 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MKBUILD ffmpeg.mkbuild 3750 MD5 034cf705fa7295caaaead716949b8e00 RMD160 a22a5387cf5287915964b4ead2dbf11f48b5c626 SHA1 53bba99a9298c00ab1f4acf293831fc47c135648 SHA256 1d408f5f07ea9826373949789b12ef96510a6f7ffc88329a13fd894476e28fdb SHA512 c145180bdce5288827135e7134251592e2cd207846b50ba24fe1b953f092567381aa50391d446764ca324ae922961dc71580b094ba63893239cc446d1a4d76f4
 SLACK-REQUIRED slack-required 106 MD5 b7c18a5ca91581acda9bb7bf750d6b3b RMD160 292eb967eaf437dc0a29004fc0cd22af3fcdc019 SHA1 4d75e5e5dcbe70bc44ab134cade77d57c88a5399 SHA256 6df14409e362af22858d675914390f400ee4991f972785633d185fbece3fba80 SHA512 38a768c04892c33d228db617089faa26537e9cf712b6db195bb039cbca6ff43f6a5dfd3e2e806a8a337b35da9f94aaa45cf718f19c82b55d4add936e936e86a4
-SLACKBUILD ffmpeg.SlackBuild 8803 MD5 8944e3c4e9f351c4c836305d805e2174 RMD160 11b576824938d6780480f1cf8b3e97bb2fc30676 SHA1 a808153ee570d71cf796486adfad90aa314e5fdf SHA256 2a1194adea09ed8b04d90af58e6a05e5ca8cd73f15a889b95f249d50820182b9 SHA512 c767a1a97e4a6305922e5aa15d6b473fd44675551f2d5f4c1f0e0caeeb6008b759f273182f3b9659a7c3b8947949ec87e0e21e5d51cb405afff69c3596a319a3
+SLACKBUILD ffmpeg.SlackBuild 8887 MD5 b29bf557844050996b53be68d1eeae96 RMD160 e56affde334dcefdc2e35a1d653b4651e98cc543 SHA1 04b1383733bcd988737e6965b8d69cef4bbe2a85 SHA256 1fbd7d259f71a3472c0d7a6253702c653b5f4c745eccd568437031c5e196b907 SHA512 ab27e7ba5f7b23172a3bcaa1145429bd7309558dafb4112933e1531d3db96d04e8335f7fc47d437e12e26662550eff5ee35b4453158d827f3602f43c579c6188
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/hLnAAoJEEHL93ESzgeiNh8P/1JgL3/Q4QUVMeuKw/vplqk7
+kMN8BvwUqR9pctkrFZw6re2YhZu/eCtANl7sX8TyNRbEY95razTaLqBAY3omNLhT
+sNaRFKuNRyHbC9FWinKjl8Ce+0hvFx1yWqvNk9J40X6pO3rSMn6n6hYgQ88bv9ra
+R7IvxTXRChcv9NPsf9JMtyqquLeZ2ru+6X1oJHtVX+klvkEw4V8iBIireoCACjJx
++F7tgWBYiWARw4SHD7MRBILzeSz1CbHqQmBW5osWoL6s+W/fJ63axyULx45SBoUC
+9NZpVuPloXtCMPMzUCsUAa9SDnLpYJbe8bDr7Mf1e+VqQ91PpiuF8LZJt/whuiSn
+DSUz+DpQAoVQbSNH58sBurQDx3vVSTZd2JwpuSo+xykuA+i/koSI2jhWq2Pdmz7Z
+ueqOSPMrRgtN107kxWvG1okBxiJayBmfzaqElyGoEPJcR4YK48gyT0cpBfoZ4ks1
+oMatiqHrlyAaor0LM4Z7jSJFQEgw9JhTcJOL2zoN+NOSFR4ineJrhTuMCYNbPwMe
+4TdtFqaIIbwno09+PEdsuU8I6vwjeYH8ODPDEL0pj2ztO7SnexxhHo9lsltO9BMe
+cBBZjvOUScUZhDaIXDhvAKj6ij+Datwh9NkoNLag6zv2WcIhT3dkHhnexkrlXHP+
+3LH2uTLBhQy5ZG6P7ABV
+=txrH
+-----END PGP SIGNATURE-----
diff --git a/media/video/ffmpeg/ffmpeg.SlackBuild b/media/video/ffmpeg/ffmpeg.SlackBuild
index 77d4627e..49c0b590 100755
--- a/media/video/ffmpeg/ffmpeg.SlackBuild
+++ b/media/video/ffmpeg/ffmpeg.SlackBuild
@@ -15,9 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for ffmpeg, by Silvio Rhatto
-# requires: lame faac libx264 faad2 
+# requires:  
 # tested: ffmpeg-svn_version
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -39,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/ffmpeg"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="$EXTRA_AC_FLAGS --enable-shared --enable-pthreads --enable-x11grab --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libfaac --enable-libfaad --enable-libx264 --enable-postproc --enable-gpl --enable-nonfree"}
@@ -263,7 +264,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
-- 
cgit v1.2.3