diff options
Diffstat (limited to 'vlc/build/vlc-1.0.SlackBuild')
-rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index d332be4d..9a80f1d1 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007,2008 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007,2008, 2009 Eric Hameleers, Eindhoven, Netherlands # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -141,6 +141,8 @@ # 0.9.8a-3: 28/dec/2008 by Eric Hameleers <alien@slackware.com> # * Updated ffmpeg/x264 snapshots, made it build on x86_64 with the # help of Attila Craciun. +# 20090114-1: 14/jan/2009 by Eric Hameleers <alien@slackware.com> +# * Updated ffmpeg/x264 snapshots, fix default font for x86_64 # # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -165,14 +167,14 @@ PRGNAM=vlc PRGNAM2=mozplugin ARCH=${ARCH:-"i486"} -BUILD=${BUILD:-"3"} +BUILD=${BUILD:-"1"} TAG=${TAG:-"alien"} # SRCVER and VERSION values may be modified later! # If SRCVER is set to "HEAD" then you get a git snapshot, else we look # for the tarball in vlc's releases directory. -SRCVER=${SRCVER:-"0.9.8a"} -#SRCVER=${SRCVER:-"HEAD"} +#SRCVER=${SRCVER:-"0.9.8a"} +SRCVER=${SRCVER:-"HEAD"} VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')} DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS \ @@ -286,8 +288,8 @@ FAAC=1.26 FAAD2=2.6.1 #FFMPEG=20080731 #FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705) -FFMPEG=r16364 # recommended version for 0.9.2 is r15261 (20080908) - # but I use 16364 (20081228) +FFMPEG=r16595 # recommended version for 0.9.2 is r15261 (20080908) + # but I use 16595 (20090114) FLUID=1.0.8 GGI=2.2.2 GII=1.0.2 @@ -309,7 +311,7 @@ UPNP=1.6.6 VCD=0.7.23 X264_SAFE=20080301-2245 # In later versions nasm complains # about 'function hidden' -X264=20081201-2245 # Needs yasm installed +X264=20090113-2245 # Needs yasm installed # Determine what X we're running (the modular X returns the prefix # in the next command, while older versions stay silent): @@ -2123,8 +2125,9 @@ cd $TMP/tmp-$PRGNAM/${PRGNAM}-${SRCVER} echo "" >$OUTPUT/patch-${PRGNAM}.log # Configure a default Slackware TTF font: -cat $SRCDIR/vlc-0.9.0_deffont.patch | sed "s#@@XPREFIX@@#$XPREF#" | patch -p1 \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +cat $SRCDIR/vlc-0.9.0_deffont.patch \ + | sed -e "s#@@XPREFIX@@#$XPREF#" -e "s#@@LIB@@#lib${LIBDIRSUFFIX}#" \ + | patch -p1 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Fix the errors caused by incorrect osd paths: cat $SRCDIR/vlc-0.8.6a_osdmenu_paths.patch | patch -p1 \ @@ -2143,7 +2146,7 @@ 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.8_embedded_video.patch | patch -p1 \ +cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Preparations for building a separate vlc mozilla plugin : @@ -2177,7 +2180,9 @@ else fi # VLC 0.9.6 needs to regenerate libtool (known bug) -rm m4/{lt,lib}*.m4; autoreconf -svif +if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then + rm -f m4/{lt,lib}*.m4; autoreconf -svif +fi sh bootstrap @@ -2371,7 +2376,12 @@ rm -rf $PKG/usr/share/doc cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true # Add all the supporting packages' documentation too: cp -a $VLCDEPSDIR/doc/* $PKG/usr/doc/$PRGNAM-$VERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# Add the SlackBuild script with the values we used for the main variables: +cat $SRCDIR/$(basename $0) | sed \ + -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ + -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ + -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \ + > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -type f -exec chmod 644 {} \; chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/* @@ -2382,10 +2392,8 @@ if [ -d $PKG/usr/man ]; then fi # Strip binaries: -cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -cd - +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Add a package description: mkdir -p $PKG/install |