diff options
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index 8be53c5d..6c5fc9c2 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -86,6 +86,7 @@ MATROSKA=0.8.1 MPCDEC=1.2.5 MPEG2DEC=0.4.1 SHOUT=2.2.2 +SPEEX=1.0.5 TWOLAME=0.3.10 VCD=0.7.21 #WXGTK=2.8.2 << does not work @@ -212,6 +213,10 @@ SRCURL[24]="http://dl.sourceforge.net/libcddb/libcddb-${CDDB}.tar.bz2" SOURCE[25]="$SRCDIR/libshout-${SHOUT}.tar.gz" SRCURL[25]="http://downloads.us.xiph.org/releases/libshout/libshout-${SHOUT}.tar.gz" +# SPEEX is used by libshout and vlc: +SOURCE[26]="$SRCDIR/speex-${SPEEX}.tar.gz" +SRCURL[26]="http://downloads.us.xiph.org/releases/speex/speex-${SPEEX}.tar.gz" + ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -884,6 +889,31 @@ cd - } # ----------------------------------------------------------------------------- +# Compile speex codec +# ----------------------------------------------------------------------------- +make_speex() +{ +echo -e "**\n** speex ...\n**" +cd $TMP/tmp-$PRGNAM/speex-$SPEEX +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="$SLKLDFLAGS" \ +./configure --prefix=/usr \ + --enable-static \ + --disable-shared \ + --program-prefix="" \ + --program-suffix="" \ + --build=$ARCH-slackware-linux \ + 2>&1 | tee $OUTPUT/configure-${PRGNAM}_speex.log +make 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log +# Install speex into a temp location so libshout vlc can pickup the library +echo -e "\n**\n**\n" +make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \ + 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speex.log +cd - +} + +# ----------------------------------------------------------------------------- # Compile libshout # ----------------------------------------------------------------------------- make_shout() @@ -893,7 +923,9 @@ cd $TMP/tmp-$PRGNAM/libshout-$SHOUT CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ +PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ ./configure --prefix=/usr \ + --enable-speex \ --enable-static \ --disable-shared \ --program-prefix="" \ @@ -960,6 +992,7 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ --enable-v4l \ --enable-caca \ --enable-aa \ + --enable-galaktos \ --enable-esd \ --enable-arts \ --enable-mad \ @@ -973,6 +1006,8 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ --enable-mpc \ --enable-twolame \ --enable-daap \ + --enable-speex \ + --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \ --enable-shout \ --enable-dirac \ --enable-faad \ @@ -1009,7 +1044,6 @@ cd - # --enable-cyberlink \ # --enable-pda \ # --enable-xosd \ -# --enable-galaktos \ # --enable-goom \ } @@ -1145,9 +1179,12 @@ make_mpeg2dec make_mpcdec make_twolame make_daap -make_shout make_dirac +# Speex before shout and vlc: +make_speex +make_shout + # And finally, let vlc collect all of the above into one app: make_vlc || exit 1 |