diff options
| author |   Eric Hameleers <alien@slackware.com> | 2007-04-09 23:45:20 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2007-04-09 23:45:20 +0000 |
| commit | b196f25ccfe423c1b365b83427874e83b83b21cb (patch) | |
| tree | 9fa66b863cb1309e00529a9fb682395ff849d85e /vlc | |
| parent | 6f9a5540f08261d5a7ff67b5424df37d3b67b304 (diff) | |
| download | asb-b196f25ccfe423c1b365b83427874e83b83b21cb.tar.gz asb-b196f25ccfe423c1b365b83427874e83b83b21cb.tar.xz | |
Fixes for the correct generation of a plugin package... also try to get rid of the libdvdcss dependency in the plugin
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index e15b56e0..98781803 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -104,7 +104,7 @@ SHOUT=2.2.2 SPEEX=1.0.5 TWOLAME=0.3.10 VCD=0.7.21 -#WXGTK=2.8.2 << does not work +#WXGTK=2.8.2 <-- does not work WXGTK=2.6.3 X264=20070408-2245 XVID=1.1.2 @@ -754,6 +754,9 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdread.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdread.log +# Now, remove the shared libdvdcss lib, otherwise the mozilla plugin will +# have an unwanted dependency on it. +rm -f `pwd`/../vlcdeps/lib/libdvdcss.so* cd - } @@ -1205,17 +1208,16 @@ cd - } # ----------------------------------------------------------------------------- -# This routine does all the work of setting up the package contents -# and creating the actual Slackware package in $OUTPUT +# These routines do all the work of setting up the package contents +# and creating the actual Slackware packages in $OUTPUT # ----------------------------------------------------------------------------- build_mozplugin() { -# Get the plugin file from the vlc install directory and cleanup overthere: +cd $TMP/tmp-$PRGNAM/${PRGNAM}-${VERSION} +# Get the plugin file from the vlc build directory: mkdir -p $PKG2/usr/lib/mozilla/plugins/ -mv -f $PKG/usr/lib/mozilla/plugins/libvlcplugin.so \ - $PKG2/usr/lib/mozilla/plugins/ -rm -rf $PKG/usr/lib/mozilla +cp -a ./mozilla/libvlcplugin.so $PKG2/usr/lib/mozilla/plugins/ strip --strip-unneeded $PKG2/usr/lib/mozilla/plugins/libvlcplugin.so mkdir -p $PKG2/install @@ -1251,6 +1253,9 @@ else make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log fi +# We don't want the mozilla plugin here: +[ -d $PKG/usr/lib/mozilla ] && rm -rf $PKG/usr/lib/mozilla + # Add a menu icon mkdir -p $PKG/usr/share/pixmaps cp -a $PKG/usr/share/vlc/vlc48x48.png $PKG/usr/share/pixmaps/vlc.png |