diff --git a/bluez.spec b/bluez.spec index 4c67c3a..c69f365 100644 --- a/bluez.spec +++ b/bluez.spec @@ -21,8 +21,6 @@ Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/8645 Patch6: 0001-systemd-install-systemd-unit-files.patch -Patch7: sbc_mmx.patch - BuildRequires: flex BuildRequires: dbus-devel >= 0.90 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel @@ -33,7 +31,7 @@ BuildRequires: readline-devel # For cable pairing BuildRequires: libudev-devel %ifnarch s390 s390x -BuildRequires: libusb1-devel +BuildRequires: libusbx-devel %endif BuildRequires: udev @@ -146,13 +144,12 @@ and mouse. %patch4 -p1 -b .socket-mobile %patch5 -p1 -b .cable-pairing %patch6 -p1 -b .systemd -%patch7 -p1 -b .mmx %build libtoolize -f -c 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 -make +make V=1 %install make install DESTDIR=$RPM_BUILD_ROOT diff --git a/sbc_mmx.patch b/sbc_mmx.patch deleted file mode 100644 index 2f00bb6..0000000 --- a/sbc_mmx.patch +++ /dev/null @@ -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),