ffado: 2.2.1 -> 2.3.0
This commit is contained in:
parent
b150bf4482
commit
7182b71489
|
@ -1,61 +0,0 @@
|
|||
diff --git a/SConstruct b/SConstruct
|
||||
index ca5d5cf..76738e3 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -354,7 +354,7 @@ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and co
|
||||
env['PYUIC4'] = True
|
||||
build_mixer = True
|
||||
|
||||
-if conf.CheckForApp( 'xdg-desktop-menu --help' ):
|
||||
+if conf.CheckForApp( 'which xdg-desktop-menu' ):
|
||||
env['XDG_TOOLS'] = True
|
||||
else:
|
||||
print """
|
||||
diff --git a/support/dbus/SConscript b/support/dbus/SConscript
|
||||
index 2b0f0c6..23069d8 100644
|
||||
--- a/support/dbus/SConscript
|
||||
+++ b/support/dbus/SConscript
|
||||
@@ -44,6 +44,7 @@ if not env.GetOption( "clean" ):
|
||||
env.MergeFlags( env['LIBXML26_FLAGS'] )
|
||||
else:
|
||||
env.PrependUnique( LIBS=["expat"] )
|
||||
+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
|
||||
|
||||
env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml')
|
||||
env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml')
|
||||
diff --git a/support/firmware/SConscript b/support/firmware/SConscript
|
||||
index 2939cb0..307b295 100644
|
||||
--- a/support/firmware/SConscript
|
||||
+++ b/support/firmware/SConscript
|
||||
@@ -36,6 +36,7 @@ if not env.GetOption( "clean" ):
|
||||
env.MergeFlags( env['LIBXML26_FLAGS'] )
|
||||
else:
|
||||
env.PrependUnique( LIBS=["expat"] )
|
||||
+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
|
||||
|
||||
static_env = env.Clone()
|
||||
|
||||
diff --git a/support/tools/SConscript b/support/tools/SConscript
|
||||
index 651621d..01b11f4 100644
|
||||
--- a/support/tools/SConscript
|
||||
+++ b/support/tools/SConscript
|
||||
@@ -36,6 +36,7 @@ if not e.GetOption( "clean" ):
|
||||
e.MergeFlags( env['LIBXML26_FLAGS'] )
|
||||
else:
|
||||
e.PrependUnique( LIBS=["expat"] )
|
||||
+ e.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
|
||||
|
||||
#
|
||||
# For the the ffado-diag tools
|
||||
diff --git a/tests/SConscript b/tests/SConscript
|
||||
index 307341f..4800b93 100644
|
||||
--- a/tests/SConscript
|
||||
+++ b/tests/SConscript
|
||||
@@ -35,6 +35,7 @@ if not env.GetOption( "clean" ):
|
||||
env.MergeFlags( env['LIBXML26_FLAGS'] )
|
||||
else:
|
||||
env.PrependUnique( LIBS=["expat"] )
|
||||
+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
|
||||
|
||||
static_env = env.Clone()
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
|
||||
, expat, libraw1394, libconfig, libavc1394, libiec61883
|
||||
, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx, glibmm
|
||||
|
||||
# Optional dependencies
|
||||
, libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
|
||||
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${prefix}ffado-${version}";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffado.org/files/libffado-${version}.tgz";
|
||||
sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz";
|
||||
sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
|
||||
|
@ -38,10 +38,10 @@ stdenv.mkDerivation rec {
|
|||
expat libraw1394 libconfig libavc1394 libiec61883
|
||||
] ++ stdenv.lib.optionals (!libOnly) [
|
||||
optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4
|
||||
optXdg_utils
|
||||
optXdg_utils libxmlxx glibmm
|
||||
];
|
||||
|
||||
patches = [ ./build-fix.patch ];
|
||||
patches = [ ./gcc6.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
|
||||
|
@ -57,6 +57,10 @@ stdenv.mkDerivation rec {
|
|||
src/libutil/serialize_expat.cpp
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
|
||||
'';
|
||||
|
||||
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
|
||||
buildPhase = ''
|
||||
export PYDIR=$out/lib/${python.libPrefix}/site-packages
|
||||
|
|
19
pkgs/os-specific/linux/ffado/gcc6.patch
Normal file
19
pkgs/os-specific/linux/ffado/gcc6.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
Author: Adrian Knoth <adi@drcomp.erfurt.thur.de>
|
||||
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 <cmath>
|
||||
+#include <algorithm>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
Loading…
Reference in a new issue