- updated to 2.4.2

- updated detect-x32 patch (now only -fPIC part left)
- removed obsolete api-doc-only patch
- now defaults to libxml++ 3.0

diff --git a/detect-x32.patch b/detect-x32.patch
index 2762c375c03f5af4def4f6e78ae4c9b1b8fbddab..79ca55254c22d22e0d2dca4c789b92c4e0d7b338 100644 (file)
--- a/detect-x32.patch
+++ b/detect-x32.patch
@@ -1,46 +1,10 @@
-Description: detect x32
- This patch fixes misdetection of x32 as i386, and makes it pass -mx32 instead
- of -m32 (what's the purpose of forcing this flag???).
- .
- Unlike detection of 32/64-bitness, it asks the configured compiler instead of
- objdumping /bin/mount.  If somehow you prefer that way instead, the string
- would be: "file format elf32-x86-64".
-Author: Adam Borowski <kilobyte@angband.pl>
-
---- libffado-2.3.0/SConstruct.orig     2016-10-06 17:05:43.420336610 +0200
-+++ libffado-2.3.0/SConstruct  2016-10-06 17:08:28.043668063 +0200
-@@ -709,6 +709,21 @@
-     return answer
- 
- 
-+def is_userspace_x32():
-+    """Check if the chosen compiler targets x32.
-+    """
-+    # Doing this instead of bizarre checks for /bin/mounts, this works
-+    # in multiarch/multilib or crosscompiling scenarios.
-+    cc = os.getenv('CC')
-+    if cc == None:
-+        cc = 'cc'
-+    x = outputof(cc, '-dumpmachine')
-+    for line in x.split('\n'):
-+        if line.endswith('x32'):
-+            return True
-+    return None
-+
-+
- def cc_flags_x86(cpuinfo, enable_optimizations):
-     """add certain gcc -m flags based on CPU features
-     """
-@@ -809,7 +824,11 @@
-             machineflags = { 'CXXFLAGS' : ['-m64'] }
-         env.MergeFlags( machineflags )
-     elif cpuinfo.is_x86:
--        if m32:
-+        if is_userspace_x32():
-+            print "Doing an x32 %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-+            machineflags = { 'CXXFLAGS' : ['-mx32'] }
-+            needs_fPIC = True
-+        elif m32:
-             print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-             machineflags = { 'CXXFLAGS' : ['-m32'] }
+--- libffado-2.4.2/SConstruct.orig     2019-09-21 08:40:33.000000000 +0200
++++ libffado-2.4.2/SConstruct  2020-03-10 05:40:06.349185946 +0100
+@@ -836,6 +836,7 @@
+             print("Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name))
+             if cpuinfo.machine == 'x86_64':
+                 machineflags = { 'CXXFLAGS' : ['-mx32'] }
++                needs_fPIC = True
+             else:
+                 machineflags = { 'CXXFLAGS' : ['-m32'] }
          else:

diff --git a/libffado-api-doc-only.patch b/libffado-api-doc-only.patch
deleted file mode 100644 (file)
index 0c2564a..0000000
--- a/libffado-api-doc-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -rupN libffado.old/doc/reference.doxygen.in libffado/doc/reference.doxygen.in
---- libffado.old/doc/reference.doxygen.in      2009-12-18 13:52:13.000000000 -0500
-+++ libffado/doc/reference.doxygen.in  2010-06-05 21:00:54.000000000 -0400
-@@ -568,9 +568,7 @@ WARN_LOGFILE           =
- # directories like "/usr/src/myproject". Separate the files or directories
- # with spaces.
- 
--INPUT                  = $top_srcdir/src \
--                         $top_srcdir/doc \
--                         $top_srcdir/libffado
-+INPUT                  = $top_srcdir/libffado
- 
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-diff -rupN libffado.old/SConstruct libffado/SConstruct
---- libffado.old/SConstruct    2010-05-10 15:34:07.000000000 -0400
-+++ libffado/SConstruct        2010-06-05 21:29:43.000000000 -0400
-@@ -583,7 +583,7 @@ if not env.GetOption('clean'):
-     Default( 'support' )
-     if env['BUILD_TESTS']:
-         Default( 'tests' )
--
-+    Default( 'doc' )
- #
- # Deal with the DESTDIR vs. xdg-tools conflict (which is basicely that the
- # xdg-tools can't deal with DESTDIR, so the packagers have to deal with this

diff --git a/libffado.spec b/libffado.spec
index 8bee608a9314223d9210c424a23f5980131adef4..48f2f0e66fa49f4930eef7e62f6543ce5f479638 100644 (file)
--- a/libffado.spec
+++ b/libffado.spec
@@ -7,14 +7,13 @@
 Summary:       Free FireWire audio driver library
 Summary(pl.UTF-8):     Wolnodostępna biblioteka sterownika dźwięku FireWire
 Name:          libffado
-Version:       2.3.0
+Version:       2.4.2
 Release:       1
 License:       GPL v2 or GPL v3
 Group:         Libraries
 #Source0Download: http://www.ffado.org/?q=node/5
 Source0:       http://www.ffado.org/files/%{name}-%{version}.tgz
-# Source0-md5: 8f452977267200cfaf9b8e16ba3c92df
-Patch0:                %{name}-api-doc-only.patch
+# Source0-md5: 2b7eddffeaac68cdd145928a6cb62540
 Patch1:                detect-x32.patch
 URL:           http://www.ffado.org/
 BuildRequires: alsa-lib-devel >= 0.9
@@ -33,7 +32,7 @@ BuildRequires:        libiec61883-devel >= 1.1.0
 BuildRequires: libraw1394-devel >= 2.0.5
 # -std=gnu++11 for libxml++ 2.40+
 BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: libxml++2-devel >= 2.13.0
+BuildRequires: libxml++-devel >= 3.0.0
 BuildRequires: pkgconfig
 BuildRequires: scons
 %if %{with apidocs}
@@ -54,7 +53,7 @@ BuildRequires:        python-dbus-devel >= 0.82.0
 Requires:      libavc1394 >= 0.5.3
 Requires:      libiec61883 >= 1.1.0
 Requires:      libraw1394 >= 2.0.5
-Requires:      libxml++2 >= 2.13.0
+Requires:      libxml++ >= 3.0.0
 Suggests:      qjackctl >= 0.2.20.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -126,7 +125,6 @@ Graficzny mikser dla FFADO.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -136,7 +134,8 @@ Graficzny mikser dla FFADO.
        PREFIX=%{_prefix} \
        MANDIR=%{_mandir} \
        LIBDIR=%{_libdir} \
-       PYPKGDIR=%{py_sitescriptdir}
+       PYPKGDIR=%{py_sitescriptdir} \
+       PYTHON_INTERPRETER=%{__python}
 
 %if %{with apidocs}
 %{__scons} doc
@@ -202,7 +201,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/libffado/fwap.xml
 %{_datadir}/libffado/refdesign.xml
 %{_datadir}/%{name}/configuration
-%dir %{_datadir}/%{name}/python
 %{_mandir}/man1/ffado-bridgeco-downloader.1*
 %{_mandir}/man1/ffado-dbus-server.1*
 %{_mandir}/man1/ffado-diag.1*
@@ -226,10 +224,8 @@ rm -rf $RPM_BUILD_ROOT
 %files diag
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ffado-diag
-%{_datadir}/%{name}/python/ffado_diag_helpers.py
-%{_datadir}/%{name}/python/helpstrings.py
-%{_datadir}/%{name}/python/listirqinfo.py
-%{_datadir}/%{name}/python/static_info.txt
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/static_info.txt
 
 %if %{with gui}
 %files gui
@@ -237,7 +233,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ffado-mixer
 %{_datadir}/%{name}/icons
 %{py_sitescriptdir}/ffado
+%{_datadir}/metainfo/ffado-mixer.appdata.xml
 %{_desktopdir}/ffado.org-ffadomixer.desktop
-%{_iconsdir}/hicolor/*/apps/ffado.png
+%{_iconsdir}/hicolor/64x64/apps/ffado.png
 %{_mandir}/man1/ffado-mixer.1*
 %endif