# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1276087741 -7200
# Node ID 67e4ee4409471d1209c4f163f7b8249f5ba4e7a4
# Parent  bc6311ee4f5e431dd819a7da04d84b916389fcae
fix ASM build, provides filtering

diff -r bc6311ee4f5e -r 67e4ee440947 mozilla-libvpx-buildfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-libvpx-buildfix.patch	Wed Jun 09 14:49:01 2010 +0200
@@ -0,0 +1,26 @@
+References:
+https://bugzilla.mozilla.org/show_bug.cgi?id=570932
+
+# HG changeset patch
+# Parent 513edcdd0b4fea56e9c8dd05b46cf8efca1085f7
+diff --git a/media/libvpx/vpx_ports/x86_abi_support.asm b/media/libvpx/vpx_ports/x86_abi_support.asm
+--- a/media/libvpx/vpx_ports/x86_abi_support.asm
++++ b/media/libvpx/vpx_ports/x86_abi_support.asm
+@@ -5,16 +5,17 @@
+ ;  that can be found in the LICENSE file in the root of the source
+ ;  tree. An additional intellectual property rights grant can be found
+ ;  in the file PATENTS.  All contributing project authors may 
+ ;  be found in the AUTHORS file in the root of the source tree.
+ ;
+ 
+ 
+ %include "vpx_config.asm"
++%define CONFIG_PIC 0
+ 
+ ; 32/64 bit compatibility macros
+ ;
+ ; In general, we make the source use 64 bit syntax, then twiddle with it using
+ ; the preprocessor to get the 32 bit syntax on 32 bit platforms.
+ ;
+ %ifidn __OUTPUT_FORMAT__,elf32
+ %define ABI_IS_32BIT 1
diff -r bc6311ee4f5e -r 67e4ee440947 mozilla-xulrunner193/mozilla-libvpx-buildfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner193/mozilla-libvpx-buildfix.patch	Wed Jun 09 14:49:01 2010 +0200
@@ -0,0 +1,1 @@
+../mozilla-libvpx-buildfix.patch
\ No newline at end of file
diff -r bc6311ee4f5e -r 67e4ee440947 mozilla-xulrunner193/mozilla-xulrunner193.spec
--- a/mozilla-xulrunner193/mozilla-xulrunner193.spec	Wed Jun 09 11:59:44 2010 +0200
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec	Wed Jun 09 14:49:01 2010 +0200
@@ -76,6 +76,7 @@
 Patch13:        toolkit-ui-lockdown.patch
 # ---
 Patch14:        mozilla-cpuid.patch
+Patch15:        mozilla-libvpx-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js193
 Requires(post):  update-alternatives coreutils
@@ -93,7 +94,7 @@
 ### configuration end ###
 %define _use_internal_dependency_generator 0
 %define __find_requires sh %{SOURCE2}
-%global provfind sh -c "grep -v 'libsqlite3.so' | %__find_provides"
+%global provfind sh -c "grep -Ev 'mozsqlite3|dbusservice|nspr4|plc4|plds4|unixprint' | %__find_provides"
 %global __find_provides %provfind
 %if %has_system_nspr
 BuildRequires:  mozilla-nspr-devel
@@ -217,6 +218,11 @@
 %if %suse_version < 1120
 %patch14 -p1
 %endif
+%if %suse_version <= 1120
+%ifarch %ix86
+%patch15 -p1
+%endif
+%endif
 
 %build
 #%if %suse_version >= 1110
diff -r bc6311ee4f5e -r 67e4ee440947 series
--- a/series	Wed Jun 09 11:59:44 2010 +0200
+++ b/series	Wed Jun 09 14:49:01 2010 +0200
@@ -12,6 +12,7 @@
 #gecko-lockdown.patch
 #toolkit-ui-lockdown.patch
 mozilla-cpuid.patch
+mozilla-libvpx-buildfix.patch
 
 # Firefox patches
 firefox-libxul-sdk.patch