diff options
| author |   Eric Hameleers <alien@slackware.com> | 2009-04-22 19:17:30 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2009-04-22 19:17:30 +0000 |
| commit | 53f57e57e39307332d4c3e407ca39d1e7da80229 (patch) | |
| tree | 6ea9794b845b55bde1b0cc001594836606f4ed46 /vlc | |
| parent | c8f83faab0645a546907eb397fbc699cf8015cde (diff) | |
| download | asb-53f57e57e39307332d4c3e407ca39d1e7da80229.tar.gz asb-53f57e57e39307332d4c3e407ca39d1e7da80229.tar.xz | |
Apparently we need the other x264 patches too
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index 8ba1e52a..4bb0a7cd 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -2182,14 +2182,11 @@ cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \ cat $SRCDIR/vlc_x264_static.diff | patch -p1 \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -# Allow the use of a recent x264 on vlc-0.9.x (fixed in 1.0.0-git) -if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ]; -then - cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log - cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -fi +# Allow the use of recent x264 on vlc-0.9.x and 1.0.0-pre2 (fixed in 1.0.0-git) +cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Fix compilation of mkv plugin on 1.0.0-pre2 (fixed in 1.0.0-git) if [ "$VERSION" == "1.0.0.pre2" ]; then |