diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/ffmpeg/Manifest | 3 | ||||
| -rwxr-xr-x | media/video/ffmpeg/ffmpeg.SlackBuild | 29 |
2 files changed, 16 insertions, 16 deletions
diff --git a/media/video/ffmpeg/Manifest b/media/video/ffmpeg/Manifest new file mode 100644 index 00000000..5561beed --- /dev/null +++ b/media/video/ffmpeg/Manifest @@ -0,0 +1,3 @@ +MKBUILD ffmpeg.mkbuild 3706 MD5 50ca7ad4b4f31f6af2da896fc34a05d8 RMD160 304a40d779f28b01d3468d0968945ebf2fd42a2e SHA1 5712396054c6dc62e0b496fa382b7a29e54fa2ba SHA256 7e37064f184ee19a84eb2969d889f727f6166aefaabaf2a23c8904539c20676e SHA512 c6a9ea36f8841a9781fb60833a425a7fc841825452c333405d6c2d679957a82dcd87fff8ce589b43abcc88da66d3834d65d65e773fd25a25ad42edbde4467d00 +SLACK-REQUIRED slack-required 96 MD5 8060943a0b388056311c0cda6c6b917a RMD160 7872b5c31988699fbc3d754cae189032f67b5f94 SHA1 af288341846ac139b78c54333b8c5bbec405848b SHA256 8084daa9d474566831b39cab4e24ed94ddee478a5ed4a713f442f1472897b00b SHA512 607ebb19f1fac59d2dd44a69f1f8bf5cb9592d2675f88c44cd91b93e3cca9b5696b1a6fc438bf8b3e0333fdbc43849235a50971f2bc5d7c055ad5f940ed4c34e +SLACKBUILD ffmpeg.SlackBuild 6842 MD5 f0a89b5cf1b4db4e247b1825c51a50d7 RMD160 e3904ac40cd3400ec1950b978e08d608fbb03160 SHA1 114eaac13106857f1df1ee4dcb8c3adba57e6b78 SHA256 70bc1fdea196f5bc1bb0c95ad0170382563d2be3de92eebecfd6460e69a3e2e8 SHA512 06d7b0bc3778f7315132a7e17d485da4d129c0a4f45a8b7859fc849bd09de451e3f37b42d3858c68565b64f61845709a652a2a5d8a93995f4f5ff0035f48e156 diff --git a/media/video/ffmpeg/ffmpeg.SlackBuild b/media/video/ffmpeg/ffmpeg.SlackBuild index 51ad9801..6b8ef359 100755 --- a/media/video/ffmpeg/ffmpeg.SlackBuild +++ b/media/video/ffmpeg/ffmpeg.SlackBuild @@ -17,6 +17,7 @@ # slackbuild for ffmpeg, by Silvio Rhatto # requires: lame faac libx264 # tested: ffmpeg-svn_version +# model: generic.mkSlackBuild $Rev: 805 $ # # Look for slackbuildrc @@ -38,18 +39,19 @@ 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-swscale --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"} NUMJOBS=${NUMJOBS:=""} # Set system libraries' path and optmization flags based on $ARCH 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 +67,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 @@ -97,10 +100,11 @@ PKG_SRC="$PWD/$SND_DIR" 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 @@ -109,15 +113,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 @@ -125,8 +121,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 if [ "$ARCH" == "powerpc" ]; then @@ -202,7 +198,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 |