Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2012-06-28 15:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado", Maintainer is "sts...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado-mixer.changes 2012-03-23 12:05:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado-mixer.changes 2012-06-28 15:26:45.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 14:26:34 UTC 2012 - dval...@suse.com + +- fix ppc64 build + +------------------------------------------------------------------- ffado.changes: same change New: ---- libffado-bswap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.LQTlfb/_old 2012-06-28 15:26:47.000000000 +0200 +++ /var/tmp/diff_new_pack.LQTlfb/_new 2012-06-28 15:26:47.000000000 +0200 @@ -31,6 +31,7 @@ Url: http://www.ffado.org/ Source0: %{tname}-%{version}.tar.bz2 Patch1: ffado-gcc47.patch +Patch2: libffado-bswap.patch BuildRequires: alsa-devel BuildRequires: dbus-1-python-devel BuildRequires: doxygen @@ -88,6 +89,7 @@ %prep %setup -n %{tname}-%{version} -q %patch1 -p1 +%patch2 -p1 %build scons %{?jobs:--jobs=%jobs} \ ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.LQTlfb/_old 2012-06-28 15:26:47.000000000 +0200 +++ /var/tmp/diff_new_pack.LQTlfb/_new 2012-06-28 15:26:47.000000000 +0200 @@ -35,6 +35,7 @@ # No current date and time allowed. Patch0: libffado-date_time.patch Patch1: ffado-gcc47.patch +Patch2: libffado-bswap.patch BuildRequires: alsa-devel BuildRequires: dbus-1-python-devel BuildRequires: fdupes @@ -103,12 +104,13 @@ %setup -n %{tname}-%{version} -q %patch0 %patch1 -p1 +%patch2 -p1 cp %{SOURCE2} . %build export EXTRA_FLAGS="" %ifarch %arm -export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC " +export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" %endif #export DBUS1_FLAGS="$DBUS1_FLAGS -lpthread" scons %{?jobs:--jobs=%jobs} \ ++++++ libffado-bswap.patch ++++++ Index: libffado-2.0.1.2040/src/rme/rme_avdevice.cpp =================================================================== --- libffado-2.0.1.2040.orig/src/rme/rme_avdevice.cpp +++ libffado-2.0.1.2040/src/rme/rme_avdevice.cpp @@ -61,27 +61,21 @@ namespace Rme { // opposed to bus order, which is big endian). Therefore define our own // 32-bit byteswap function to do this. #if __BYTE_ORDER == __BIG_ENDIAN +#define RME_BYTESWAP32(x) ByteSwap32(x) +#else +#define RME_BYTESWAP32(x) (x) +#endif + static inline uint32_t ByteSwapToDevice32(uint32_t d) { - return byteswap_32(d); -} -ByteSwapFromDevice32(uint32_t d) -{ - return byteswap_32(d); -} -#else -static inline uint32_t -ByteSwapToDevice32(uint32_t d) -{ - return d; + return RME_BYTESWAP32(d); } static inline uint32_t ByteSwapFromDevice32(uint32_t d) { - return d; + return RME_BYTESWAP32(d); } -#endif Device::Device( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom )) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
