From cf14f93e3789582d3ad34a0cb75e3666b1f847a2 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 17 Feb 2017 10:15:59 +0300 Subject: [PATCH] hardware/firewire:update and rebuild --- hardware/firewire/libavc1394/pspec.xml | 7 + hardware/firewire/libdc1394/pspec.xml | 9 +- hardware/firewire/libffado/files/gcc6.patch | 19 ++ .../libffado-2.1.0-no-jackd-version.patch | 65 ----- .../files/libffado-2.2.1-jack-detect.patch | 44 --- .../libffado/files/libffado-2.2.1-mixer.patch | 102 ------- .../firewire/libffado/files/libxml++3.patch | 252 ++++++++++++++++++ hardware/firewire/libffado/pspec.xml | 16 +- hardware/firewire/libfreebob/pspec.xml | 7 + hardware/firewire/libiec61883/pspec.xml | 7 + hardware/firewire/libraw1394/pspec.xml | 7 + 11 files changed, 317 insertions(+), 218 deletions(-) create mode 100644 hardware/firewire/libffado/files/gcc6.patch delete mode 100644 hardware/firewire/libffado/files/libffado-2.1.0-no-jackd-version.patch delete mode 100644 hardware/firewire/libffado/files/libffado-2.2.1-jack-detect.patch delete mode 100644 hardware/firewire/libffado/files/libffado-2.2.1-mixer.patch create mode 100644 hardware/firewire/libffado/files/libxml++3.patch diff --git a/hardware/firewire/libavc1394/pspec.xml b/hardware/firewire/libavc1394/pspec.xml index 44e2c8b84c..f80f022e12 100644 --- a/hardware/firewire/libavc1394/pspec.xml +++ b/hardware/firewire/libavc1394/pspec.xml @@ -48,6 +48,13 @@ + + 2017-02-17 + 0.5.4 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 0.5.4 diff --git a/hardware/firewire/libdc1394/pspec.xml b/hardware/firewire/libdc1394/pspec.xml index b3508d4ef3..2355324daf 100644 --- a/hardware/firewire/libdc1394/pspec.xml +++ b/hardware/firewire/libdc1394/pspec.xml @@ -12,7 +12,7 @@ library Programming interface for IEEE 1394 based cameras libdc1394 is a library that is intended to provide a high level programming interface for application developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specification (found at http://www.1394ta.org/). - https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.4/libdc1394-2.2.4.tar.gz + https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.5/libdc1394-2.2.5.tar.gz libraw1394-devel libusb-devel @@ -46,6 +46,13 @@ + + 2017-02-17 + 2.2.5 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + 2016-11-27 2.2.4 diff --git a/hardware/firewire/libffado/files/gcc6.patch b/hardware/firewire/libffado/files/gcc6.patch new file mode 100644 index 0000000000..f9cad9c88a --- /dev/null +++ b/hardware/firewire/libffado/files/gcc6.patch @@ -0,0 +1,19 @@ +Author: Adrian Knoth +Forwarded: Yes +Applied-Upstream: 2.3.1 +Last-Update: 2016-08-11 +Description: Fix FTBFS with gcc6 + +Index: b/src/ffadotypes.h +=================================================================== +--- a/src/ffadotypes.h ++++ b/src/ffadotypes.h +@@ -51,6 +51,8 @@ struct ffado_handle { + }; + + ++#include ++#include + #include + #include + diff --git a/hardware/firewire/libffado/files/libffado-2.1.0-no-jackd-version.patch b/hardware/firewire/libffado/files/libffado-2.1.0-no-jackd-version.patch deleted file mode 100644 index 78b24b323d..0000000000 --- a/hardware/firewire/libffado/files/libffado-2.1.0-no-jackd-version.patch +++ /dev/null @@ -1,65 +0,0 @@ -# AUTHOR: lilrc -# A patch to avoid calling jackd --version from within the build system -# which generates a sandbox violation. Instead use pkgconfig as jack -# will install the necessary pkgconfig files. - -diff -ur libffado-2.1.0.a/SConstruct libffado-2.1.0.b/SConstruct ---- libffado-2.1.0.a/SConstruct 2013-04-01 12:55:08.239992516 +0200 -+++ libffado-2.1.0.b/SConstruct 2013-04-01 13:54:42.019972442 +0200 -@@ -194,16 +194,6 @@ - # restricted to 0-255. - return (int(maj) << 24) | (int(min) << 8) | int(patch) - --def CheckJackdVer(): -- print 'Checking jackd version...', -- ret = Popen("which jackd >/dev/null 2>&1 && jackd --version | cut -d ' ' -f 3", shell=True, stdout=PIPE).stdout.read()[:-1] -- if (ret == ""): -- print "not installed" -- return -1 -- else: -- print ret -- return VersionInt(ret) -- - if env['SERIALIZE_USE_EXPAT']: - env['SERIALIZE_USE_EXPAT']=1 - else: -@@ -248,24 +238,9 @@ - if not env['SERIALIZE_USE_EXPAT']: - pkgs['libxml++-2.6'] = '2.13.0' - -- # Provide a way for users to compile newer libffado which will work -- # against older jack installations which will not accept the new API -- # version reported at runtime. -- jackd_ver = CheckJackdVer() -- if (jackd_ver != -1): -- # If jackd is available, use the version number reported by it. This -- # means users don't have to have jack development files present on -- # their system for this to work. -- have_jack = (jackd_ver >= VersionInt('0.0.0')) -- good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.122.0')) -- good_jack2 = (jackd_ver >= VersionInt('1.9.9')) -- else: -- # Jackd is not runnable. Attempt to identify a version from -- # pkgconfig on the off-chance jack details are available from there. -- print "Will retry jack detection using pkg-config" -- have_jack = conf.CheckPKG('jack >= 0.0.0') -- good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0') -- good_jack2 = conf.CheckPKG('jack >= 1.9.9') -+ have_jack = conf.CheckPKG('jack >= 0.0.0') -+ good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0') -+ good_jack2 = conf.CheckPKG('jack >= 1.9.9') - if env['ENABLE_SETBUFFERSIZE_API_VER'] == 'auto': - if not(have_jack): - print """ -diff -ur libffado-2.1.0.a/support/tools/ffado-diag-static libffado-2.1.0.b/support/tools/ffado-diag-static ---- libffado-2.1.0.a/support/tools/ffado-diag-static 2010-05-03 21:37:15.000000000 +0200 -+++ libffado-2.1.0.b/support/tools/ffado-diag-static 2013-04-02 17:45:15.924979761 +0200 -@@ -75,7 +75,7 @@ - print " gcc ............... %s" % get_version_first_line('gcc --version') - print " g++ ............... %s" % get_version_first_line('g++ --version') - print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') -- print " jackd ............. %s" % get_version_first_line('jackd --version') -+ print " jackd ............. %s" % get_version_first_line('pkg-config --modversion jack') - print " path ............ %s" % get_command_path('jackd') - print " flags ........... %s" % get_package_flags("jack") - print " libraw1394 ........ %s" % get_package_version("libraw1394") diff --git a/hardware/firewire/libffado/files/libffado-2.2.1-jack-detect.patch b/hardware/firewire/libffado/files/libffado-2.2.1-jack-detect.patch deleted file mode 100644 index 74e41a8b0b..0000000000 --- a/hardware/firewire/libffado/files/libffado-2.2.1-jack-detect.patch +++ /dev/null @@ -1,44 +0,0 @@ -# Patch to change the order of the checks for jack version. See -# http://subversion.ffado.org/ticket/381 for more information. -# Applied upstream. - -Index: SConstruct -=================================================================== ---- SConstruct (revision 2574) -+++ SConstruct (revision 2575) -@@ -250,21 +250,21 @@ - # Provide a way for users to compile newer libffado which will work - # against older jack installations which will not accept the new API - # version reported at runtime. -- jackd_ver = CheckJackdVer() -- if (jackd_ver != -1): -- # If jackd is available, use the version number reported by it. This -- # means users don't have to have jack development files present on -- # their system for this to work. -- have_jack = (jackd_ver >= VersionInt('0.0.0')) -- good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.121.4')) -- good_jack2 = (jackd_ver >= VersionInt('1.9.9')) -+ have_jack = conf.CheckPKG('jack') -+ if have_jack: -+ good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.121.4') -+ good_jack2 = conf.CheckPKG('jack >= 1.9.9') - else: -- # Jackd is not runnable. Attempt to identify a version from -- # pkgconfig on the off-chance jack details are available from there. -- print "Will retry jack detection using pkg-config" -- have_jack = conf.CheckPKG('jack >= 0.0.0') -- good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0') -- good_jack2 = conf.CheckPKG('jack >= 1.9.9') -+ jackd_ver = CheckJackdVer() -+ if (jackd_ver != -1): -+ # If jackd is unknown to pkg-config but is never-the-less -+ # runnable, use the version number reported by it. This means -+ # users don't have to have jack development files present on -+ # their system for this to work. -+ have_jack = (jackd_ver >= VersionInt('0.0.0')) -+ good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.121.4')) -+ good_jack2 = (jackd_ver >= VersionInt('1.9.9')) -+ - if env['ENABLE_SETBUFFERSIZE_API_VER'] == 'auto': - if not(have_jack): - print """ diff --git a/hardware/firewire/libffado/files/libffado-2.2.1-mixer.patch b/hardware/firewire/libffado/files/libffado-2.2.1-mixer.patch deleted file mode 100644 index 52458315e5..0000000000 --- a/hardware/firewire/libffado/files/libffado-2.2.1-mixer.patch +++ /dev/null @@ -1,102 +0,0 @@ -# AUTHOR: Karl Linden (lilrc) -# DESCRIPTION: Patch to remove the automagic dependency on PyQt and friends. -# STATUS: Sent upstream as of 26 March 2015. -# SEE: http://subversion.ffado.org/ticket/391 - -Index: SConstruct -=================================================================== ---- SConstruct (revision 2587) -+++ SConstruct (working copy) -@@ -68,6 +68,7 @@ - this code.""", False ), - BoolVariable( "ENABLE_ALL", "Enable/Disable support for all devices.", False ), - BoolVariable( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ), -+ EnumVariable( "BUILD_MIXER", "Build the ffado-mixer", 'auto', allowed_values=('auto', 'true', 'false'), ignorecase=2), - BoolVariable( "BUILD_TESTS", """\ - Build the tests in their directory. As some contain quite some functionality, - this is on by default. -@@ -379,28 +380,33 @@ - # - - # PyQT checks --build_mixer = False --if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): -- env['PYUIC4'] = True -- build_mixer = True -+if env['BUILD_MIXER'] != 'false': -+ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): -+ env['BUILD_MIXER'] = 'true' -+ elif not env.GetOption('clean'): -+ if env['BUILD_MIXER'] == 'auto': -+ env['BUILD_MIXER'] = 'false' -+ print """ -+The prerequisites ('pyuic4' and the python-modules 'dbus' and 'PyQt4', the -+packages could be named like dbus-python and PyQt) to build the mixer were not -+found. Therefore the qt4 mixer will not be installed.""" -+ else: # env['BUILD_MIXER'] == 'true' -+ print """ -+The prerequisites ('pyuic4' and the python-modules 'dbus' and 'PyQt4', the -+packages could be named like dbus-python and PyQt) to build the mixer were not -+found, but BUILD_MIXER was requested.""" -+ Exit( 1 ) - --if conf.CheckForApp( 'xdg-desktop-menu --help' ): -- env['XDG_TOOLS'] = True --else: -- print """ --I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource --this is needed to add the fancy entry to your menu. But if the mixer will be --installed, you can start it by executing "ffado-mixer". --""" -+env['XDG_TOOLS'] = False -+if env['BUILD_MIXER'] == 'true': -+ if conf.CheckForApp( 'xdg-desktop-menu --help' ) and conf.CheckForApp( 'xdg-icon-resource --help' ): -+ env['XDG_TOOLS'] = True -+ else: -+ print """ -+I couldn't find the 'xdg-desktop-menu' and 'xdg-icon-resource' programs. These -+are needed to add the fancy entry for the mixer to your menu, but you can still -+start it by executing "ffado-mixer".""" - --if not build_mixer and not env.GetOption('clean'): -- print """ --I couldn't find all the prerequisites ('pyuic4' and the python-modules 'dbus' --and 'PyQt4', the packages could be named like dbus-python and PyQt) to build the --mixer. --Therefor the qt4 mixer will not get installed. --""" -- - # - # Optional pkg-config - # -@@ -510,7 +516,7 @@ - env.Alias( "install", env['sharedir'] ) - env.Alias( "install", env['bindir'] ) - env.Alias( "install", env['mandir'] ) --if build_mixer: -+if env['BUILD_MIXER'] == 'true': - env.Alias( "install", env['pypkgdir'] ) - - # -@@ -909,7 +915,7 @@ - if env.GetOption( "clean" ): - env.Execute( action ) - -- if env.has_key( 'XDG_TOOLS' ) and env.has_key( 'PYUIC4' ): -+ if env['BUILD_MIXER'] == 'true' and env['XDG_TOOLS']: - if not env.GetOption("clean"): - action = "install" - else: -Index: support/mixer-qt4/SConscript -=================================================================== ---- support/mixer-qt4/SConscript (revision 2587) -+++ support/mixer-qt4/SConscript (working copy) -@@ -26,7 +26,7 @@ - - Import( 'env' ) - --if env.has_key('PYUIC4'): -+if env['BUILD_MIXER'] == 'true': - e = env.Clone() - - def findfiles( arg, dirname, names ): diff --git a/hardware/firewire/libffado/files/libxml++3.patch b/hardware/firewire/libffado/files/libxml++3.patch new file mode 100644 index 0000000000..0123e4324e --- /dev/null +++ b/hardware/firewire/libffado/files/libxml++3.patch @@ -0,0 +1,252 @@ +Index: /trunk/libffado/src/SConscript +=================================================================== +--- /trunk/libffado/src/SConscript (revision 2590) ++++ /trunk/libffado/src/SConscript (revision 2650) +@@ -289,4 +289,7 @@ + libenv.MergeFlags( env['LIBCONFIG_FLAGS'] ) + if not env['SERIALIZE_USE_EXPAT']: ++ if 'LIBXML30_FLAGS' in env : ++ libenv.MergeFlags( env['LIBXML30_FLAGS'] ) ++ if not('LIBXML30_FLAGS' in env) : + libenv.MergeFlags( env['LIBXML26_FLAGS'] ) + else: +Index: /trunk/libffado/src/libutil/serialize_libxml.cpp +=================================================================== +--- /trunk/libffado/src/libutil/serialize_libxml.cpp (revision 1763) ++++ /trunk/libffado/src/libutil/serialize_libxml.cpp (revision 2650) +@@ -76,9 +76,17 @@ + Util::XMLSerialize::writeVersion() + { ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Element* pElem = m_doc.get_root_node()->add_child_element( "CacheVersion" ); ++#else + xmlpp::Node* pNode = m_doc.get_root_node(); + xmlpp::Element* pElem = pNode->add_child( "CacheVersion" ); ++#endif + char* valstr; + asprintf( &valstr, "%s", CACHE_VERSION ); ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ pElem->set_first_child_text( valstr ); ++#else + pElem->set_child_text( valstr ); ++#endif + free( valstr ); + } +@@ -100,12 +108,20 @@ + } + +- xmlpp::Node* pNode = m_doc.get_root_node(); ++ xmlpp::Element* pNode = m_doc.get_root_node(); + pNode = getNodePath( pNode, tokens ); + + // element to be added ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Element* pElem = pNode->add_child_element( tokens[tokens.size() - 1] ); ++#else + xmlpp::Element* pElem = pNode->add_child( tokens[tokens.size() - 1] ); ++#endif + char* valstr; + asprintf( &valstr, "%lld", value ); ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ pElem->set_first_child_text( valstr ); ++#else + pElem->set_child_text( valstr ); ++#endif + free( valstr ); + +@@ -128,16 +144,21 @@ + } + +- xmlpp::Node* pNode = m_doc.get_root_node(); ++ xmlpp::Element* pNode = m_doc.get_root_node(); + pNode = getNodePath( pNode, tokens ); + + // element to be added ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Element* pElem = pNode->add_child_element( tokens[tokens.size() - 1] ); ++ pElem->set_first_child_text( str ); ++#else + xmlpp::Element* pElem = pNode->add_child( tokens[tokens.size() - 1] ); + pElem->set_child_text( str ); ++#endif + + return true; + } + +-xmlpp::Node* +-Util::XMLSerialize::getNodePath( xmlpp::Node* pRootNode, ++xmlpp::Element* ++Util::XMLSerialize::getNodePath( xmlpp::Element* pRootNode, + std::vector& tokens ) + { +@@ -150,5 +171,5 @@ + + unsigned int iTokenIdx = 0; +- xmlpp::Node* pCurNode = pRootNode; ++ xmlpp::Element* pCurNode = pRootNode; + for (bool bFound = false; + ( iTokenIdx < tokens.size() - 1 ); +@@ -161,5 +182,5 @@ + { + if ( ( *it )->get_name() == tokens[iTokenIdx] ) { +- pCurNode = *it; ++ pCurNode = (xmlpp::Element*) *it; + bFound = true; + break; +@@ -172,5 +193,9 @@ + + for ( unsigned int i = iTokenIdx; i < tokens.size() - 1; i++, iTokenIdx++ ) { ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ pCurNode = pCurNode->add_child_element( tokens[iTokenIdx] ); ++#else + pCurNode = pCurNode->add_child( tokens[iTokenIdx] ); ++#endif + } + return pCurNode; +@@ -255,8 +280,15 @@ + debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "pNode = %s\n", pNode->get_name().c_str() ); + ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Node::NodeSet nodeSet = pNode->find( strMemberName ); ++ for ( xmlpp::Node::NodeSet::iterator it = nodeSet.begin(); ++ it != nodeSet.end(); ++ ++it ) ++#else + xmlpp::NodeSet nodeSet = pNode->find( strMemberName ); + for ( xmlpp::NodeSet::iterator it = nodeSet.begin(); + it != nodeSet.end(); + ++it ) ++#endif + { + const xmlpp::Element* pElement = +@@ -264,6 +296,11 @@ + if ( pElement && pElement->has_child_text() ) { + char* tail; ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ value = strtoll( pElement->get_first_child_text()->get_content().c_str(), ++ &tail, 0 ); ++#else + value = strtoll( pElement->get_child_text()->get_content().c_str(), + &tail, 0 ); ++#endif + debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "found %s = %lld\n", + strMemberName.c_str(), value ); +@@ -291,13 +328,24 @@ + xmlpp::Node* pNode = pDoc->get_root_node(); + ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Node::NodeSet nodeSet = pNode->find( strMemberName ); ++ for ( xmlpp::Node::NodeSet::iterator it = nodeSet.begin(); ++ it != nodeSet.end(); ++ ++it ) ++#else + xmlpp::NodeSet nodeSet = pNode->find( strMemberName ); + for ( xmlpp::NodeSet::iterator it = nodeSet.begin(); + it != nodeSet.end(); + ++it ) ++#endif + { + const xmlpp::Element* pElement = dynamic_cast< const xmlpp::Element* >( *it ); + if ( pElement ) { + if ( pElement->has_child_text() ) { ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ str = pElement->get_first_child_text()->get_content(); ++#else + str = pElement->get_child_text()->get_content(); ++#endif + } else { + str = ""; +@@ -323,5 +371,9 @@ + } + xmlpp::Node* pNode = pDoc->get_root_node(); ++#if LIBXMLXX_MAJOR_VERSION == 3 ++ xmlpp::Node::NodeSet nodeSet = pNode->find( strMemberName ); ++#else + xmlpp::NodeSet nodeSet = pNode->find( strMemberName ); ++#endif + return nodeSet.size() > 0; + } +Index: /trunk/libffado/src/libutil/serialize_libxml.h +=================================================================== +--- /trunk/libffado/src/libutil/serialize_libxml.h (revision 1154) ++++ /trunk/libffado/src/libutil/serialize_libxml.h (revision 2650) +@@ -81,5 +81,5 @@ + DECLARE_DEBUG_MODULE; + +- xmlpp::Node* getNodePath( xmlpp::Node* pRootNode, ++ xmlpp::Element* getNodePath( xmlpp::Element* pRootNode, + std::vector& tokens ); + }; +Index: /trunk/libffado/tests/SConscript +=================================================================== +--- /trunk/libffado/tests/SConscript (revision 2141) ++++ /trunk/libffado/tests/SConscript (revision 2650) +@@ -33,4 +33,7 @@ + env.MergeFlags( env['LIBRAW1394_FLAGS'] ) + if not env['SERIALIZE_USE_EXPAT']: ++ if 'LIBXML30_FLAGS' in env : ++ env.MergeFlags( env['LIBXML30_FLAGS'] ) ++ if not('LIBXML30_FLAGS' in env) : + env.MergeFlags( env['LIBXML26_FLAGS'] ) + else: +Index: /trunk/libffado/SConstruct +=================================================================== +--- /trunk/libffado/SConstruct (revision 2628) ++++ /trunk/libffado/SConstruct (revision 2650) +@@ -277,5 +277,8 @@ + + if not env['SERIALIZE_USE_EXPAT']: +- pkgs['libxml++-2.6'] = '2.13.0' ++ if conf.CheckPKG('libxml++-3.0'): ++ pkgs['libxml++-3.0'] = '3.0.0' ++ if not('libxml++-3.0' in pkgs): ++ pkgs['libxml++-2.6'] = '2.13.0' + + # Provide a way for users to compile newer libffado which will work +@@ -359,4 +362,6 @@ + if conf.CheckPKG('libxml++-2.6 >= 2.39.1'): + env.Append(CXXFLAGS = '-std=gnu++11') ++ if conf.CheckPKG('libxml++-3.0 >= 3.0.0'): ++ env.Append(CXXFLAGS = '-std=gnu++11') + + # Check for C99 lrint() and lrintf() functions used to convert from +Index: /trunk/libffado/support/tools/SConscript +=================================================================== +--- /trunk/libffado/support/tools/SConscript (revision 2321) ++++ /trunk/libffado/support/tools/SConscript (revision 2650) +@@ -34,4 +34,7 @@ + if not e.GetOption( "clean" ): + if not env['SERIALIZE_USE_EXPAT']: ++ if 'LIBXML30_FLAGS' in env : ++ e.MergeFlags( env['LIBXML30_FLAGS'] ) ++ if not('LIBXML30_FLAGS' in env) : + e.MergeFlags( env['LIBXML26_FLAGS'] ) + else: +Index: /trunk/libffado/support/firmware/SConscript +=================================================================== +--- /trunk/libffado/support/firmware/SConscript (revision 2089) ++++ /trunk/libffado/support/firmware/SConscript (revision 2650) +@@ -34,5 +34,8 @@ + env.MergeFlags( env['LIBIEC61883_FLAGS'] ) + if not env['SERIALIZE_USE_EXPAT']: +- env.MergeFlags( env['LIBXML26_FLAGS'] ) ++ if 'LIBXML30_FLAGS' in env : ++ env.MergeFlags( env['LIBXML30_FLAGS'] ) ++ if not('LIBXML30_FLAGS' in env) : ++ env.MergeFlags( env['LIBXML26_FLAGS'] ) + else: + env.PrependUnique( LIBS=["expat"] ) +Index: /trunk/libffado/support/dbus/SConscript +=================================================================== +--- /trunk/libffado/support/dbus/SConscript (revision 2165) ++++ /trunk/libffado/support/dbus/SConscript (revision 2650) +@@ -42,5 +42,8 @@ + env.MergeFlags( env['LIBRAW1394_FLAGS'] ) + if not env['SERIALIZE_USE_EXPAT']: +- env.MergeFlags( env['LIBXML26_FLAGS'] ) ++ if 'LIBXML30_FLAGS' in env : ++ env.MergeFlags( env['LIBXML30_FLAGS'] ) ++ if not('LIBXML30_FLAGS' in env) : ++ env.MergeFlags( env['LIBXML26_FLAGS'] ) + else: + env.PrependUnique( LIBS=["expat"] ) \ No newline at end of file diff --git a/hardware/firewire/libffado/pspec.xml b/hardware/firewire/libffado/pspec.xml index 27f1642538..aa715b0331 100644 --- a/hardware/firewire/libffado/pspec.xml +++ b/hardware/firewire/libffado/pspec.xml @@ -12,7 +12,7 @@ GPLv3 Free firewire audio drivers libffado tries to provide open-source drivers for all FireWire based pro-audio devices. - http://www.ffado.org/files/libffado-2.2.1.tgz + http://www.ffado.org/files/libffado-2.3.0.tgz xdg-utils glibmm-devel @@ -30,11 +30,8 @@ libffado-api-doc-only.patch libffado-libconfig145.patch flags.patch - libffado-2.2.1-jack-detect.patch - libffado-2.2.1-mixer.patch - - + gcc6.patch + libxml++3.patch @@ -103,6 +100,13 @@ + + 2017-02-17 + 2.3.0 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-10 2.2.1 diff --git a/hardware/firewire/libfreebob/pspec.xml b/hardware/firewire/libfreebob/pspec.xml index 3f558c8906..7c585db7d4 100644 --- a/hardware/firewire/libfreebob/pspec.xml +++ b/hardware/firewire/libfreebob/pspec.xml @@ -54,6 +54,13 @@ + + 2017-02-17 + 1.0.11 + Rebuild + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 1.0.11 diff --git a/hardware/firewire/libiec61883/pspec.xml b/hardware/firewire/libiec61883/pspec.xml index 4dc31c08eb..ded9285f82 100644 --- a/hardware/firewire/libiec61883/pspec.xml +++ b/hardware/firewire/libiec61883/pspec.xml @@ -50,6 +50,13 @@ + + 2017-02-17 + 1.2.0 + Rebuild + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 1.2.0 diff --git a/hardware/firewire/libraw1394/pspec.xml b/hardware/firewire/libraw1394/pspec.xml index ba9dcf476a..73a5d3df18 100644 --- a/hardware/firewire/libraw1394/pspec.xml +++ b/hardware/firewire/libraw1394/pspec.xml @@ -39,6 +39,13 @@ + + 2017-02-17 + 2.1.2 + Rebuild. + Stefan Gronewold(groni) + groni@pisilinux.org + 2016-11-27 2.1.2