X-Git-Url: http://gitweb/?a=blobdiff_plain;f=firefox%2FPkgfile;h=d1e6410b63b830c4049ad31d39781ba07fe729b5;hb=c5082f81691af38da6c84ecbeb9068d5729c99b1;hp=375c3d8cac2f38a7f806d9bd038de0355e6ce008;hpb=bbd17174e092e046bb4a44e0209ce10b3f17c207;p=ports%2Fopt-arm.git

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 375c3d8..d1e6410 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,25 +2,22 @@
 # URL: http://www.mozilla.com/firefox/
 # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: nss, libidl, gtk, python, alsa-lib, yasm, mesa3d
+# Depends on: nss, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base
 
 name=firefox
-version=38.0.1
+version=40.0.3
 release=1
-source=(ftp://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
-        firefox-install-dir.patch 0001-Fix-build-with-USE_SKIA_GPU.patch firefox.desktop)
+source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
+        firefox-install-dir.patch firefox.desktop)
 
 build() {
   cd mozilla-release
 
   patch -p1 -i $SRC/firefox-install-dir.patch
-  patch -p1 -i $SRC/0001-Fix-build-with-USE_SKIA_GPU.patch
 
   cat <<- EOF > .mozconfig
   mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
   mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
-  export VPX_ASFLAGS="$CFLAGS"
-  export LIBJPEG_TURBO_ASFLAGS="$CFLAGS"
   ac_add_options --prefix=/usr
   ac_add_options --with-system-jpeg
   ac_add_options --with-system-zlib
@@ -31,10 +28,11 @@ build() {
   ac_add_options --enable-system-ffi
   ac_add_options --enable-system-pixman
   ac_add_options --enable-system-sqlite
-  ac_add_options --enable-system-cairo
+  #ac_add_options --enable-system-cairo
   ac_add_options --with-pthreads
   ac_add_options --enable-optimize="$CFLAGS"
   ac_add_options --enable-official-branding
+  ac_add_options --with-distribution-id=nu.crux
   ac_add_options --enable-extensions=default,-gnomevfs
   ac_add_options --enable-shared
   ac_add_options --enable-svg
@@ -46,6 +44,8 @@ build() {
   ac_add_options --enable-places_bookmarks
   ac_add_options --enable-image-encoder=all
   ac_add_options --enable-xft
+  ac_add_options --enable-gstreamer=1.0
+  ac_add_options --enable-pic
   ac_add_options --disable-static
   ac_add_options --disable-tests
   ac_add_options --disable-mochitest
@@ -61,9 +61,7 @@ build() {
   ac_add_options --disable-crashreporter
   ac_add_options --disable-necko-wifi
   ac_add_options --disable-libnotify
-  ac_add_options --disable-gstreamer
   ac_add_options --disable-pulseaudio
-  ac_add_options --disable-skia-gpu
 EOF
 
   sed "s|\['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon'\]|\[\]|g" -i media/libvpx/moz.build