Adding libupnp (client only in VLC) to the mix

1 files changed, 41 insertions, 1 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index e4067872..851e9f4d 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -169,6 +169,7 @@ SHOUT=2.2.2
 SPEEX=1.2beta3
 THEORA=1.0beta3
 TWOLAME=0.3.12
+UPNP=1.6.6
 VCD=0.7.23
 #WXGTK=2.8.7 # <-- does not work
 WXGTK=2.6.4
@@ -399,6 +400,11 @@ SOURCE[35]="$SRCDIR/libtheora-${THEORA}.tar.gz"
 SRCURL[35]="http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz"
 SRCPAT[35]="NO"
 
+# Universal Plug'n'Play
+SOURCE[36]="$SRCDIR/libupnp-${UPNP}.tar.bz2"
+SRCURL[36]="http://downloads.sourceforge.net/pupnp/libupnp-${UPNP}.tar.bz2"
+SRCPAT[36]="NO"
+
 # CSS decoding- VLC can do without if you install an external libdvdcss package.
 #SOURCE[XX]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
 #SRCURL[XX]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
@@ -733,7 +739,7 @@ fi
 cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG}
 CFLAGS="$SLKCFLAGS -fomit-frame-pointer" \
 CXXFLAGS="$SLKCFLAGS -fomit-frame-pointer" \
-LDFLAGS="$SLKLDFLAGS" \
+LDFLAGS="$SLKLDFLAGS -lbz2" \
 ./configure --prefix=/usr \
             ${USE_PATENTED} \
             --enable-libvorbis \
@@ -742,6 +748,8 @@ LDFLAGS="$SLKLDFLAGS" \
             --enable-postproc \
             --enable-pthreads \
             --disable-ffserver \
+            --disable-ffplay \
+            --enable-memalign-hack \
             --disable-debug \
             --disable-shared \
             --disable-swscale \
@@ -1173,6 +1181,36 @@ make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \
 cd -
 }
 
+
+# -----------------------------------------------------------------------------
+# Compile libupnp
+# -----------------------------------------------------------------------------
+make_upnp()
+{
+echo -e "**\n**  libupnp  ...\n**"
+cd $TMP/tmp-$PRGNAM/libupnp-$UPNP
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
+./configure --prefix=/usr \
+            --enable-static \
+            --disable-shared \
+            --enable-client \
+            --disable-webserver \
+            --disable-samples \
+            --disable-debug \
+            --program-prefix="" \
+            --program-suffix="" \
+            --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}_upnp.log
+make  2>&1 | tee $OUTPUT/make-${PRGNAM}_upnp.log
+# Install libupnp into a temp location so vlc can pickup the library
+echo -e "\n**\n**\n"
+make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_upnp.log
+cd -
+}
+
 # -----------------------------------------------------------------------------
 # Compile dirac
 # -----------------------------------------------------------------------------
@@ -1661,6 +1699,7 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-mpc \
             --enable-twolame \
             --enable-daap \
+            --enable-upnp \
             --enable-speex \
             --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \
             --enable-shout \
@@ -1882,6 +1921,7 @@ make_mpeg2dec
 make_mpcdec
 make_twolame
 make_daap
+make_upnp
 make_dirac
 make_x264
 make_goom