diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-10-29 12:45:53 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-10-29 12:45:53 +0000 |
| commit | c97e7dd6503859e67c71d72688b982e52ea3757a (patch) | |
| tree | cd0823890c5006d6d9cf2f0cfcb697bcf43e798e /vlc | |
| parent | 58ef49ffd61c9a598e06a2c51b485612479746c8 (diff) | |
| download | asb-c97e7dd6503859e67c71d72688b982e52ea3757a.tar.gz asb-c97e7dd6503859e67c71d72688b982e52ea3757a.tar.xz | |
Re-enable embedded video, this works reliably with qt-4.4.3
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index 91f646df..ea57a368 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -2062,6 +2062,10 @@ cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 \ cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +# Re-enable embedded video. With qt.4.4.3 this works reliably: +cat $SRCDIR/vlc-0.9.5_embedded_video.patch | patch -p1 \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log + # Preparations for building a separate vlc mozilla plugin : if [ "$MOZPLUGIN" == "YES" ]; then echo "+++ Building mozilla plugin using $MOZBROWSER sdk +++" @@ -2079,7 +2083,7 @@ else fi # Only enable DLL loader on ELF ix86 platforms: -if [ "$ARCH" == "i386" -o "$ARCH" == "i486" ]; then +if [ "$ARCH" == "i486" ]; then DO_LOADER="--enable-loader" else DO_LOADER="" @@ -2166,9 +2170,9 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \ --enable-swscale \ ${DO_MOZPLUGIN} \ ${DO_LOADER} \ - --program-prefix="" \ - --program-suffix="" \ - --build=i486-slackware-linux \ + --program-prefix= \ + --program-suffix= \ + --build=$ARCH-slackware-linux \ AVCODEC_LIBS="-lavcodec -lbz2 -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lavutil -lvorbis -lm -logg" \ AVCODEC_CFLAGS="" \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log |