Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2018-02-14 09:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado" Wed Feb 14 09:19:08 2018 rev:33 rq:574334 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado-mixer.changes 2017-11-29 10:50:46.080768467 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado-mixer.changes 2018-02-14 09:19:12.218483244 +0100 @@ -1,0 +2,22 @@ +Thu Feb 8 10:19:36 UTC 2018 - [email protected] + +- Update to release 2.4.0 and fix build against glibc-2.27 + see boo#1079938. +- Removed patches fixed upstream: + ffado_SConstruct_powerpc_update.patch and sigev.patch. +- Rebased libffado-SConstruct-py3.patch partially fixed upstream. +- Added ffado-nosys.patch for missing import sys in SConstruct. +- Rebased ffado-gcc6.patch, partially fixed upstream. +- Upstream changes: + *Numerous build system and code improvements to support + architectures such as MIPS, x32 and various PowerPC flavours. + *A large number of fixes for newer versions of gcc + (particularly versions 6 and 7). + *Initial support for the optional TCO module of the + RME Fireface-800. + *Expanded ffado-mixer support for the Phase88 device. + *Initial work to make ffado-mixer compatible with + python3/pyqt5. + *Start work towards compatibility with scons3. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2017-12-06 08:57:48.702692509 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado.changes 2018-02-14 09:19:12.502472950 +0100 @@ -1,0 +2,22 @@ +Thu Feb 8 08:00:44 UTC 2018 - [email protected] + +- Update to release 2.4.0 and fix build against glibc-2.27 + see boo#1079938. +- Removed patches fixed upstream: + ffado_SConstruct_powerpc_update.patch and sigev.patch. +- Rebased libffado-SConstruct-py3.patch partially fixed upstream. +- Added ffado-nosys.patch for missing import sys in SConstruct. +- Rebased ffado-gcc6.patch, partially fixed upstream. +- Upstream changes: + *Numerous build system and code improvements to support + architectures such as MIPS, x32 and various PowerPC flavours. + *A large number of fixes for newer versions of gcc + (particularly versions 6 and 7). + *Initial support for the optional TCO module of the + RME Fireface-800. + *Expanded ffado-mixer support for the Phase88 device. + *Initial work to make ffado-mixer compatible with + python3/pyqt5. + *Start work towards compatibility with scons3. + +------------------------------------------------------------------- Old: ---- ffado_SConstruct_powerpc_update.patch libffado-2.3.0.tgz sigev.patch New: ---- ffado-nosys.patch libffado-2.4.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.C2d9HA/_old 2018-02-14 09:19:13.662430906 +0100 +++ /var/tmp/diff_new_pack.C2d9HA/_new 2018-02-14 09:19:13.666430761 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado-mixer # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,7 +20,7 @@ %define docs 0 %define tname libffado Name: ffado-mixer -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0+ @@ -28,9 +28,9 @@ Url: http://www.ffado.org/ # NOTE: download of tarball is taken care of in ffado Source0: %{tname}-%{version}.tgz -Patch1: ffado_SConstruct_powerpc_update.patch +# No current date and time allowed. +Patch0: libffado-date_time.patch Patch2: ffado-gcc6.patch -Patch3: sigev.patch # PATCH-FIX-UPSTREAM libffado-SConstruct-py3.patch Make SConstruct Python3 compatible # from Fedora # http://subversion.ffado.org/changeset/2711 @@ -39,7 +39,9 @@ # http://subversion.ffado.org/changeset/2714 # http://subversion.ffado.org/changeset/2715 # http://subversion.ffado.org/changeset/2716 -Patch4: libffado-SConstruct-py3.patch +Patch3: libffado-SConstruct-py3.patch +# PATCH-FIX-UPSTREAM ffado-nosys.patch [email protected] -- No import sys in SConstruct although functions are used. +Patch4: ffado-nosys.patch BuildRequires: alsa-devel BuildRequires: dbus-1-python-devel BuildRequires: doxygen @@ -93,12 +95,12 @@ %prep %setup -n %{tname}-%{version} -q -%patch1 -p0 +%patch0 %patch2 -%patch3 -p1 if head -n 1 /usr/bin/scons | grep python3; then -%patch4 -p0 +%patch3 fi +%patch4 %build export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" @@ -182,7 +184,6 @@ %files %defattr(-,root,root) -%doc README AUTHORS ChangeLog LICENSE.GPLv2 LICENSE.GPLv3 %{_bindir}/ffado-mixer %{_datadir}/%{tname}/ %{_datadir}/icons/* ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.C2d9HA/_old 2018-02-14 09:19:13.698429601 +0100 +++ /var/tmp/diff_new_pack.C2d9HA/_new 2018-02-14 09:19:13.702429456 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,10 +16,11 @@ # +%define sover 2 %define gcc7 0 %define tname libffado Name: ffado -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0+ @@ -29,9 +30,11 @@ Source1: baselibs.conf # No current date and time allowed. Patch0: libffado-date_time.patch -Patch1: ffado_SConstruct_powerpc_update.patch Patch2: ffado-gcc6.patch -Patch3: sigev.patch +# WARNING: libffado-SConstruct-py3.patch contains serious hacks because scons3 isn't ready for python3 +# Functions not working with python3 include: compiler check - context.TryRun library check - conf.CheckLibWithHeader +# and python function check - conf.CheckForPyModule +# Check for functionality after every scons update. # PATCH-FIX-UPSTREAM libffado-SConstruct-py3.patch Make SConstruct Python3 compatible # from Fedora # http://subversion.ffado.org/changeset/2711 @@ -40,7 +43,10 @@ # http://subversion.ffado.org/changeset/2714 # http://subversion.ffado.org/changeset/2715 # http://subversion.ffado.org/changeset/2716 -Patch4: libffado-SConstruct-py3.patch +Patch3: libffado-SConstruct-py3.patch +# PATCH-FIX-UPSTREAM ffado-nosys.patch [email protected] -- No import sys in SConstruct although functions are used. +Patch4: ffado-nosys.patch + BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -57,7 +63,7 @@ BuildRequires: pkgconfig(libiec61883) >= 1.1.0 BuildRequires: pkgconfig(libraw1394) >= 2.0.5 BuildRequires: pkgconfig(libxml++-2.6) >= 2.13.0 -Requires: libffado2 = %{version} +Requires: libffado%{sover} = %{version} Recommends: ffado-mixer = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,17 +86,17 @@ Requires: glibc-devel Requires: libconfig-devel Requires: libdbus-c++-devel -Requires: libffado2 = %{version} +Requires: libffado%{sover} = %{version} %description -n libffado-devel This package supplys the files necessary to develop applications that use the FFADO libraries and api. -%package -n libffado2 +%package -n libffado%{sover} Summary: FireWire 1394 support for audio devices Group: System/Libraries -%description -n libffado2 +%description -n libffado%{sover} This package provides the libffado shared library that provides a unified programming interface to configure and use all supported devices. Currently this library is used @@ -108,12 +114,11 @@ %setup -q -n %{tname}-%{version} %patch0 -%patch1 -p0 %patch2 -%patch3 -p1 if head -n 1 /usr/bin/scons | grep python3; then -%patch4 -p0 +%patch3 fi +%patch4 %build %if %{gcc7} == 1 @@ -186,15 +191,14 @@ %fdupes -s %{buildroot}%{_datadir} -%post -n libffado2 -p /sbin/ldconfig -%postun -n libffado2 -p /sbin/ldconfig +%post -n libffado%{sover} -p /sbin/ldconfig +%postun -n libffado%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) %doc README %doc AUTHORS -%doc LICENSE.GPLv2 -%doc LICENSE.GPLv3 +%license LICENSE.GPLv2 LICENSE.GPLv3 #%%doc ChangeLog %{_bindir}/dumpiso_mod %{_bindir}/gen-loadpulses @@ -237,9 +241,9 @@ %{_libdir}/%{tname}*.so %{_libdir}/pkgconfig/%{tname}.pc -%files -n libffado2 +%files -n libffado%{sover} %defattr(-,root,root) -%{_libdir}/%{tname}.so.2* +%{_libdir}/%{tname}.so.%{sover}* %dir %{_udevrulesdir} %dir %{_udevrulesdir}/.. %{_udevrulesdir}/60-ffado.rules ++++++ ffado-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.C2d9HA/_old 2018-02-14 09:19:13.738428151 +0100 +++ /var/tmp/diff_new_pack.C2d9HA/_new 2018-02-14 09:19:13.738428151 +0100 @@ -8,9 +8,9 @@ Index: 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 @@ +--- src/libutil/TimestampedBuffer.cpp.orig 2016-11-11 12:53:52.000000000 +0200 ++++ src/libutil/TimestampedBuffer.cpp 2018-02-08 08:46:22.834246329 +0200 +@@ -59,6 +59,7 @@ pthread_mutex_unlock(&m_framecounter_lock); \ } @@ -18,18 +18,10 @@ namespace Util { -@@ -179,7 +180,6 @@ bool TimestampedBuffer::setWrapValue(ffa - m_wrap_at=w; - return true; - } --#include <math.h> - - /** - * \brief return the effective rate Index: 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 +--- tests/test-enhanced-mixer.cpp.orig 2018-02-08 08:45:22.340133703 +0200 ++++ tests/test-enhanced-mixer.cpp 2018-02-08 08:46:22.834246329 +0200 @@ -25,6 +25,7 @@ #include "libutil/cmd_serialize.h" @@ -40,8 +32,8 @@ #include <cerrno> Index: 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 +--- tests/test-mixer.cpp.orig 2018-02-08 08:45:22.340133703 +0200 ++++ tests/test-mixer.cpp 2018-02-08 08:46:22.834246329 +0200 @@ -27,6 +27,7 @@ #include "debugmodule/debugmodule.h" @@ -61,8 +53,8 @@ int node_id = strtol( argv[2], &tail, 0 ); Index: 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 +--- tests/test-pan.cpp.orig 2018-02-08 08:45:22.340133703 +0200 ++++ tests/test-pan.cpp 2018-02-08 08:46:22.838246468 +0200 @@ -26,6 +26,7 @@ #include "libutil/cmd_serialize.h" @@ -82,8 +74,8 @@ int fb_id = strtol( argv[2], &tail, 0 ); Index: tests/test-volume.cpp =================================================================== ---- 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 +--- tests/test-volume.cpp.orig 2018-02-08 08:45:22.340133703 +0200 ++++ tests/test-volume.cpp 2018-02-08 08:46:22.838246468 +0200 @@ -28,6 +28,7 @@ #include "libutil/cmd_serialize.h" ++++++ ffado-nosys.patch ++++++ Index: SConstruct =================================================================== --- SConstruct.orig 2018-02-08 12:49:35.296940004 +0200 +++ SConstruct 2018-02-08 12:50:26.131358715 +0200 @@ -28,6 +28,7 @@ FFADO_VERSION="2.4.0" from subprocess import Popen, PIPE import os +import sys import re from string import Template import imp ++++++ libffado-2.3.0.tgz -> libffado-2.4.0.tgz ++++++ ++++ 14433 lines of diff (skipped) ++++++ libffado-SConstruct-py3.patch ++++++ ++++ 874 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ffado/libffado-SConstruct-py3.patch ++++ and /work/SRC/openSUSE:Factory/.ffado.new/libffado-SConstruct-py3.patch ++++++ libffado-date_time.patch ++++++ --- /var/tmp/diff_new_pack.C2d9HA/_old 2018-02-14 09:19:14.082415683 +0100 +++ /var/tmp/diff_new_pack.C2d9HA/_new 2018-02-14 09:19:14.082415683 +0100 @@ -1,7 +1,7 @@ Index: src/ffado.cpp =================================================================== --- src/ffado.cpp.orig 2012-03-10 16:03:53.000000000 +0200 -+++ src/ffado.cpp 2017-04-12 12:12:23.405010189 +0200 ++++ src/ffado.cpp 2018-02-08 08:45:13.055807986 +0200 @@ -89,7 +89,7 @@ ffado_device_t *ffado_streaming_init (ff struct _ffado_device *dev = new struct _ffado_device; @@ -14,7 +14,7 @@ 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 2017-04-12 12:41:54.637741960 +0200 ++++ support/alsa/alsa_plugin.cpp 2018-02-08 08:45:13.055807986 +0200 @@ -589,7 +589,7 @@ static int snd_pcm_ffado_open(snd_pcm_t SND_PCM_PLUGIN_DEFINE_FUNC(ffado) {
