diff options
Diffstat (limited to 'src/stage4/patches/generic/libffado-breakdeps.patch')
-rw-r--r-- | src/stage4/patches/generic/libffado-breakdeps.patch | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/src/stage4/patches/generic/libffado-breakdeps.patch b/src/stage4/patches/generic/libffado-breakdeps.patch index 6735a11..c7c6ee6 100644 --- a/src/stage4/patches/generic/libffado-breakdeps.patch +++ b/src/stage4/patches/generic/libffado-breakdeps.patch @@ -1,7 +1,43 @@ +diff -rupN a/libffado-sconstruct-in-chroot.patch b/libffado-sconstruct-in-chroot.patch +--- a/libffado-sconstruct-in-chroot.patch 1970-01-01 01:00:00.000000000 +0100 ++++ b/libffado-sconstruct-in-chroot.patch 2018-06-13 23:30:20.449072831 +0200 +@@ -0,0 +1,32 @@ ++diff -rupN libffado-2.4.1/SConstruct libffado-2.4.1.new/SConstruct ++--- libffado-2.4.1/SConstruct 2018-03-04 07:13:17.000000000 +0100 +++++ libffado-2.4.1.new/SConstruct 2018-06-13 23:29:32.372405685 +0200 ++@@ -606,8 +606,7 @@ class CpuInfo (object): ++ # 64-bit (x86_64/AMD64/Intel64) ++ # Long Mode (x86-64: amd64, also known as Intel 64, i.e. 64-bit capable) ++ self.is_64bit = (self.is_x86 and 'lm' in self.x86_flags) or \ ++- (self.is_powerpc and \ ++- ('970' in self.ppc_type or 'power8' in self.ppc_type.lower())) +++ (self.is_powerpc and '64' in self.machine) ++ ++ # Hardware virtualization capable: vmx (Intel), svm (AMD) ++ self.has_hwvirt = self.is_x86 and ( ++@@ -660,6 +659,7 @@ class CpuInfo (object): ++ # 970FX (2004), manufactured at 90 nm, 1.8 - 2.7 GHz ++ # 970GX (2006), manufactured at 90 nm, 1MB L2 cache/core, 1.2 - 2.5 GHz ++ # 970MP (2005), dual core, 1 MB L2 cache/core, 1.6 - 2.5 GHz +++ self.ppc_type = None ++ for k,v in cpuinfo_kv(): ++ if k == 'processor': ++ self.cpu_count += 1 ++@@ -811,8 +811,8 @@ if env['DIST_TARGET'] == 'auto': ++ cpuinfo = CpuInfo() ++ if cpuinfo.is_x86: ++ opt_flags.extend(cc_flags_x86(cpuinfo, env['ENABLE_OPTIMIZATIONS'])) ++-if cpuinfo.is_powerpc: ++- opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS'])) +++#if cpuinfo.is_powerpc: +++# opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS'])) ++ if '-msse' in opt_flags: ++ env['USE_SSE'] = 1 ++ if '-msse2' in opt_flags: diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-04 18:25:29.192380397 +0200 -+++ b/PKGBUILD 2018-04-09 13:53:12.169984960 +0200 -@@ -11,9 +11,8 @@ pkgdesc="Driver for FireWire audio devic +--- a/PKGBUILD 2018-06-13 23:25:14.575736446 +0200 ++++ b/PKGBUILD 2018-06-13 23:30:17.279072800 +0200 +@@ -11,19 +11,21 @@ pkgdesc="Driver for FireWire audio devic arch=('x86_64') url="http://www.ffado.org/" license=('GPL') @@ -13,3 +49,17 @@ diff -rupN a/PKGBUILD b/PKGBUILD provides=('ffado') source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz" "${pkgname}-fix-python3-pyqt5.diff" ++ "libffado-sconstruct-in-chroot.patch" + ) + sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74' +- '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e') ++ '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e' ++ '55b7a30c02ac60ab0dcbc1505ba20e663143cca63eafa7dbf70e81a3724bdbae0b5d72315db35e51dbc51155f052d53b29048fa08e0add44bb72647e78953c3c') + + prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-fix-python3-pyqt5.diff" ++ patch -Np1 -i "${srcdir}/libffado-sconstruct-in-chroot.patch" + } + + build() { |