diff options
| author |   Eric Hameleers <alien@slackware.com> | 2007-04-09 23:13:31 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2007-04-09 23:13:31 +0000 |
| commit | 3da7744e613d07d9f548c2fd856db88390f1cce3 (patch) | |
| tree | 4c8c6dedeec37b9b3fd5b01b0aec708d9eb29404 /vlc/build | |
| parent | 07f8ac77495bd1fd50a5b29a66dc057443646d4c (diff) | |
| download | asb-3da7744e613d07d9f548c2fd856db88390f1cce3.tar.gz asb-3da7744e613d07d9f548c2fd856db88390f1cce3.tar.xz | |
This really builds the mozilla plugin correctly
Diffstat (limited to 'vlc/build')
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index a3c68d24..1b76a6d0 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -69,7 +69,7 @@ if [ -z "$MOZBROWSER" ]; then DO_MOZPLUGIN="" else MOZPLUGIN="YES" - DO_MOZPLUGIN="--enable-mozilla --with-mozilla-sdk-path=/usr/include/${MOZBROWSER}" + DO_MOZPLUGIN="--enable-mozilla" fi # The vlc contrib directory lags behind the current vlc version: @@ -1097,7 +1097,8 @@ sed -i -e 's|/lib/vlc|/usr/lib${LIBDIRSUFFIX}/vlc|g' vlc-config.in.in configure* 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Preparations for building a separate vlc mozilla plugin : -if [ "MOZPLUGIN" == "YES" ]; then +if [ "$MOZPLUGIN" == "YES" ]; then + echo "+++ Building mozilla plugin using $MOZBROWSER sdk +++" # Fix perms issues chmod 644 mozilla/control/* chmod 644 src/control/log.c @@ -1108,15 +1109,16 @@ if [ "MOZPLUGIN" == "YES" ]; then find mozilla/* -type f -name "*.h" -exec sed -i \ "s|<npapi.h>|<${MOZBROWSER}/plugin/npapi.h>|" \{} \; # Fix mozilla plugin: - export XPIDL=/usr/lib/${MOZBROWSER}/xpidl + export XPIDL="/usr/lib/${MOZBROWSER}/xpidl" export XPIDL_INCL="-I/usr/include/${MOZBROWSER} \ - -I/usr/share/idl/$MOZBROWSER} \ - -I/usr/include/nspr4/" + -I/usr/share/idl/$MOZBROWSER}" +else + echo "+++ NOT building mozilla plugin - this needs the Seamonkey package! +++" fi sh bootstrap -CFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include -I/usr/include/nspr4/" \ +CFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ CPPFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ LDFLAGS="$SLKLDFLAGS -L`pwd`/../vlcdeps/usr/lib" \ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ @@ -1214,6 +1216,7 @@ 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 +strip --strip-unneeded $PKG2/usr/lib/mozilla/plugins/libvlcplugin.so mkdir -p $PKG2/install cat $SRCDIR/slack-desc.$PRGNAM2 > $PKG2/install/slack-desc @@ -1374,7 +1377,7 @@ make_shout || exit 1 make_vlc || exit 1 # Should we also build a package for the mozilla plugin? -[ "$MOZPLUGIN" == "YES" ] && build_mozplugin +[ "$MOZPLUGIN" == "YES" ] && build_mozplugin || exit 1 # Pack all this stuff into a Slackware package (this routine also will execute # the '--cleanup' functionality if requested): |