diff options
author | Eric Hameleers <alien@slackware.com> | 2009-07-30 06:45:06 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-07-30 06:45:06 +0000 |
commit | e6d1b76c8022ff1a5da9ef64532aa2fb0bc22158 (patch) | |
tree | f664676aa822192c34d99ade226a0bfc8c96359c /vlc | |
parent | 02e5d7186f2c690ca90d048b88295ff88e2cb454 (diff) | |
download | asb-e6d1b76c8022ff1a5da9ef64532aa2fb0bc22158.tar.gz asb-e6d1b76c8022ff1a5da9ef64532aa2fb0bc22158.tar.xz |
Fix the swscale plugin
Diffstat (limited to 'vlc')
-rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index da1fbd1a..8c5da4fb 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -172,6 +172,8 @@ # metafetcher and interface plugins. By default, this script # no longer links Qt4 statically and instead links against an # already installed Qt libray. +# 1.0.1-2: 30/jul/2009 by Eric Hameleers <alien@slackware.com> +# * Fix the swscale plugin # # Run 'sh vlc.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -196,7 +198,7 @@ PRGNAM=vlc PRGNAM2=mozplugin ARCH=${ARCH:-"i486"} -BUILD=${BUILD:-"1"} +BUILD=${BUILD:-"2"} TAG=${TAG:-"alien"} # SRCVER and VERSION values may be modified later! @@ -266,12 +268,6 @@ STATIC_QT4=${STATIC_QT4:-"NO"} # Note: I _strongly_ suggest you compile ffmpeg statically! STATIC_FFMPEG=${STATIC_FFMPEG:-"YES"} -# My build box has barely room to build QT4 so when I set SPACE_CONSTRAINED -# to "YES" the full 800MB of qt4 source tree will be deleted after compilation -# and installation into the $VLSDPEPS directory so that I do not run out of -# space further down the path... -SPACE_CONSTRAINED=${SPACE_CONSTRAINED:-"NO"} - # By default build the Mozilla plugin. # You can disable building the Mozilla plugin by defining MOZPLUGIN="NO": MOZPLUGIN=${MOZPLUGIN:-"YES"} @@ -1038,13 +1034,10 @@ fi cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} -## The ffmpeg HEAD of early sep 2008 needs this patch: -#( cd libswscale -# cat $SRCDIR/ffmpeg_libswscale_head.patch | patch -p0 --verbose \ -# 2>&1 | tee $OUTPUT/patch-${PRGNAM}_ffmpeg.log -#) - if [ "$ARCH" = "x86_64" ]; then + # This patch fixes the swscale plugin: + cat $SRCDIR/ffmpeg_x86_64_asm.patch | patch -p1 --verbose \ + 2>&1 | tee $OUTPUT/patch-${PRGNAM}_ffmpeg.log ARCHOPTS="--disable-mmx \ --disable-mmx2 \ --host-cflags=\"-fPIC\"" @@ -1102,9 +1095,6 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log make install-libs install-headers \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ffmpeg.log -# Need this to link vlc successfully on x86_64: -strip $VLCDEPSDIR/usr/lib/libswscale.a - # Add DOCS to the vlcdeps to have it added to vlc package later: mkdir -p $VLCDEPSDIR/doc/ffmpeg/ cp COPYING* CREDITS Changelog MAINTAINERS README \ @@ -2660,8 +2650,6 @@ else # qt4 is used for the vlc gui: if [ "$STATIC_QT4" = "YES" -o "$STATIC_QT4" = "yes" ]; then make_qt4 - # These 800MB are too much for my virtual machine : - [ "${SPACE_CONSTRAINED}" == "YES" ] && rm -rf $TMP/tmp-$PRGNAM/qt-x11-opensource-src-${QT4} fi # Additional libraries that vlc will use: |