drop MMX patch, fixed in gcc. Minor spec updates

This commit is contained in:
Peter Robinson 2012-05-30 11:52:19 +01:00
parent 159740e7dc
commit ecd72f6532
2 changed files with 2 additions and 18 deletions

View File

@ -21,8 +21,6 @@ Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
# http://thread.gmane.org/gmane.linux.bluez.kernel/8645 # http://thread.gmane.org/gmane.linux.bluez.kernel/8645
Patch6: 0001-systemd-install-systemd-unit-files.patch Patch6: 0001-systemd-install-systemd-unit-files.patch
Patch7: sbc_mmx.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: dbus-devel >= 0.90 BuildRequires: dbus-devel >= 0.90
BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
@ -33,7 +31,7 @@ BuildRequires: readline-devel
# For cable pairing # For cable pairing
BuildRequires: libudev-devel BuildRequires: libudev-devel
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: libusb1-devel BuildRequires: libusbx-devel
%endif %endif
BuildRequires: udev BuildRequires: udev
@ -146,13 +144,12 @@ and mouse.
%patch4 -p1 -b .socket-mobile %patch4 -p1 -b .socket-mobile
%patch5 -p1 -b .cable-pairing %patch5 -p1 -b .cable-pairing
%patch6 -p1 -b .systemd %patch6 -p1 -b .systemd
%patch7 -p1 -b .mmx
%build %build
libtoolize -f -c libtoolize -f -c
autoreconf autoreconf
%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund --enable-hid2hci --with-ouifile=/usr/share/hwdata/oui.txt --with-systemdsystemunitdir=/lib/systemd/system %configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund --enable-hid2hci --with-ouifile=/usr/share/hwdata/oui.txt --with-systemdsystemunitdir=/lib/systemd/system
make make V=1
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT

View File

@ -1,13 +0,0 @@
Index: bluez/sbc/sbc_primitives_mmx.c
===================================================================
--- bluez.orig/sbc/sbc_primitives_mmx.c 2012-01-04 12:06:47.231873000 -0500
+++ bluez/sbc/sbc_primitives_mmx.c 2012-01-04 12:07:34.748103759 -0500
@@ -318,7 +318,7 @@
"movl %k0, 4(%3)\n"
: "+r" (blk)
: "r" (&sb_sample_f[0][ch][sb]),
- "i" ((char *) &sb_sample_f[1][0][0] -
+ "r" ((char *) &sb_sample_f[1][0][0] -
(char *) &sb_sample_f[0][0][0]),
"r" (&scale_factor[ch][sb]),
"r" (&consts),