Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2017-04-24 09:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado" Mon Apr 24 09:46:32 2017 rev:29 rq:487547 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado-mixer.changes 2016-03-29 14:29:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado-mixer.changes 2017-04-24 09:46:33.690815925 +0200 @@ -1,0 +2,7 @@ +Fri Mar 31 15:35:32 UTC 2017 - [email protected] + +- Update to 2.3.0 +- Removed api documentation package, no longer builds. +- See ffado.changes for common changes, no mixer changes. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2016-08-06 20:35:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado.changes 2017-04-24 09:46:33.806799520 +0200 @@ -1,0 +2,29 @@ +Wed Apr 12 10:44:23 UTC 2017 - [email protected] + +- Modify libffado-date_time.patch to allow reproducible builds. + +------------------------------------------------------------------- +Fri Mar 31 13:41:22 UTC 2017 - [email protected] + +- Update to 2.3.0 +- Fix gcc7 errors with -fpermissive see boo#1030245 +- Removed obsolete udev macro definition +- Rebased ffado_SConstruct_powerpc_update.patch and + ffado-gcc6.patch +- Duplicated %build scons statement in %install to prevent a + complete rebuild of the package. +- Upstream changes: + *Configuration entries added for additional devices which work + with the generic support layer (PreSonus Studiolive 32.4.2, + Presonus StudioLive 16.0.2, ICON FireXon, Onyx Blackbird and + the new Onyx 1640i, among others). + *Support added for the newer Focusrite Saffire Pro 26. + *Improved build support for various downstream consumers. + *Better routing for selected Saffire devices and the Firestudio + Mobile. + *Significant cleanup and refinement of the M-Audio and Yamaha + driver. + *Compilation fixes for recent versions of gcc. + *Recover from dead streams without causing jackd to shut down. + +------------------------------------------------------------------- Old: ---- libffado-2.2.1.tar.bz2 New: ---- libffado-2.3.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.j4WBLb/_old 2017-04-24 09:46:34.906643961 +0200 +++ /var/tmp/diff_new_pack.j4WBLb/_new 2017-04-24 09:46:34.910643395 +0200 @@ -1,7 +1,7 @@ # # spec file for package ffado-mixer # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,25 @@ # -Name: ffado-mixer +%define gcc7 0 +%define docs 0 %define tname libffado -Version: 2.2.1 +Name: ffado-mixer +Version: 2.3.0 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0+ Group: Productivity/Multimedia/Other Url: http://www.ffado.org/ -Source0: %{tname}-%{version}.tar.bz2 +# NOTE: download of tarball is taken care of in ffado +Source0: %{tname}-%{version}.tgz Patch1: ffado_SConstruct_powerpc_update.patch Patch2: ffado-gcc6.patch BuildRequires: alsa-devel BuildRequires: dbus-1-python-devel BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: ffado +BuildRequires: ffado = %{version} BuildRequires: gcc-c++ BuildRequires: graphviz-gnome BuildRequires: libavc1394-devel @@ -43,13 +46,15 @@ BuildRequires: libraw1394-devel >= 1.3.0 BuildRequires: pkg-config BuildRequires: python-qt4-devel -Requires: python-qt4 BuildRequires: scons BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: xorg-x11-fonts BuildRequires: pkgconfig(dbus-1) >= 1.0 +BuildRequires: pkgconfig(libffado) = %{version} BuildRequires: pkgconfig(libxml++-2.6) >= 2.13.0 +Requires: ffado = %{version} +Requires: python-qt4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{py_requires} @@ -67,6 +72,7 @@ mixed audio-control devices to DSP algorithm devices. This is a snapshot of svn revision 2040 +%if %{docs} == 1 %package -n ffado-doc Summary: API documentation for ffado Group: Documentation/HTML @@ -74,38 +80,64 @@ %description -n ffado-doc This package contains the libffado API documentation. +%endif %prep %setup -n %{tname}-%{version} -q -%patch1 -p1 +%patch1 -p0 %patch2 %build -scons %{?jobs:--jobs=%jobs} \ +export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" +%ifarch %arm +export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" +%endif +%if %{gcc7} == 1 +export CC=gcc-7 +export CPP=cpp-7 +export CXX=g++-7 +%endif +scons %{_smp_mflags} \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ MANDIR=%{_mandir} \ - ENABLE_GENERICAVC=yes \ + ENABLE_GENERICAVC=no \ SERIALIZE_USE_EXPAT=no \ DEBUG=no \ - ENABLE_ALL=yes \ + ENABLE_ALL=no \ + DETECT_USERSPACE_ENV=False \ PYPKGDIR=%{python_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ - BUILD_TESTS=yes \ - COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb --std=gnu++11" + BUILD_TESTS=no \ + BUILD_MIXER=True \ + COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ + CUSTOM_ENV=True %install -scons DESTDIR=%{buildroot} \ - install - -# Build API documentation -export top_srcdir=$PWD -pushd doc -doxygen -u reference.doxygen.in -doxygen reference.doxygen.in -mkdir -p %{buildroot}%{_docdir}/%{tname} -cp -r reference %{buildroot}%{_docdir}/%{tname} -popd +export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" +%ifarch %arm +export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" +%endif +%if %{gcc7} == 1 +export CC=gcc-7 +export CPP=cpp-7 +export CXX=g++-7 +%endif +scons DESTDIR=%{buildroot} install \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + MANDIR=%{_mandir} \ + ENABLE_GENERICAVC=no \ + SERIALIZE_USE_EXPAT=no \ + DEBUG=no \ + ENABLE_ALL=no \ + DETECT_USERSPACE_ENV=False \ + PYPKGDIR=%{python_sitelib} \ + ENABLE_OPTIMIZATIONS=yes \ + BUILD_TESTS=no \ + BUILD_MIXER=True \ + COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ + CUSTOM_ENV=True mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ rm %{buildroot}%{_libdir}/%tname.* @@ -145,8 +177,10 @@ %{_datadir}/applications/* %{python_sitelib}/* +%if %{docs} == 1 %files -n ffado-doc %defattr(-,root,root) %{_docdir}/%{tname} +%endif %changelog ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.j4WBLb/_old 2017-04-24 09:46:34.942638870 +0200 +++ /var/tmp/diff_new_pack.j4WBLb/_new 2017-04-24 09:46:34.946638304 +0200 @@ -1,7 +1,7 @@ # # spec file for package ffado # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,17 @@ # +%define gcc7 0 %define tname libffado -%if 0%{?suse_version} < 1310 -%if 0%{?suse_version} >= 1230 -%define _udevrulesdir %{_libexecdir}/udev/rules.d -%else -%define _udevrulesdir /lib/udev/rules.d -%endif -%endif Name: ffado -Version: 2.2.1 +Version: 2.3.0 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0+ Group: Productivity/Multimedia/Other Url: http://www.ffado.org/ -Source0: %{tname}-%{version}.tar.bz2 +Source0: http://www.ffado.org/files/%{tname}-%{version}.tgz Source1: baselibs.conf -# The svn repository is actually down, the changes are not update: don't use it -#Source2: ChangeLog # No current date and time allowed. Patch0: libffado-date_time.patch Patch1: ffado_SConstruct_powerpc_update.patch @@ -106,18 +98,25 @@ %prep %setup -q -n %{tname}-%{version} %patch0 -%patch1 -p1 +%patch1 -p0 %patch2 -# The svn repo is actually unavailable -#cp %%{SOURCE2} . %build -export EXTRA_FLAGS="-Wno-deprecated-declarations --std=gnu++11" +%if %{gcc7} == 1 +%define gcc_version 7 +export CC=gcc-7 +export CPP=cpp-7 +export CXX=g++-7 +%endif +export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" +%if 0%{?gcc_version} > 5 +export EXTRA_FLAGS="${EXTRA_FLAGS} -Werror=date-time" +%endif %ifarch %arm export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" %endif #export DBUS1_FLAGS="$DBUS1_FLAGS -lpthread" -scons %{?jobs:--jobs=%{jobs}} \ +scons %{_smp_mflags} \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ MANDIR=%{_mandir} \ @@ -128,13 +127,48 @@ ENABLE_ALL=yes \ PYPKGDIR=%{python_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ + DETECT_USERSPACE_ENV=False \ ENABLE_SETBUFFERSIZE_API_VER=auto \ BUILD_TESTS=yes \ + BUILD_MIXER=False \ ENABLE_DICE=true \ - COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" + COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ + CUSTOM_ENV=True %install -scons DESTDIR=%{buildroot} install +# WARNING: the install scons statement must be identical to the build one otherwise a complete rebuild is executed. +%if %{gcc7} == 1 +%define gcc_version 7 +export CC=gcc-7 +export CPP=cpp-7 +export CXX=g++-7 +%endif +export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" +%if 0%{?gcc_version} > 5 +export EXTRA_FLAGS="${EXTRA_FLAGS} -Werror=date-time" +%endif +%ifarch %arm +export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" +%endif +#export DBUS1_FLAGS="$DBUS1_FLAGS -lpthread" +scons DESTDIR=%{buildroot} install \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + MANDIR=%{_mandir} \ + UDEVDIR=%{_udevrulesdir} \ + ENABLE_GENERICAVC=yes \ + SERIALIZE_USE_EXPAT=no \ + DEBUG=no \ + ENABLE_ALL=yes \ + PYPKGDIR=%{python_sitelib} \ + ENABLE_OPTIMIZATIONS=yes \ + DETECT_USERSPACE_ENV=False \ + ENABLE_SETBUFFERSIZE_API_VER=auto \ + BUILD_TESTS=yes \ + BUILD_MIXER=False \ + ENABLE_DICE=true \ + COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ + CUSTOM_ENV=True %fdupes -s %{buildroot}%{_datadir} ++++++ ffado-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.j4WBLb/_old 2017-04-24 09:46:35.002630385 +0200 +++ /var/tmp/diff_new_pack.j4WBLb/_new 2017-04-24 09:46:35.002630385 +0200 @@ -8,8 +8,8 @@ Index: src/libutil/TimestampedBuffer.cpp =================================================================== ---- src/libutil/TimestampedBuffer.cpp.orig -+++ src/libutil/TimestampedBuffer.cpp +--- src/libutil/TimestampedBuffer.cpp.orig 2014-06-02 01:49:28.000000000 +0200 ++++ src/libutil/TimestampedBuffer.cpp 2017-03-22 13:08:54.747754701 +0200 @@ -58,6 +58,7 @@ pthread_mutex_unlock(&m_framecounter_lock); \ } @@ -28,8 +28,8 @@ * \brief return the effective rate Index: tests/test-enhanced-mixer.cpp =================================================================== ---- tests/test-enhanced-mixer.cpp.orig -+++ tests/test-enhanced-mixer.cpp +--- tests/test-enhanced-mixer.cpp.orig 2016-04-29 09:21:42.000000000 +0200 ++++ tests/test-enhanced-mixer.cpp 2017-03-22 13:08:54.747754701 +0200 @@ -25,6 +25,7 @@ #include "libutil/cmd_serialize.h" @@ -37,20 +37,11 @@ +#include <cerrno> #include <cstdlib> #include <cstring> - -@@ -77,7 +78,7 @@ main(int argc, char **argv) - exit(0); - } - -- int errno = 0; -+ errno = 0; - char* tail; - int node_id = strtol( argv[1], &tail, 0 ); - int fb_id = strtol( argv[2], &tail, 0 ); + #include <cerrno> Index: tests/test-mixer.cpp =================================================================== ---- tests/test-mixer.cpp.orig -+++ tests/test-mixer.cpp +--- tests/test-mixer.cpp.orig 2017-03-22 13:08:48.027508639 +0200 ++++ tests/test-mixer.cpp 2017-03-22 13:08:54.747754701 +0200 @@ -27,6 +27,7 @@ #include "debugmodule/debugmodule.h" @@ -70,8 +61,8 @@ int node_id = strtol( argv[2], &tail, 0 ); Index: tests/test-pan.cpp =================================================================== ---- tests/test-pan.cpp.orig -+++ tests/test-pan.cpp +--- tests/test-pan.cpp.orig 2017-03-22 13:08:48.027508639 +0200 ++++ tests/test-pan.cpp 2017-03-22 13:08:54.747754701 +0200 @@ -26,6 +26,7 @@ #include "libutil/cmd_serialize.h" @@ -91,22 +82,13 @@ int fb_id = strtol( argv[2], &tail, 0 ); Index: tests/test-volume.cpp =================================================================== ---- tests/test-volume.cpp.orig -+++ tests/test-volume.cpp -@@ -26,6 +26,7 @@ +--- tests/test-volume.cpp.orig 2016-04-29 09:21:42.000000000 +0200 ++++ tests/test-volume.cpp 2017-03-22 13:08:54.747754701 +0200 +@@ -28,6 +28,7 @@ #include "libutil/cmd_serialize.h" #include "libieee1394/ieee1394service.h" +#include <cerrno> - const bool bVerbose = false; + #include <cerrno> -@@ -127,7 +128,7 @@ main(int argc, char **argv) - exit(0); - } - -- int errno = 0; -+ errno = 0; - char* tail; - int node_id = strtol( argv[1], &tail, 0 ); - int fb_id = strtol( argv[2], &tail, 0 ); ++++++ ffado_SConstruct_powerpc_update.patch ++++++ --- /var/tmp/diff_new_pack.j4WBLb/_old 2017-04-24 09:46:35.030626425 +0200 +++ /var/tmp/diff_new_pack.j4WBLb/_new 2017-04-24 09:46:35.034625860 +0200 @@ -11,11 +11,11 @@ SConstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: libffado-2.2.1/SConstruct +Index: SConstruct =================================================================== ---- libffado-2.2.1.orig/SConstruct -+++ libffado-2.2.1/SConstruct -@@ -527,7 +527,7 @@ class CpuInfo (object): +--- SConstruct.orig 2016-08-08 12:31:03.000000000 +0200 ++++ SConstruct 2017-03-22 13:07:54.905563324 +0200 +@@ -571,7 +571,7 @@ class CpuInfo (object): # general CPU architecture self.is_x86 = self.machine in ('i686', 'x86_64') or \ re.match("i[3-5]86", self.machine) or False @@ -24,7 +24,7 @@ #!!! probably not comprehensive self.is_mips = self.machine == 'mips' #!!! not a comprehensive list. uname -m on one android phone reports 'armv71' -@@ -545,7 +545,8 @@ class CpuInfo (object): +@@ -589,7 +589,8 @@ class CpuInfo (object): # 64-bit (x86_64/AMD64/Intel64) # Long Mode (x86-64: amd64, also known as Intel 64, i.e. 64-bit capable) self.is_64bit = (self.is_x86 and 'lm' in self.x86_flags) or \ ++++++ libffado-date_time.patch ++++++ --- /var/tmp/diff_new_pack.j4WBLb/_old 2017-04-24 09:46:35.046624163 +0200 +++ /var/tmp/diff_new_pack.j4WBLb/_new 2017-04-24 09:46:35.046624163 +0200 @@ -1,26 +1,26 @@ 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 +--- src/ffado.cpp.orig 2012-03-10 16:03:53.000000000 +0200 ++++ src/ffado.cpp 2017-04-12 12:12:23.405010189 +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); ++ printMessage("%s built %s %s\n", ffado_get_version(), NULL, 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 ++++ support/alsa/alsa_plugin.cpp 2017-04-12 12:41:54.637741960 +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); ++ FFADO_PLUGIN_VERSION, NULL, PACKAGE_STRING); snd_config_iterator_t i, next; int err;
