Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2012-03-23 12:05:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado-mixer.changes 2011-09-23 01:57:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado-mixer.changes 2012-03-23 12:05:26.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 13 16:20:30 UTC 2012 - [email protected] + +- Changed build to noarch as suggested by rpmlint + +------------------------------------------------------------------- +Thu Mar 1 16:12:51 UTC 2012 - [email protected] + +- Update to version 2.0.1.2040 +- ffado-dbus-server added +- See ffado's changelog + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2011-10-19 13:57:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado.changes 2012-03-23 12:05:26.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 12 15:58:45 UTC 2012 - [email protected] + +- Added "Recommends: ffado-mixer" to the ffado rpm. + +------------------------------------------------------------------- +Sat Mar 3 06:16:14 UTC 2012 - [email protected] + +- Update to ffado-svn revision 2040 to fix bnc#747391 & bnc#736115 +- Upstream changes, see /usr/share/doc/packages/ffado/ChangeLog + +------------------------------------------------------------------- Old: ---- libffado-2.0.1.tar.bz2 New: ---- libffado-2.0.1.2040.tar.bz2 libffado-date_time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.p387cp/_old 2012-03-23 12:05:27.000000000 +0100 +++ /var/tmp/diff_new_pack.p387cp/_new 2012-03-23 12:05:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado-mixer # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # The python_sitelib macro doesn't seem to be available in 11.1 and 11.0 %if 0%{?suse_version} < 1120 @@ -24,24 +23,42 @@ Name: ffado-mixer %define tname libffado -Version: 2.0.1 +Version: 2.0.1.2040 Release: 2 License: GPL-2.0+ -Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot Url: http://www.ffado.org/ +Group: Productivity/Multimedia/Other Source0: %{tname}-%{version}.tar.bz2 -BuildRequires: libavc1394-devel libraw1394-devel >= 1.3.0 libxml++-devel scons -BuildRequires: doxygen libexpat-devel pkg-config update-desktop-files xdg-utils -BuildRequires: alsa-devel dbus-1-devel >= 1.0 fdupes gcc-c++ libiec61883-devel >= 1.1.0 -BuildRequires: dbus-1-python-devel graphviz-gnome libqt4-devel subversion xorg-x11-fonts +BuildRequires: alsa-devel +BuildRequires: dbus-1-python-devel +BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: ffado +BuildRequires: gcc-c++ +BuildRequires: graphviz-gnome +BuildRequires: libavc1394-devel +BuildRequires: libconfig++-devel +BuildRequires: libdbus-c++-devel +BuildRequires: libexpat-devel +BuildRequires: libiec61883-devel >= 1.1.0 +BuildRequires: libqt4-devel +BuildRequires: libraw1394-devel >= 1.3.0 +BuildRequires: libxml++-devel +BuildRequires: pkg-config +BuildRequires: scons +BuildRequires: subversion +BuildRequires: update-desktop-files +BuildRequires: xdg-utils +BuildRequires: xorg-x11-fonts +BuildRequires: pkgconfig(dbus-1) >= 1.0 %if 0%{?suse_version} > 1110 BuildRequires: python-qt4-devel %else BuildRequires: python-qt4 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %{py_requires} %description @@ -55,7 +72,7 @@ The range of FireWire Audio Devices that we would like to support is broad: from pure audio interfaces over mixed audio-control devices to DSP algorithm devices. -This is a snapshot of svn revision 1855 +This is a snapshot of svn revision 2040 %package -n ffado-doc License: GPL-2.0+ @@ -85,7 +102,6 @@ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb" %install -rm -rf %{buildroot} scons DESTDIR=%{buildroot} \ install @@ -99,9 +115,9 @@ popd mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ -rm %{buildroot}%_libdir/%tname.* -rm -r %{buildroot}/usr/include/libffado -rm -r %{buildroot}%_libdir/pkgconfig +rm %{buildroot}%{_libdir}/%tname.* +rm -r %{buildroot}%{_includedir}/libffado +rm -r %{buildroot}%{_libdir}/pkgconfig rpm -ql ffado | while read file; do rm -v "%{buildroot}$file" || true @@ -112,25 +128,25 @@ cp support/xdg/hi64-apps-ffado.png %{buildroot}%{_datadir}/pixmaps/ffadomixer.png %suse_update_desktop_file -c ffadomixer FfadoMixer "Mixer for ffado" ffado-mixer ffadomixer "AudioVideo;Mixer;HardwareSettings;Qt" +# This problem seems to have been fixed in svn builds +%if 0 == 1 chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_configuration.py chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_panelmanager.py chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_dbus_util.py +%endif find ./ -empty -delete %fdupes -s %{buildroot}%{_datadir} -%clean -rm -rf %buildroot - %files %defattr(-,root,root) %doc README AUTHORS ChangeLog LICENSE.GPLv2 LICENSE.GPLv3 %{_bindir}/ffado-mixer -%dir %{_datadir}/%{tname} -%{_datadir}/%{tname}/* +%{_datadir}/%{tname}/ %{_datadir}/icons/* %{_datadir}/pixmaps/ffadomixer.png %{_datadir}/applications/* +%{python_sitelib}/* %files -n ffado-doc %defattr(-,root,root) ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.p387cp/_old 2012-03-23 12:05:27.000000000 +0100 +++ /var/tmp/diff_new_pack.p387cp/_new 2012-03-23 12:05:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # The python_sitelib macro doesn't seem to be available in 11.1 and 11.0 %if 0%{?suse_version} < 1120 @@ -24,21 +23,35 @@ Name: ffado %define tname libffado -Version: 2.0.1 +Version: 2.0.1.2040 Release: 3 License: GPL-2.0+ -Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot Url: http://www.ffado.org/ +Group: Productivity/Multimedia/Other Source0: %{tname}-%{version}.tar.bz2 Source1: baselibs.conf Source2: ChangeLog -#Source3: %%{_svn}.log -BuildRequires: libavc1394-devel libraw1394-devel >= 1.3.0 libxml++-devel scons -BuildRequires: libexpat-devel pkg-config update-desktop-files xdg-utils -BuildRequires: alsa-devel dbus-1-devel >= 1.0 fdupes gcc-c++ libiec61883-devel >= 1.1.0 +# No current date and time allowed. +Patch0: libffado-date_time.patch +BuildRequires: alsa-devel BuildRequires: dbus-1-python-devel -Requires: libffado2 = %{version}-%{release} +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libavc1394-devel +BuildRequires: libconfig++-devel +BuildRequires: libdbus-c++-devel +BuildRequires: libexpat-devel +BuildRequires: libiec61883-devel >= 1.1.0 +BuildRequires: libraw1394-devel >= 1.3.0 +BuildRequires: libxml++-devel +BuildRequires: pkg-config +BuildRequires: scons +BuildRequires: update-desktop-files +BuildRequires: xdg-utils +BuildRequires: pkgconfig(dbus-1) >= 1.0 +Requires: libffado2 = %{version} +Recommends: ffado-mixer = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -59,7 +72,10 @@ License: GPL-2.0+ Summary: Development files for ffado Group: Development/Libraries/C and C++ -Requires: libffado2 = %{version} glibc-devel +Requires: glibc-devel +Requires: libconfig-devel +Requires: libdbus-c++-devel +Requires: libffado2 = %{version} %description -n libffado-devel This package supplys the files necessary to develop @@ -86,12 +102,15 @@ %prep %setup -n %{tname}-%{version} -q +%patch0 +cp %{SOURCE2} . %build export EXTRA_FLAGS="" %ifarch %arm -export EXTRA_FLAGS=" -fPIC " +export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC " %endif +#export DBUS1_FLAGS="$DBUS1_FLAGS -lpthread" scons %{?jobs:--jobs=%jobs} \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ @@ -102,25 +121,13 @@ PYPKGDIR=%{python_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ BUILD_TESTS=yes \ + ENABLE_DICE=true \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" %install -rm -rf %{buildroot} -scons DESTDIR=%{buildroot} \ - install -#mv %%{buildroot}%%{_datadir}/%%{tname}/icons %%{buildroot}%%{_datadir}/ - -chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_diag_helpers.py -chmod 755 %{buildroot}%{_datadir}/%{tname}/python/helpstrings.py - -cp %{S:2} ./ -#cp %%{S:3} ./ -# NEWS and TODO are zero length -find ./ -empty -delete -%fdupes -s %{buildroot}%{_datadir} +scons DESTDIR=%{buildroot} install -%clean -rm -rf %buildroot +%fdupes -s %{buildroot}%{_datadir} %post -n libffado2 -p /sbin/ldconfig @@ -129,6 +136,30 @@ %files %defattr(-,root,root) %doc README AUTHORS ChangeLog LICENSE.GPLv2 LICENSE.GPLv3 +%{_bindir}/dumpiso_mod +%{_bindir}/gen-loadpulses +%{_bindir}/scan-devreg +%{_bindir}/test-avccmd +%{_bindir}/test-bufferops +%{_bindir}/test-clock_nanosleep +%{_bindir}/test-devicestringparser +%{_bindir}/test-dice-eap +%{_bindir}/test-echomixer +%{_bindir}/test-enhanced-mixer +%{_bindir}/test-focusrite +%{_bindir}/test-fw410 +%{_bindir}/test-ieee1394service +%{_bindir}/test-ipcringbuffer +%{_bindir}/test-messagequeue +%{_bindir}/test-scs +%{_bindir}/test-shm +%{_bindir}/test-streamdump +%{_bindir}/test-sysload +%{_bindir}/test-timestampedbuffer +%{_bindir}/test-volume +%{_bindir}/test-watchdog +%{_bindir}/unmute-ozonic +%{_datadir}/dbus-1/services/org.ffado.Control.service %{_bindir}/ffado* %{_datadir}/%{tname} @@ -138,7 +169,6 @@ %{_includedir}/%{tname}/*.h %{_libdir}/%{tname}*.so %{_libdir}/pkgconfig/%{tname}.pc -# %%{_datadir}/applnk/ffado.org-ffadomixer.desktop %files -n libffado2 %defattr(-,root,root) ++++++ ChangeLog ++++++ ++++ 1028 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ffado/ChangeLog ++++ and /work/SRC/openSUSE:Factory/.ffado.new/ChangeLog ++++++ libffado-2.0.1.tar.bz2 -> libffado-2.0.1.2040.tar.bz2 ++++++ ++++ 222178 lines of diff (skipped) ++++++ libffado-date_time.patch ++++++ Index: src/ffado.cpp =================================================================== --- src/ffado.cpp.orig 2008-12-07 15:50:41.000000000 +0200 +++ src/ffado.cpp 2012-03-12 07:46:42.217828648 +0200 @@ -89,7 +89,7 @@ ffado_device_t *ffado_streaming_init (ff struct _ffado_device *dev = new struct _ffado_device; - printMessage("%s built %s %s\n", ffado_get_version(), __DATE__, __TIME__); + printMessage("%s built %s %s\n", ffado_get_version(), __TIMESTAMP__, NULL); #if DEBUG_USE_MESSAGE_BUFFER // ok Index: support/alsa/alsa_plugin.cpp =================================================================== --- support/alsa/alsa_plugin.cpp.orig 2008-09-23 12:42:04.000000000 +0200 +++ support/alsa/alsa_plugin.cpp 2012-03-12 07:45:27.186125995 +0200 @@ -589,7 +589,7 @@ static int snd_pcm_ffado_open(snd_pcm_t SND_PCM_PLUGIN_DEFINE_FUNC(ffado) { printMessage("FireWire plugin for ALSA\n version %s compiled %s %s\n using %s\n", - FFADO_PLUGIN_VERSION, __DATE__, __TIME__, PACKAGE_STRING); + FFADO_PLUGIN_VERSION, __TIMESTAMP__, PACKAGE_STRING); snd_config_iterator_t i, next; int err; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
