diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2020-01-01 23:02:37 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2020-01-03 02:13:47 -0600 |
| commit | 0854b1ffc6116b94b0b03a73c8c9fea6ad04e0b5 (patch) | |
| tree | f194c2c7b04f2d112452e3e6d785d12027046ea7 /libraries/frei0r/frei0r.SlackBuild | |
| parent | c7fe5806ba4445e70cce8636031864e3c61afbef (diff) | |
libraries/frei0r: Updated for version 1.7.0.
Apply upstream patches that (hopefully) fix opencv support
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/frei0r/frei0r.SlackBuild')
| -rw-r--r-- | libraries/frei0r/frei0r.SlackBuild | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild index 0814b29a70ab5..51193323e5380 100644 --- a/libraries/frei0r/frei0r.SlackBuild +++ b/libraries/frei0r/frei0r.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2009, Jonathan Larsen (agentc0re), SLC, UT # Contact Info: agentc0re 'AT' learnix 'DOT' net -# Copyright 2012-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -39,9 +39,11 @@ # *Updated for 1.6.0 # Mar 14th, 2018 # *Updated for 1.6.1 +# Jan 1st, 2020 +# *Updated for 1.7.0 PRGNAM=frei0r -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -87,14 +89,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Needed by opencv >= 3.4.2 -patch -p0 < $CWD/patch_imgproc.diff - -# Fix installation paths -sed -i \ - -e "s|lib/|lib$LIBDIRSUFFIX/|" \ - -e "s|lib\"|lib$LIBDIRSUFFIX\"|" \ - CMakeLists.txt || exit 1 +# Apply upstream patches +for i in $CWD/patches/* ; do patch -p1 < $i ; done mkdir -p build cd build @@ -102,6 +98,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG |