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

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 9e01b0c..d1e6410 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,56 +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
-
-  # determine some flags depending on SOC
-  FPU=vfp; ARCH=armv6; THUMB=no
-  case $(uname -m) in
-      armv7*) ARCH=armv7; THUMB=yes;;
-  esac
-  for flag in $CFLAGS; do
-    case $flag in
-      -mfpu=neon*) FPU=neon;;
-    esac
-  done
-
-  #ac_add_options --with-thumb-interwork=$THUMB
-  #ac_add_options --with-soft-float=no
-  #ac_add_options --with-thumb=$THUMB
-
-#  mk_add_options MOZ_ALIGN=no
-#  ac_add_options --with-arch=$ARCH
-#  ac_add_options --with-fpu=$FPU
-#  ac_add_options --with-float-abi=hard
-#  ac_add_options --with-thumb-interwork=no
-#  ac_add_options --with-thumb=no
-
-
-#  export MOZ_THUMB="no"
-#  export MOZ_ARCH="$ARCH"
-#  export MOZ_FPU="$FPU"
-#  export MOZ_FLOAT_ABI="hard"
-#  export MOZ_ALIGN="no"
-#  export VPX_ASFLAGS="$CFLAGS"
-#  export LIBJPEG_TURBO_ASFLAGS="$CFLAGS"
 
   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
@@ -62,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
@@ -77,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
@@ -92,17 +61,9 @@ 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 -mfpu=neon||g" -i configure
-#  sed "s|VPX_ASFLAGS.*|VPX_ASFLAGS=\"\"|g" -i configure
-#  sed "s|LIBJPEG_TURBO_ASFLAGS.*|LIBJPEG_TURBO_ASFLAGS=\"\"|g" -i configure
-  #make -f client.mk build VPX_ASFLAGS="$CFLAGS" LIBJPEG_TURBO_ASFLAGS="$CFLAGS"
-#  sed "s|VPX_ASFLAGS = -march=armv7-a -mfpu=neon|VPX_ASFLAGS = |g" -i firefox-shared/config/autoconf.mk
-#  sed -e "s|-march=armv7-a||g" -e "s|-mthumb||g" -e "s|-mfloat-abi=softfp||g" -e "s|-mfpu=neon||g" -i mozilla-release/firefox-shared/media/libvpx/backend.mk
   sed "s|\['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon'\]|\[\]|g" -i media/libvpx/moz.build
   make -f client.mk build
   make -f client.mk DESTDIR=$PKG install