Hello community, here is the log from the commit of package jack for openSUSE:Factory checked in at Mon Oct 25 00:22:34 CEST 2010. -------- --- jack/jack.changes 2010-04-29 14:27:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/jack/jack.changes 2010-07-07 10:12:40.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Jul 7 08:11:30 UTC 2010 - davejplater@gmail.com + +- Enable ffado firewire support + +------------------------------------------------------------------- +Wed Jul 7 00:18:17 UTC 2010 - jengelh@medozas.de + +- Provide missing functions to enable SPARC compilation + +------------------------------------------------------------------- +Tue Jul 6 22:02:03 UTC 2010 - jengelh@medozas.de + +- Build fix: make sure $RPM_OPT_FLAGS is in CFLAGS (SPARC _needs_ + its -march=ultrasparc from prjconf to make atomic ops available) +- Strip remaining CFLAGS since they are the same as in prjconf + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- jack-CAS.diff jack-sparcv9.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jack.spec ++++++ --- /var/tmp/diff_new_pack.ys5sIq/_old 2010-10-25 00:22:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ys5sIq/_new 2010-10-25 00:22:07.000000000 +0200 @@ -22,15 +22,20 @@ BuildRequires: dos2unix doxygen gcc-c++ libcelt-devel >= 0.7.0 libxml2-devel pkg-config python BuildRequires: alsa-devel flac-devel libsndfile-devel pkgconfig readline-devel BuildRequires: dbus-1-devel libFLAC8 libexpat-devel libogg-devel libsamplerate-devel +%if 0%{?suse_version} > 1110 +BuildRequires: libffado-devel +%endif %define my_provides /tmp/my-provides Summary: Jack-Audio Connection Kit Version: 1.9.5 -Release: 2 +Release: 5 License: LGPLv2.1+ Group: System/Sound Daemons Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Source2: manpages.tar.bz2 +Patch1: jack-CAS.diff +Patch2: jack-sparcv9.diff Url: http://jackaudio.org/ Provides: jack-audio-connection-kit Provides: jack2 = %{version} @@ -83,10 +88,10 @@ %prep %setup -q -a 2 +%patch -P 1 -P 2 -p1 %build -export CFLAGS="-fmessage-length=0 -O2 -fno-strict-aliasing -Wall \ --D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ggdb" +export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" ./waf \ @@ -100,7 +105,8 @@ --profile \ configure -./waf build %{_smp_mflags} +# waf only understands -j, so do not use smp_mflags +./waf build %{?jobs:-j%jobs} %install ./waf install --destdir=%{buildroot} @@ -155,6 +161,9 @@ %{_libdir}/jack/audioadapter.so* %{_libdir}/jack/jack_loopback.so* %{_libdir}/jack/jack_netone.so* +%if 0%{?suse_version} > 1110 +%{_libdir}/jack/jack_firewire.so +%endif %files -n libjack0 %defattr(-, root, root) ++++++ jack-CAS.diff ++++++ On non-PPC, non-x86, this compile error arises: In file included from ../common/JackActivationCount.cpp:20:0: ../common/JackAtomic.h: In function 'long int INC_ATOMIC(volatile SInt32*)': ../common/JackAtomic.h:31:42: error: 'CAS' was not declared in this scope ../common/JackAtomic.h: In function 'long int DEC_ATOMIC(volatile SInt32*)': ../common/JackAtomic.h:40:42: error: 'CAS' was not declared in this scope Build failed -> task failed (err #1): {task: cxx JackActivationCount.cpp -> JackActivationCount_1.o} Fix it by providing CAS. --- linux/JackAtomic_os.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) Index: jack-1.9.5/linux/JackAtomic_os.h =================================================================== --- jack-1.9.5.orig/linux/JackAtomic_os.h +++ jack-1.9.5/linux/JackAtomic_os.h @@ -48,9 +48,7 @@ static inline int CAS(register UInt32 va return result; } -#endif - -#if defined(__i386__) || defined(__x86_64__) +#elif defined(__i386__) || defined(__x86_64__) #define LOCK "lock ; " @@ -67,6 +65,15 @@ static inline char CAS(volatile UInt32 v return ret; } +#else + +static inline bool CAS(volatile UInt32 value, volatile UInt32 newvalue, + volatile void *addr) +{ + return __sync_bool_compare_and_swap((volatile UInt32 *)addr, + value, newvalue); +} + #endif #endif ++++++ jack-sparcv9.diff ++++++ Without this, there is a link error on SPARC. --- linux/cycles.h | 10 ++++++++++ 1 file changed, 10 insertions(+) Index: jack-1.9.5/linux/cycles.h =================================================================== --- jack-1.9.5.orig/linux/cycles.h +++ jack-1.9.5/linux/cycles.h @@ -53,6 +53,16 @@ static inline unsigned long get_cycles(v #endif +#ifdef __sparc_v9__ +/* rd is V9 only */ +static inline unsigned long long get_cycles(void) +{ + unsigned long long res; + __asm__ __volatile__("rd %%tick, %0" : "=r"(res)); + return res; +} +#endif + #ifdef __PPC__ /* PowerPC */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org