aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4>2009-05-03 05:10:40 +0000
committerrafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4>2009-05-03 05:10:40 +0000
commitd66d255304fe4af447820185611c6ee18aeb893c (patch)
tree1f496b127e98103b2fb7a942463c0fbbd3c01c92
parentcf1ff0094e16754230fff1a6d1abff0a0f7bde48 (diff)
downloadslackbuilds-d66d255304fe4af447820185611c6ee18aeb893c.tar.gz
slackbuilds-d66d255304fe4af447820185611c6ee18aeb893c.tar.bz2
ffmpeg fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2188 370017ae-e619-0410-ac65-c121f96126d4
-rw-r--r--media/video/ffmpeg/Manifest24
-rwxr-xr-xmedia/video/ffmpeg/ffmpeg.SlackBuild10
2 files changed, 6 insertions, 28 deletions
diff --git a/media/video/ffmpeg/Manifest b/media/video/ffmpeg/Manifest
index 841c375e..132af433 100644
--- a/media/video/ffmpeg/Manifest
+++ b/media/video/ffmpeg/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MKBUILD ffmpeg.mkbuild 3733 MD5 6525954e91b607b4cf3e250c4fc20f2c RMD160 bf6ffa6779120d46e9a58e698ab61a38e666105e SHA1 0bbc98c50b6440967cd336fba9fb8697891d5653 SHA256 3e6732ad5b7d70e167e5f5a8f2a93f1d44f63adb4c66772ebd87d3d73a1da03c SHA512 db3559c7afafa8ef775a43d3b73ce726464bbafcf5347fd50f37b1950a02db9b3312f3e9837a548bbdfb159fc18e38a089464d19fcb015032059a6fb853a2000
+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 8870 MD5 21786e94c549b56b23be201af7a5e0b1 RMD160 991399d4e0dfd254991c189a72d1ee66398f2f75 SHA1 bb348bfb5f8f5e2820ad8c79548a9014d896b664 SHA256 e1c2060dddd7fd2143784688402c2e205b5fcfddc3f706c8a1bc633597d29478 SHA512 83c673e5ddb75b93be09d7e374bc5e8b2d76a5feb50223c648b6b8e8a1d562cba7cd1a8526c1afe4d835694d9efc82bd99dee3c3b115b88d06a0572b458b8b53
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iQIcBAEBAgAGBQJJ807qAAoJEEHL93ESzgei6pkP/jBzOIVRoPjbJdzVCsWnZD1h
-mrVwyZ1SERRWlyvJI4Vp66BAQJS+oOALrdeVk/TotV+AuhhmKfodXTBUhL3Y4nbr
-bqsH/sVp0BUDstjmM8db15fQzzRqBOZUHSLbAz8UHSMYgvPm53VMH7ha9z+/kNEa
-HtSu0IusdhqtLp9trv2eVlrQYBnzoyAtzlcjaSgR12Vi0ZQWk61eJRwLl8FTS9ZK
-oJ4YmWAkT/bjQfrp3J19W9cEiojlF6s+Jnzt5AfW0ss5X2+9eXnxx4vk4D7kAbTX
-+DoKjLFeq1AsOfCRuoY1ZId+ENA6TAl22ojt+FCWQ6gc8QWSApBSzq0n2JLKqTgD
-tD/BIaX010t4/DpB2TKazE5GfYwn51DHpP6xt4lwpL3XKnYg47hIg3RjZnr0YoME
-FYqGpEZY7djWLvz4Ryl1rYqSOjVS4RWnGPRCJIspqrom1XVDDz+PXrsHVOR7OidT
-2xoqxbqZIbdHRel+m/yi4j4RnQ64iohMSO1uhR/IWzRTqgX2fUbQhAb7bxcsM65s
-AuBgq0cWDG1Cr1GelexkHTl2hyJcHfL363BCtZ5XzNRzw6iq6kLQJYMOPLhAR05p
-I24kpFlTDWqlicS/jYmRQ8l6VGYwor0GPNcrYMa8LLYmXxaJr6jvIS/tEoBbp8uI
-y5FCPRcKpXAyQLiLczIE
-=A+LX
------END PGP SIGNATURE-----
+SLACKBUILD ffmpeg.SlackBuild 8803 MD5 8944e3c4e9f351c4c836305d805e2174 RMD160 11b576824938d6780480f1cf8b3e97bb2fc30676 SHA1 a808153ee570d71cf796486adfad90aa314e5fdf SHA256 2a1194adea09ed8b04d90af58e6a05e5ca8cd73f15a889b95f249d50820182b9 SHA512 c767a1a97e4a6305922e5aa15d6b473fd44675551f2d5f4c1f0e0caeeb6008b759f273182f3b9659a7c3b8947949ec87e0e21e5d51cb405afff69c3596a319a3
diff --git a/media/video/ffmpeg/ffmpeg.SlackBuild b/media/video/ffmpeg/ffmpeg.SlackBuild
index e362f723..77d4627e 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:
+# requires: lame faac libx264 faad2
# tested: ffmpeg-svn_version
-# model: generic.mkSlackBuild $Rev: 805 $
+# model: generic.mkSlackBuild $Rev: 784 $
#
# Look for slackbuildrc
@@ -39,10 +39,9 @@ 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"}
+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"}
NUMJOBS=${NUMJOBS:=""}
# Set system libraries' path and optmization flags based on $ARCH
@@ -264,8 +263,7 @@ fi
# Build the package
cd "$PKG"
-mkdir -p $REPOS/$SLACKBUILD_PATH
-makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+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" ] || [ "$1" = "--cleanup" ]; then