Remove all traces of xulrunner - we use seamonkey now

1 files changed, 56 insertions, 117 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index c09c1e4f..ade40471 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -335,6 +335,8 @@
 # 2.0.X-1     XX/XXX/2012  by Eric Hameleers <alien@slackware.com>
 #             * New release. Updates to internal Shout, aacenc, amrwbenc, amr,
 #               lua, upnp, v4l, x264 libraries.
+#               Stop using internal xulrunner SDK to buil the browser plugin,
+#               Slackware's own seamonkey can do this now.
 #
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -412,6 +414,12 @@ case "$ARCH" in
   armv7hl)   SLKCFLAGS="-O2 -fPIC -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  armv5hl)   SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -848,9 +856,9 @@ SRCURL[42]="http://www.splitted-desktop.com/~gbeauchesne/libva/libva_${LIBVA}.ta
 SRCPAT[42]="NO"
 USE[42]="YES"
 
-# Mozilla xulrunner is used to build the browser plugin:
-SOURCE[43]="$SRCDIR/xulrunner-${XUL}.source.tar.bz2"
-SRCURL[43]="http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/xulrunner/releases/${XUL}/source/xulrunner-${XUL}.source.tar.bz2"
+# GSM support:
+SOURCE[43]="$SRCDIR/gsm-$GSM.tar.gz"
+SRCURL[43]="http://osxwinebuilder.googlecode.com/files/gsm-$GSM.tar.gz"
 SRCPAT[43]="NO"
 USE[43]="YES"
 
@@ -897,12 +905,6 @@ SRCURL[50]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz"
 SRCPAT[50]="NO"
 USE[50]="YES"
 
-# GSM support:
-SOURCE[51]="$SRCDIR/gsm-$GSM.tar.gz"
-SRCURL[51]="http://osxwinebuilder.googlecode.com/files/gsm-$GSM.tar.gz"
-SRCPAT[51]="NO"
-USE[51]="YES"
-
 # CSS decoding- VLC can do without if you install an external libdvdcss package.
 SOURCE[52]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
 SRCURL[52]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
@@ -1113,11 +1115,11 @@ if [ "$STATIC_FFMPEG" != "YES" ]; then
   USE[6]="NO" # lame
   USE[8]="NO" # faac
   USE[35]="NO" # theora
+  USE[43]="NO" # gsm
   USE[44]="NO" # vpx
   USE[45]="NO" # aacenc
   USE[46]="NO" # vo-amrwb
   USE[50]="NO" # rtmp
-  USE[51]="NO" # gsm
 fi
 
 # Source file availability:
@@ -1208,7 +1210,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-examples \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_theora.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_theora.log
 # Install theora into a temp location so ffmpeg can pickup the library
@@ -1238,7 +1240,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_lame.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_lame.log
 # Install lame into a temp location so ffmpeg can pickup the library
@@ -1275,7 +1277,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --with-mp4v2 \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_faac.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_faac.log
 # Install faac into a temp location so ffmpeg can pickup the library
@@ -1305,7 +1307,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_amr.log
 make -j$NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amr.log
 make install PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
@@ -1335,7 +1337,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_amrwbenc.log
 make -j$NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amrwbenc.log
 make install $VLCDEPSDIR/PREFIX=/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
@@ -1367,7 +1369,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_aacenc.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_aacenc.log
 # Install aacenc into a temp location so ffmpeg can pickup the library
@@ -1630,7 +1632,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_faad2.log
   # No longer available:
   #--with-mp4v2 \
@@ -1661,7 +1663,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_a52.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_a52.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1790,7 +1792,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_libmpeg2.log
   #--without-x \
   #--disable-sdl \
@@ -1871,7 +1873,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdnav.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
 # Install libdvdnav into a temp location so vlc can pickup the library
@@ -1905,7 +1907,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-doc \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdcss.log
   # Shared library needed so that libdvdread can query the library
   #--disable-shared \
@@ -1955,7 +1957,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --program-prefix= \
   --program-suffix= \
   ${DO_CSS} \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_dvdread.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdread.log
 # Install libdvdread into a temp location so libdvdnav can pickup the library
@@ -1987,7 +1989,7 @@ LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_cddb.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cddb.log
 # Install libcddb into a temp location so cdio and vlc can pickup the library
@@ -2028,7 +2030,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   $DO_VCD \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_cdio.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cdio.log
 # Install libcdio into a temp location so vlc can pickup the library
@@ -2059,7 +2061,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_vcd.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vcd.log
 # Install libvcd into a temp location so vlc can pickup the library
@@ -2089,7 +2091,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_twolame.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_twolame.log
 # Install twolame into a temp location so vlc can pickup the library
@@ -2119,7 +2121,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-debug \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_daap.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_daap.log
 # Install libdaap into a temp location so vlc can pickup the library
@@ -2154,7 +2156,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-debug \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_upnp.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_upnp.log
 # Install libupnp into a temp location so vlc can pickup the library
@@ -2191,7 +2193,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_orc.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_orc.log
 # Install orc into a temp location so schroedinger can pickup the library
@@ -2230,7 +2232,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --program-prefix= \
   --program-suffix= \
   $ARCHOPTS \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_schroedinger.log
 make  2>&1 | tee $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Install schroedinger into a temp location so vlc can pickup the library
@@ -2266,7 +2268,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_speex.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log
 # Install speex into a temp location so libshout and vlc can pickup the library
@@ -2297,7 +2299,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_shout.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_shout.log
 # Install libshout into a temp location so vlc can pickup the library
@@ -2347,7 +2349,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_goom.log
 
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_goom.log
@@ -2432,7 +2434,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-debug \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ggi.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ggi.log
 # Install gii into a temp location so libggi can pickup the library
@@ -2460,7 +2462,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --with-gii=$VLCDEPSDIR/usr \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_ggi.log
 make -j${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 # Install ggi into a temp location so vlc can pickup the library
@@ -2526,7 +2528,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dv.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dv.log
 # Install dv into a temp location so vlc can pickup the library
@@ -2557,7 +2559,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --enable-release \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvbpsi.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvbpsi.log
 # Install dvbpsi into a temp location so vlc can pickup the library
@@ -2587,7 +2589,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-debug \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dca.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dca.log
 # Install dca into a temp location so vlc can pickup the library
@@ -2634,7 +2636,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_raw1394.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_raw1394.log
 # Install libraw1394 into a temp location so vlc can pickup the library
@@ -2661,7 +2663,7 @@ LIBRAW1394_LIBS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} -lraw1394" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_avc1394.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
 # Install libavc1394 into a temp location so vlc can pickup the library
@@ -2692,7 +2694,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-examples \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dc1394.log
   # Building the examples fails on kernel >= 2.6.38 because that deprecated
   # the v4l1 interface. You'll get the error "dc1394_vloopback.c:49:28:
@@ -2743,7 +2745,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --program-prefix= \
   --program-suffix= \
   $ARCHOPTS \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_fribidi.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fribidi.log
 # Install fribidi into a temp location so vlc can pickup the library
@@ -2775,7 +2777,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ass.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ass.log
 # Install libass into a temp location so vlc can pickup the library
@@ -2808,7 +2810,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --without-readline \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_fluid.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fluid.log
 # Install fluid into a temp location so vlc can pickup the library
@@ -2849,7 +2851,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-doc \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_kate.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_kate.log
 # Install kate into a temp location so vlc can pickup the library
@@ -2882,7 +2884,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-doc \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_tiger.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_tiger.log
 # Install tiger into a temp location so vlc can pickup the library
@@ -3006,7 +3008,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --with-drivers-path=/usr/lib${LIBDIRSUFFIX}/va/drivers \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_libva.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libva.log
 # Strip the static lib to prevent linking errors in 64-bit,
@@ -3029,64 +3031,6 @@ cd -
 
 
 # -----------------------------------------------------------------------------
-# Compile xulrunner
-# -----------------------------------------------------------------------------
-make_xul()
-{
-echo -e "**\n**  xul ...\n**"
-cd $TMP/tmp-$PRGNAM/mozilla-$(echo $XUL | cut -d. -f1-3)
-
-# Compiling xulrunner takes a long, long time. We will look for a pre-compiled
-# version of the xulrunner SDK in the $SRCDIR and use that instead if available.
-# You can find a tarball of this SDK after the xulrunner compilation has ended;
-# check the ./dist/sdk subdirectory in the source tree and copy the file
-# xulrunner-*.sdk.tar.bz2 to the directory containing vlc.SlackBuild.
-MOZSDK=$(ls --indicator-style=none $SRCDIR/xulrunner-${XUL}.*.linux-$(uname -m).sdk.tar.bz2 | tail -1)
-
-if [ -z "$MOZSDK" ]; then
-  # We have to compile it now:
-  export CFLAGS="$SLKCFLAGS"
-  export CXXFLAGS="$SLKCFLAGS"
-  export LDFLAGS="$SLKLDFLAGS"
-  ./configure \
-    --prefix=$VLCDEPSDIR/usr \
-    --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
-    --disable-debug \
-    --disable-installer \
-    --disable-libnotify \
-    --disable-shared \
-    --disable-tests \
-    --disable-updater \
-    --enable-application=xulrunner \
-    --enable-default-toolkit=cairo-gtk2 \
-    --enable-javaxpcom \
-    --enable-libxul \
-    --enable-optimize="${CFLAGS}" \
-    --enable-standalone-modules=xpcom,plugin \
-    --enable-strip \
-    --with-system-jpeg \
-    --with-system-bz2 \
-    --with-system-zlib \
-    --build=$ARCH-slackware-linux \
-    2>&1 | tee $OUTPUT/configure-${PRGNAM}_xul.log
-  make MOZ_MAKE_FLAGS="$NUMJOBS" 2>&1 | tee $OUTPUT/make-${PRGNAM}_xul.log
-  # Create an SDK package that we pass to vlc's configure:
-  echo -e "\n**\n**\n"
-  make sdk 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_xul.log
-  tar -C $VLCDEPSDIR/usr -xvf dist/sdk/xulrunner-${XUL}*.sdk.tar.bz2
-else
-  # Use our precompiled SDK - compiling it takes ages:
-  echo "Using a precompiled mozilla SDK: $(basename $MOZSDK)"
-  tar -C $VLCDEPSDIR/usr -xvf ${MOZSDK}
-fi
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/xulrunner/
-cp LEGAL LICENSE README.txt $VLCDEPSDIR/doc/xulrunner/  || true
-cd -
-}
-
-
-# -----------------------------------------------------------------------------
 # Compile VP8
 # -----------------------------------------------------------------------------
 make_vpx()
@@ -3163,11 +3107,11 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-mozilla-sdk-path=$VLCDEPSDIR/usr/xulrunner-sdk \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_npapi.log
+
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_npapi.log
 cd -
 }
@@ -3199,7 +3143,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --with-dlopen-crypto-libs \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_bluray.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_bluray.log
 # Install libbluray into a temp location so vlc can pickup the library
@@ -3317,9 +3261,9 @@ sh bootstrap
 
 PROJECTM_LIBS="-lprojectM $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libMilkdropPresetFactory.a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libRenderer.a -lGLU -lGLEW -lGL" \
 PROJECTM2_LIBS="-lprojectM $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libMilkdropPresetFactory.a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libRenderer.a -lGLU -lGLEW -lGL" \
-CPPFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner" \
-CFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner $SLKCFLAGS" \
-CXXFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner $SLKCFLAGS" \
+CPPFLAGS="-I$VLCDEPSDIR/usr/include" \
+CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
+CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 LDFLAGS="-Wl,-Bsymbolic -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$VLCDEPSDIR/usr/bin:$PATH" \
@@ -3381,7 +3325,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
   --enable-run-as-root \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
   # Enabled by default:
@@ -3646,11 +3590,6 @@ if echo "$*" | grep -qw -- --unwrapvlcdeps ; then
 else
   #if [ "xy" == "x" ]; then
 
-  # Are we building the mozilla plugin?
-  if [ "$MOZPLUGIN" = "YES" ]; then
-    make_xul
-  fi
-
   # qt4 is used for the vlc gui:
   if [ "$STATIC_QT4" = "YES" ]; then
     make_qt4