main/xulrunner: fix arm build

5 files changed, 74 insertions, 9 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 538f2eb0e4..7d846b3c3f 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=xulrunner
 pkgver=26.0
 _ffoxver=$pkgver
-pkgrel=4
+pkgrel=5
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -59,6 +59,8 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	fix-netwerk.patch
 	fix-toolkit.patch
 	fix-tools.patch
+	fix-gfx.patch
+	mozilla-build-arm.patch
 
 	stab.h
 	"
@@ -133,10 +135,12 @@ d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 84b101ca9b5f91d3387851e1c42d3908  stat.patch
 86b5eb4bb890a45808cc3a46b99cd8a5  moz-libc-filename.patch
 38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
-fe0c52aba8e0b9a889fbcefdc4e5a9a3  fix-media.patch
-41520f6c013807e6af2c377276efb843  fix-netwerk.patch
+960d56439a375998ce4e4597bf245375  fix-media.patch
+e1d52fd12bfcf3142028a9ab547cf8d1  fix-netwerk.patch
 c12ed36523df9eadb7e686db06d87511  fix-toolkit.patch
 7d5294021091e861c6a830b2a2044d7a  fix-tools.patch
+d26bf9e63cb3ccfbb3d1f6eac68dc929  fix-gfx.patch
+5fd78a4d942ed6a2302418145954d3cb  mozilla-build-arm.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h"
 sha256sums="31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812  firefox-26.0.source.tar.bz2
 a5ab8c12da5f266458e7f456205a58ea3bedcce717dae9e2087cf59db9598a64  mozconfig
@@ -147,10 +151,12 @@ d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 bcdfc27fb1561beb797ed8e3d14cb7c88de54a5aed2eb33bf84e331a2b0ec200  stat.patch
 889856baa82413afb2f79b7b3e3add626e1ac181efd398e80c434836b793c294  moz-libc-filename.patch
 059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
-84c4565a7af390c2439c9951e959efcb0840f75cf4459ab4f4637e9c73c48f4a  fix-media.patch
-9681d00c44f6b3873eb97d0a7277c04710da956aa4d08c100cf62c24d03d6a5d  fix-netwerk.patch
+d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf  fix-media.patch
+0cbb512c4526f0881253a38f1cc79061fba0fe6a0d8b321fb506be190a32e571  fix-netwerk.patch
 7deba648e31c05ff0f85332499dad41d646d1a1850334594bcc523c61d9b5d29  fix-toolkit.patch
 fabc0e5adca3cbd728c1f7dca2b5fd3b0973eff696656842c3564b96e28c7923  fix-tools.patch
+0600b12275516c6062785ddb369f5a7e510f69aaa8ffdf3bbe35df6b516b6941  fix-gfx.patch
+01df910900c8897579f19ddfa8768b41b98fae01672cc81c0eaf13936475c5f0  mozilla-build-arm.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h"
 sha512sums="c0933eeb39aa1d5d83d4c85885b87e0b817d945eec4fe8fc1b15256008f14308fbf98d5a83217c112e1ad247133f839f6ad74156eed7b159d32d0fce26532713  firefox-26.0.source.tar.bz2
 4e3a392276d82a1006351a673b853bd6e7a57f4ae9ec5806edd9e7c8d51edcbaeb32111423088231a7e887490b755ec9701508fe58564fe69dda7eee7b147551  mozconfig
@@ -161,8 +167,10 @@ sha512sums="c0933eeb39aa1d5d83d4c85885b87e0b817d945eec4fe8fc1b15256008f14308fbf9
 478bb56c8e87c5ce6ccf1dd31cfb48be8e1a817e77e3158f633cb48bd269692061f8728589b9cebfac04d484518c2525d61ba4988abe8ea274fdd419ee02ab34  stat.patch
 005d603c4bb90b4ac0d91775cc500416ec218860971a0888316f4d6a92a51f3a67fa30eacbe12c826e589ac0e2ddf3e72eec451382653fd0d557804d4af1e9a6  moz-libc-filename.patch
 3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
-a568f59db03ad493f5a4aa5702eb28f7c9360284a9862e3bdb798aafe83c4e2547c7445d6748516c28e77209603ff96d562a58cb117d1d1d502b1bd13dc85373  fix-media.patch
-0b96397441a1d42a23e322cdbfcad22ad5b5bc59c7265a7e1a3c4c26381a16a28f31165eb13147ce29174eb5c08ffe885c6df9a1e7b966e0b9c27637830f50ea  fix-netwerk.patch
+58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79  fix-media.patch
+38ebf7ae81d4b6dac0b6840a64f86759fc10e4a7ef26f1ebdc2b7c8d4aab3f95ddcb204a743b307e5dad0cd6c04b278c2311b1ac599e7bb287092c552ed26a51  fix-netwerk.patch
 047f15471c6e906164d92d4476746ff4cd73e097f78e547c1391918e84edf4ac2e986a3f88e0402378e24e1ba6f30ee397ac0ebe0c396ce0e98c8e2489608582  fix-toolkit.patch
 419d896ca3f5d35b82aa5aa161b09c14775ee5b11a5a226ce856c2c8176eeaf4b15bcd0473b6109a7bfb09aca44405cecbb3215402f859c1617758082cff6bc6  fix-tools.patch
+7d47bcfb09f0e59740427e60357d4ceaaaa3a2359031a2c1508890ec3deff97a466a78933caeb0e22e02b2a13ace4a4d9d87c0872dae99d3830550a19dc9a8f3  fix-gfx.patch
+76db19eef8ebcc8886ce7f5d299bbea1682bdc380e0a27e6b0c6ecd9bd9b0a253be60651f91ab7472c1e8d459605b4ed9db42f01a675feb4421ec55995901d0b  mozilla-build-arm.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h"
diff --git a/main/xulrunner/fix-gfx.patch b/main/xulrunner/fix-gfx.patch
new file mode 100644
index 0000000000..becdc5b31a
--- /dev/null
+++ b/main/xulrunner/fix-gfx.patch
@@ -0,0 +1,10 @@
+--- mozilla-release/gfx/layers/BufferUnrotate.cpp.orig
++++ mozilla-release/gfx/layers/BufferUnrotate.cpp
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
+                     int aByteStride, int aXBoundary, int aYBoundary)
diff --git a/main/xulrunner/fix-media.patch b/main/xulrunner/fix-media.patch
index 5912d3cc2c..a016a48753 100644
--- a/main/xulrunner/fix-media.patch
+++ b/main/xulrunner/fix-media.patch
@@ -1,6 +1,14 @@
 --- mozilla-release/media.orig/mtransport/third_party/nICEr/src/stun/addrs.c
 +++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -53,7 +53,6 @@
+@@ -45,7 +45,6 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #ifndef ANDROID
+-#include <sys/sysctl.h>
+ #include <sys/syslog.h>
+ #else
+ #include <syslog.h>
+@@ -53,7 +52,6 @@
  #undef __unused
  #include <linux/sysctl.h>
  #endif
@@ -8,7 +16,7 @@
  #ifndef LINUX
  #if !defined(__OpenBSD__) && !defined(__NetBSD__)
  #include <net/if_var.h>
-@@ -63,8 +62,8 @@
+@@ -63,8 +61,8 @@
  #include <sys/sockio.h>
  #else
  #include <linux/sockios.h>
diff --git a/main/xulrunner/fix-netwerk.patch b/main/xulrunner/fix-netwerk.patch
index f3f684d7f0..6b9645ec3a 100644
--- a/main/xulrunner/fix-netwerk.patch
+++ b/main/xulrunner/fix-netwerk.patch
@@ -60,3 +60,17 @@
  /*
   * This file defines four types of data structures: singly-linked lists,
   * singly-linked tail queues, lists and tail queues.
+--- mozilla-release/netwerk.orig/sctp/src/user_environment.c
++++ mozilla-release/netwerk/sctp/src/user_environment.c
+@@ -33,11 +33,6 @@
+ #include <stdlib.h>
+ #if !defined (__Userspace_os_Windows)
+ #include <stdint.h>
+-#if !defined(__Userspace_os_FreeBSD)
+-#if !defined(ANDROID)
+-#include <sys/sysctl.h>
+-#endif
+-#endif
+ #include <netinet/sctp_os_userspace.h>
+ #endif
+ #include <user_environment.h>
diff --git a/main/xulrunner/mozilla-build-arm.patch b/main/xulrunner/mozilla-build-arm.patch
new file mode 100644
index 0000000000..7801b1573e
--- /dev/null
+++ b/main/xulrunner/mozilla-build-arm.patch
@@ -0,0 +1,25 @@
+diff -up mozilla-release/gfx/ycbcr/moz.build.arm mozilla-release/gfx/ycbcr/moz.build
+--- mozilla-release/gfx/ycbcr/moz.build.arm	2013-12-05 17:07:32.000000000 +0100
++++ mozilla-release/gfx/ycbcr/moz.build	2013-12-10 14:47:43.235182479 +0100
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     ASFILES += [
+         'yuv_row_arm.s',
+     ]
+diff -up mozilla-release/media/libtheora/lib/moz.build.arm mozilla-release/media/libtheora/lib/moz.build
+--- mozilla-release/media/libtheora/lib/moz.build.arm	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/libtheora/lib/moz.build	2013-12-12 11:45:41.882119059 +0100
+@@ -8,7 +8,7 @@ MODULE = 'theora'
+ 
+ LIBRARY_NAME = 'theora'
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
++if CONFIG['HAVE_ARM_NEON'] and CONFIG['GNU_AS']:
+     asm_suffix = CONFIG['ASM_SUFFIX']
+     ASFILES += [
+         'armbits-gnu.%s' % asm_suffix,
+