diff options
| author | Arn0 <yth@ythogtha.org> | 2022-05-29 14:06:51 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-06-04 10:37:03 +0700 |
| commit | b567a9f61de7226580532f5f5888db905a02f479 (patch) | |
| tree | 954363840a36e0bfa85c4c2f2006acab4b783de1 | |
| parent | 7d7b934928159ea1bcd40357022103d0a109bdfa (diff) | |
libraries/DevIL: Fix build with nvidia-texture-tools.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/DevIL/DevIL.SlackBuild | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild index 31c2a0c57f8ec..b8c663747cbeb 100644 --- a/libraries/DevIL/DevIL.SlackBuild +++ b/libraries/DevIL/DevIL.SlackBuild @@ -4,16 +4,13 @@ # Written by Phil Warner <pc_warner@yahoo.com> # Modified by Robby Workman <rworkman@slackbuilds.org> # Modified by Dugan Chen -# Yth | Pont-en-Royans, France | yth@ythogtha.org - -# 20220416 bkw: Modified by SlackBuilds.org, BUILD=4: -# - remove some junk from the doc dir (Makefile, DocBuilder.java, etc). +# Yth | yth@ythogtha.org cd $(dirname $0) ; CWD=$(pwd) PRGNAM=DevIL VERSION=${VERSION:-1.8.0} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,18 +64,19 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then patch -p1 < $CWD/lib64.diff fi +# -DIL_USE_DXTC_NVIDIA=YES breaks when nvidia-texture-tools is installed mkdir -p DevIL/build cd DevIL/build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++14 -fpermissive" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DIL_USE_DXTC_NVIDIA=NO \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG cd ../.. -# 20220416 bkw: remove some cruft that isn't documentation: rm -f DevIL-docs/{Makefile,*.dtd,*.xml,*.java} mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION |