Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2019-01-11 14:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado" Fri Jan 11 14:00:08 2019 rev:36 rq:662770 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado-mixer.changes 2018-11-06 13:49:38.500639673 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new.28833/ffado-mixer.changes 2019-01-11 14:00:10.444121057 +0100 @@ -1,0 +2,17 @@ +Fri Jan 4 10:15:07 UTC 2019 - [email protected] + +- Update to release 2.4.1 +- Fix build with ffado-mixer-fixbuild.patch. +- Removed uneeded and incorporated patches: + libffado-SConstruct-py3.patch, ffado-gcc6.patch and byteswap.patch +- Upstream changes: + *Fix some python syntax which was not compatible with python3. + These were missed during the preparation of FFADO 2.4.0. + *Modify the SCons build system to allow for scons running under + python3. + *Merge distribution patches provided by package maintainers. + *Address some difficulties experienced by package maintainers + when compiling FFADO. + *Improve the output of ffado-diag. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2018-11-06 13:49:38.832639223 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new.28833/ffado.changes 2019-01-11 14:00:10.632120868 +0100 @@ -1,0 +2,16 @@ +Thu Jan 3 16:54:02 UTC 2019 - [email protected] + +- Update to release 2.4.1 +- Removed uneeded and incorporated patches: + libffado-SConstruct-py3.patch, ffado-gcc6.patch and byteswap.patch +- Upstream changes: + *Fix some python syntax which was not compatible with python3. + These were missed during the preparation of FFADO 2.4.0. + *Modify the SCons build system to allow for scons running under + python3. + *Merge distribution patches provided by package maintainers. + *Address some difficulties experienced by package maintainers + when compiling FFADO. + *Improve the output of ffado-diag. + +------------------------------------------------------------------- Old: ---- byteswap.patch ffado-gcc6.patch libffado-2.4.0.tgz libffado-SConstruct-py3.patch New: ---- ffado-mixer-fixbuild.patch libffado-2.4.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.LqIjE4/_old 2019-01-11 14:00:13.332118150 +0100 +++ /var/tmp/diff_new_pack.LqIjE4/_new 2019-01-11 14:00:13.336118145 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado-mixer # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ %define docs 0 %define tname libffado Name: ffado-mixer -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0-or-later @@ -30,22 +30,11 @@ Source0: %{tname}-%{version}.tgz # No current date and time allowed. Patch0: libffado-date_time.patch -Patch2: ffado-gcc6.patch -# PATCH-FIX-UPSTREAM libffado-SConstruct-py3.patch Make SConstruct Python3 compatible -# from Fedora -# http://subversion.ffado.org/changeset/2711 -# http://subversion.ffado.org/changeset/2712 -# http://subversion.ffado.org/changeset/2713 -# http://subversion.ffado.org/changeset/2714 -# http://subversion.ffado.org/changeset/2715 -# http://subversion.ffado.org/changeset/2716 -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 -# PATCH-FIX-UPSTREAM RME: ensure byte swap macros are available for all components -Patch6: byteswap.patch +# PATCH-FIX-UPSTREAM ffado-mixer-fixbuild.patch [email protected] - python3 has os.walk to replace 2's os.path.walk. +Patch6: ffado-mixer-fixbuild.patch BuildRequires: alsa-devel -BuildRequires: dbus-1-python-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: ffado = %{version} @@ -56,19 +45,18 @@ BuildRequires: libdbus-c++-devel BuildRequires: libexpat-devel BuildRequires: libiec61883-devel >= 1.1.0 -BuildRequires: libqt4-devel BuildRequires: libraw1394-devel >= 1.3.0 BuildRequires: pkg-config -BuildRequires: python-qt4-devel +BuildRequires: python3-qt5-devel BuildRequires: scons BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: xorg-x11-fonts -BuildRequires: pkgconfig(dbus-1) >= 1.0 +BuildRequires: pkgconfig(dbus-python-3.6) BuildRequires: pkgconfig(libffado) = %{version} BuildRequires: pkgconfig(libxml++-2.6) >= 2.13.0 Requires: ffado = %{version} -Requires: python-qt4 +#Requires: python-qt4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -97,13 +85,10 @@ %prep %setup -n %{tname}-%{version} -q -%patch0 -%patch2 -if head -n 1 /usr/bin/scons | grep python3; then -%patch3 -fi -%patch4 -%patch6 -p1 +%autopatch -p0 + +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done %build export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" @@ -124,14 +109,16 @@ DEBUG=no \ ENABLE_ALL=no \ DETECT_USERSPACE_ENV=False \ - PYPKGDIR=%{python_sitelib} \ + PYPKGDIR=%{python3_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ BUILD_TESTS=no \ BUILD_MIXER=True \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ - CUSTOM_ENV=True + CUSTOM_ENV=True \ + PYTHON_INTERPRETER="%{_bindir}/python3" %install +mkdir -p %{buildroot}%{python3_sitelib} export EXTRA_FLAGS="-Wno-deprecated-declarations -fpermissive --std=gnu++11" %ifarch %arm export EXTRA_FLAGS="${EXTRA_FLAGS} -fPIC" @@ -141,6 +128,7 @@ export CPP=cpp-7 export CXX=g++-7 %endif + scons DESTDIR=%{buildroot} install \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ @@ -150,12 +138,13 @@ DEBUG=no \ ENABLE_ALL=no \ DETECT_USERSPACE_ENV=False \ - PYPKGDIR=%{python_sitelib} \ + PYPKGDIR=%{python3_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ BUILD_TESTS=no \ BUILD_MIXER=True \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ - CUSTOM_ENV=True + CUSTOM_ENV=True \ + PYTHON_INTERPRETER="%{_bindir}/python3" mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ rm %{buildroot}%{_libdir}/%tname.* @@ -170,6 +159,8 @@ rm -v "%{buildroot}$file" || true done +rm -rf %{buildroot}%{_libdir}/libffado + mkdir -p %{buildroot}%{_datadir}/applications/ mkdir -p %{buildroot}%{_datadir}/pixmaps cp support/xdg/hi64-apps-ffado.png %{buildroot}%{_datadir}/pixmaps/ffadomixer.png @@ -192,7 +183,8 @@ %{_datadir}/icons/* %{_datadir}/pixmaps/ffadomixer.png %{_datadir}/applications/* -%{python_sitelib}/* +%{python3_sitelib}/* +%{_datadir}/metainfo/ffado-mixer.appdata.xml %if %{docs} == 1 %files -n ffado-doc ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.LqIjE4/_old 2019-01-11 14:00:13.352118129 +0100 +++ /var/tmp/diff_new_pack.LqIjE4/_new 2019-01-11 14:00:13.356118125 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffado # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ %define gcc7 0 %define tname libffado Name: ffado -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: FireWire 1394 support for audio devices, svn snapshot License: GPL-2.0-or-later @@ -30,30 +30,14 @@ Source1: baselibs.conf # No current date and time allowed. Patch0: libffado-date_time.patch -Patch2: ffado-gcc6.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 -# http://subversion.ffado.org/changeset/2712 -# http://subversion.ffado.org/changeset/2713 -# http://subversion.ffado.org/changeset/2714 -# http://subversion.ffado.org/changeset/2715 -# http://subversion.ffado.org/changeset/2716 -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 Patch5: reproducible.patch -# PATCH-FIX-UPSTREAM RME: ensure byte swap macros are available for all components -Patch6: byteswap.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: scons +BuildRequires: scons >= 3.0.2 BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: pkgconfig(alsa) @@ -116,14 +100,10 @@ %prep %setup -q -n %{tname}-%{version} -%patch0 -%patch2 -if head -n 1 /usr/bin/scons | grep python3; then -%patch3 -fi -%patch4 -%patch5 -p1 -%patch6 -p1 +%autopatch -p0 + +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done %build %if %{gcc7} == 1 @@ -157,7 +137,8 @@ BUILD_MIXER=False \ ENABLE_DICE=true \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ - CUSTOM_ENV=True + CUSTOM_ENV=True \ + PYTHON_INTERPRETER="%{_bindir}/python3" %install # WARNING: the install scons statement must be identical to the build one otherwise a complete rebuild is executed. @@ -192,7 +173,10 @@ BUILD_MIXER=False \ ENABLE_DICE=true \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb ${EXTRA_FLAGS}" \ - CUSTOM_ENV=True + CUSTOM_ENV=True \ + PYTHON_INTERPRETER="%{_bindir}/python3" + +rm -rf %{buildroot}%{_libdir}/libffado %fdupes -s %{buildroot}%{_datadir} ++++++ ffado-mixer-fixbuild.patch ++++++ Index: support/mixer-qt4/SConscript =================================================================== --- support/mixer-qt4/SConscript.orig 2015-04-12 13:18:15.000000000 +0200 +++ support/mixer-qt4/SConscript 2019-01-03 18:41:11.712952139 +0200 @@ -38,7 +38,7 @@ if env['BUILD_MIXER'] == 'true': arg.append( os.path.join( dirname, name ) ) pythonfiles = [ 'ffado/config.py' ] - os.path.walk( "ffado", findfiles, pythonfiles ) + os.walk( "ffado", findfiles, pythonfiles ) e.ScanReplace( "ffado/config.py.in" ) e.Depends( "ffado/config.py", "#/SConstruct" ) ++++++ ffado-nosys.patch ++++++ --- /var/tmp/diff_new_pack.LqIjE4/_old 2019-01-11 14:00:13.400118081 +0100 +++ /var/tmp/diff_new_pack.LqIjE4/_new 2019-01-11 14:00:13.400118081 +0100 @@ -1,12 +1,12 @@ 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" +--- SConstruct.orig 2018-03-04 08:13:17.000000000 +0200 ++++ SConstruct 2019-01-03 16:16:05.422174226 +0200 +@@ -29,6 +29,7 @@ FFADO_VERSION="2.4.1" - from subprocess import Popen, PIPE + from subprocess import Popen, PIPE, check_output import os +import sys import re + import sys from string import Template - import imp ++++++ libffado-2.4.0.tgz -> libffado-2.4.1.tgz ++++++ ++++ 3106 lines of diff (skipped) ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.LqIjE4/_old 2019-01-11 14:00:13.672117807 +0100 +++ /var/tmp/diff_new_pack.LqIjE4/_new 2019-01-11 14:00:13.672117807 +0100 @@ -6,11 +6,11 @@ Always build with SSE2, independent of build system CPU -Index: libffado-2.4.0/SConstruct +Index: SConstruct =================================================================== ---- libffado-2.4.0.orig/SConstruct -+++ libffado-2.4.0/SConstruct -@@ -741,16 +741,10 @@ def cc_flags_x86(cpuinfo, enable_optimiz +--- SConstruct.orig 2019-01-03 16:18:09.167995690 +0200 ++++ SConstruct 2019-01-03 16:18:10.556060875 +0200 +@@ -748,16 +748,10 @@ def cc_flags_x86(cpuinfo, enable_optimiz opt_flags = [ ('sse', ('-mfpmath=sse', '-msse')), ('sse2', '-msse2'),
