[packages/framewave] - added scons patch (fixes build with scons 3.1.2) - release 15 (boost 1.73)
qboosh
qboosh at pld-linux.org
Fri Aug 21 23:14:48 CEST 2020
commit 5a33eaba665db9eae406293e6daf75efdc153c9e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Aug 21 23:17:13 2020 +0200
- added scons patch (fixes build with scons 3.1.2)
- release 15 (boost 1.73)
framewave-scons.patch | 11 +++++++++++
framewave.spec | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/framewave.spec b/framewave.spec
index e3dc3e8..30eb927 100644
--- a/framewave.spec
+++ b/framewave.spec
@@ -6,7 +6,7 @@ Summary: Framewave - set of popular image and signal processing routines
Summary(pl.UTF-8): Framewave - zestaw popularnych funkcji do przetwarzania obrazu i sygnału
Name: framewave
Version: 1.3.1
-Release: 14
+Release: 15
License: Apache v2.0
Group: Libraries
Source0: http://downloads.sourceforge.net/framewave/FRAMEWAVE_%{version}_SRC.tar.gz
@@ -17,11 +17,12 @@ Patch2: no-forced-arch-bits.patch
Patch3: %{name}-templates.patch
Patch4: %{name}-warnings.patch
Patch5: %{name}-cpuid.patch
+Patch6: %{name}-scons.patch
URL: http://framewave.sourceforge.net/
BuildRequires: boost-devel >= 1.34
BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) >= 1.385
-BuildRequires: scons
+BuildRequires: scons >= 0.98
BuildRequires: sed >= 4.0
ExclusiveArch: %{ix86} %{x8664} x32
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,6 +75,7 @@ Statyczne biblioteki Framewave.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# kill precompiled binaries
%{__rm} BuildTools/bin/FwHeaderConvert_*
diff --git a/framewave-scons.patch b/framewave-scons.patch
new file mode 100644
index 0000000..8c869e9
--- /dev/null
+++ b/framewave-scons.patch
@@ -0,0 +1,11 @@
+--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig 2020-08-16 21:42:10.972877391 +0200
++++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py 2020-08-21 22:07:28.111946704 +0200
+@@ -114,7 +114,7 @@
+ self.oEnv['FWVARS'] = self.dctFwVars # in case of changes to the internal dictionary
+ oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\
+ src_dir = pthProjectDir,\
+- build_dir = pthBuildDir,\
++ variant_dir = pthBuildDir,\
+ duplicate = 0 )
+ if lstDependencies != None:
+ for dep in lstDependencies:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/framewave.git/commitdiff/5a33eaba665db9eae406293e6daf75efdc153c9e
More information about the pld-cvs-commit
mailing list