summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
author Matteo Bernardini2019-05-04 07:46:43 +0200
committer Matteo Bernardini2019-05-04 07:46:43 +0200
commitfa1636226b6860de43aa40332badbd3ebcac50c8 (patch)
treeb9224f52ca65168511fbdf9ffc375527f55213dd /graphics
parent8d0526bb95b4cd6732326f6c4b528dbbddd30e45 (diff)
downloadslackbuilds-fa1636226b6860de43aa40332badbd3ebcac50c8.tar.gz
20190504.1 global branch merge.current-20190504.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Blender/Blender.SlackBuild1
-rw-r--r--graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild8
-rw-r--r--graphics/gimp-plugin-bimp/gimp-plugin-bimp.info6
-rw-r--r--graphics/goocanvas/goocanvas.SlackBuild1
-rw-r--r--graphics/graphite2/README8
-rw-r--r--graphics/graphite2/graphite2.SlackBuild96
-rw-r--r--graphics/graphite2/graphite2.info10
-rw-r--r--graphics/graphite2/slack-desc19
-rw-r--r--graphics/graphviz/graphviz.SlackBuild1
-rw-r--r--graphics/k3d/README1
-rw-r--r--graphics/k3d/gcc7.patch23
-rw-r--r--graphics/k3d/k3d.SlackBuild3
-rw-r--r--graphics/k3d/k3d.info2
-rw-r--r--graphics/kuickshow/kuickshow.SlackBuild8
-rw-r--r--graphics/mypaint/mypaint.SlackBuild8
-rw-r--r--graphics/mypaint/mypaint.info8
-rw-r--r--graphics/opencollada/opencollada.SlackBuild3
-rw-r--r--graphics/opencollada/pcre.patch13
-rw-r--r--graphics/opencolorio/opencolorio.SlackBuild2
-rw-r--r--graphics/openimageio/openimageio.SlackBuild10
-rw-r--r--graphics/photoprint/photoprint.SlackBuild20
-rw-r--r--graphics/potrace/potrace.SlackBuild1
-rw-r--r--graphics/povray/povray.SlackBuild10
-rw-r--r--graphics/povray/povray.info6
-rw-r--r--graphics/rawstudio/rawstudio.SlackBuild2
-rw-r--r--graphics/simple-scan/simple-scan.SlackBuild2
-rw-r--r--graphics/simple-scan/simple-scan.info8
-rw-r--r--graphics/simple-scan/slack-desc2
-rw-r--r--graphics/yafaray-blender/yafaray-blender.SlackBuild28
-rw-r--r--graphics/yafaray-blender/yafaray-blender.info6
-rw-r--r--graphics/yafaray/README8
-rw-r--r--graphics/yafaray/yafaray.SlackBuild92
-rw-r--r--graphics/yafaray/yafaray.info8
33 files changed, 162 insertions, 262 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 972e3faaf2..f8a5b039d8 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -119,6 +119,7 @@ cd build
-DWITH_SDL_DYNLOAD:BOOL=ON \
-DCMAKE_BUILD_TYPE=Release \
$cuda \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="-lboost_locale"
make
make install DESTDIR=$PKG
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
index 56c01eca00..1220882efe 100644
--- a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
@@ -27,13 +27,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gimp-plugin-bimp
-VERSION=${VERSION:-1.18}
+VERSION=${VERSION:-2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
index a5fe846b01..1d0d937019 100644
--- a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
@@ -1,8 +1,8 @@
PRGNAM="gimp-plugin-bimp"
-VERSION="1.18"
+VERSION="2.0"
HOMEPAGE="https://github.com/alessandrofrancesconi/gimp-plugin-bimp"
-DOWNLOAD="https://github.com/alessandrofrancesconi/gimp-plugin-bimp/archive/v1.18/gimp-plugin-bimp-1.18.tar.gz"
-MD5SUM="84b748a4f1fa0bd67da12a77b65b4611"
+DOWNLOAD="https://github.com/alessandrofrancesconi/gimp-plugin-bimp/archive/v2.0/gimp-plugin-bimp-2.0.tar.gz"
+MD5SUM="715a543f158fa9dd7a4f46dd2f28bb89"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/goocanvas/goocanvas.SlackBuild b/graphics/goocanvas/goocanvas.SlackBuild
index 1987660272..d20f708333 100644
--- a/graphics/goocanvas/goocanvas.SlackBuild
+++ b/graphics/goocanvas/goocanvas.SlackBuild
@@ -68,6 +68,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+export LDFLAGS="-ldl -lm"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/graphics/graphite2/README b/graphics/graphite2/README
deleted file mode 100644
index 8084db6fb0..0000000000
--- a/graphics/graphite2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Graphite is a system that can be used to create "smart fonts" capable
-of displaying writing systems with various complex behaviors. A smart
-font contains not only letter shapes but also additional instructions
-indicating how to combine and position the letters in complex ways.
-
-Graphite was primarily developed to provide the flexibility needed for
-minority languages which often need to be written according to slightly
-different rules than well-known languages that use the same script.
diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild
deleted file mode 100644
index ed4a1ef360..0000000000
--- a/graphics/graphite2/graphite2.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for graphite2
-
-# Copyright 2015-2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=graphite2
-VERSION=${VERSION:-1.3.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_BUILD_TYPE=Release \
- -Wno-dev ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
- grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog LICENSE README.md Todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/graphite2/graphite2.info b/graphics/graphite2/graphite2.info
deleted file mode 100644
index ad548f6c1b..0000000000
--- a/graphics/graphite2/graphite2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="graphite2"
-VERSION="1.3.13"
-HOMEPAGE="http://graphite.sil.org/"
-DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-1.3.13.tgz"
-MD5SUM="29616d4f9651706036ca25c111508272"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@fredslev.dk"
diff --git a/graphics/graphite2/slack-desc b/graphics/graphite2/slack-desc
deleted file mode 100644
index fb3e6e8418..0000000000
--- a/graphics/graphite2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-graphite2: graphite2 (rendering engine for graphite fonts)
-graphite2:
-graphite2: Graphite is a system that can be used to create "smart fonts" capable
-graphite2: of displaying writing systems with various complex behaviors. A smart
-graphite2: font contains not only letter shapes but also additional instructions
-graphite2: indicating how to combine and position the letters in complex ways.
-graphite2:
-graphite2: Homepage: http://graphite.sil.org/
-graphite2:
-graphite2:
-graphite2:
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index 5593f2ecf0..7909f5b0ad 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -89,6 +89,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
--mandir=/usr/man \
--disable-static \
--enable-ocaml=no \
+ --enable-php=no \
--build=$ARCH-slackware-linux
make
diff --git a/graphics/k3d/README b/graphics/k3d/README
index b156272092..73741ac528 100644
--- a/graphics/k3d/README
+++ b/graphics/k3d/README
@@ -7,7 +7,6 @@ patches, curves and animation.
Optional dependencies:
-graphviz
gtksourceview
libgnome
OpenCASCADE
diff --git a/graphics/k3d/gcc7.patch b/graphics/k3d/gcc7.patch
new file mode 100644
index 0000000000..887eeb8bd3
--- /dev/null
+++ b/graphics/k3d/gcc7.patch
@@ -0,0 +1,23 @@
+From d9786540a205bec0b381f339497d7c2cce00376b Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Wed, 1 Feb 2017 02:07:28 +0000
+Subject: [PATCH] Add required header for ostream operations
+
+This file uses std::ostream::operator<<(double) without including
+<ostream> and so fails to compile using GCC 7.
+---
+ k3dsdk/measurement.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/k3dsdk/measurement.h b/k3dsdk/measurement.h
+index 9edf7aef..67df5aa0 100644
+--- a/k3dsdk/measurement.h
++++ b/k3dsdk/measurement.h
+@@ -27,6 +27,7 @@
+
+ #include <cassert>
+ #include <iosfwd>
++#include <ostream>
+ #include <map>
+ #include <string>
+ #include <typeinfo>
diff --git a/graphics/k3d/k3d.SlackBuild b/graphics/k3d/k3d.SlackBuild
index 7b6cea7db5..1dc959a907 100644
--- a/graphics/k3d/k3d.SlackBuild
+++ b/graphics/k3d/k3d.SlackBuild
@@ -73,6 +73,9 @@ 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 {} \;
+# From upstream
+patch -p1 < $CWD/gcc7.patch
+
# Fix man install directory.
sed -i "s|share/man|man|" share/man/CMakeLists.txt
diff --git a/graphics/k3d/k3d.info b/graphics/k3d/k3d.info
index 598878a4fa..9fe29db7ef 100644
--- a/graphics/k3d/k3d.info
+++ b/graphics/k3d/k3d.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/K-3D/k3d/archive/k3d-0.8.0.6/k3d-k3d-0.8.0.6.tar.gz
MD5SUM="129e051a1e724c14139808c25cd170f0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gtkglext ftgl"
+REQUIRES="graphviz gtkglext ftgl"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"
diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild
index 6a82e2deba..e11058c674 100644
--- a/graphics/kuickshow/kuickshow.SlackBuild
+++ b/graphics/kuickshow/kuickshow.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+export CC=clang
+export CXX=clang++
+
mkdir -p build
cd build
cmake \
@@ -86,6 +89,11 @@ cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS BUGS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/graphics/mypaint/mypaint.SlackBuild b/graphics/mypaint/mypaint.SlackBuild
index 089622dfa1..12fb75d6bb 100644
--- a/graphics/mypaint/mypaint.SlackBuild
+++ b/graphics/mypaint/mypaint.SlackBuild
@@ -12,13 +12,13 @@
# without any warranty.
PRGNAM=mypaint
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -29,8 +29,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/graphics/mypaint/mypaint.info b/graphics/mypaint/mypaint.info
index a17cd09e13..588da4bfbd 100644
--- a/graphics/mypaint/mypaint.info
+++ b/graphics/mypaint/mypaint.info
@@ -1,10 +1,10 @@
PRGNAM="mypaint"
-VERSION="1.2.0"
+VERSION="1.2.1"
HOMEPAGE="http://mypaint.org/"
-DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.0/mypaint-1.2.0.tar.xz"
-MD5SUM="c7c2cfac8e1eec5549e58567ec68daac"
+DOWNLOAD="https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz"
+MD5SUM="ac08c3135929f5641488fbbb9746fe41"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="numpy"
+REQUIRES="json-c numpy"
MAINTAINER="Klaatu"
EMAIL="klaatu@member.fsf.org"
diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild
index 798cd196e5..f62bf8607d 100644
--- a/graphics/opencollada/opencollada.SlackBuild
+++ b/graphics/opencollada/opencollada.SlackBuild
@@ -70,6 +70,9 @@ 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 {} \;
+# https://github.com/KhronosGroup/OpenCOLLADA/issues/570
+patch -p1 < $CWD/pcre.patch
+
mkdir -p build
cd build
cmake ../ \
diff --git a/graphics/opencollada/pcre.patch b/graphics/opencollada/pcre.patch
new file mode 100644
index 0000000000..fe8c01a5b0
--- /dev/null
+++ b/graphics/opencollada/pcre.patch
@@ -0,0 +1,13 @@
+diff -Naur OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+--- OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-01-13 01:23:52.000000000 +0100
++++ OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-07-08 08:40:38.764948000 +0200
+@@ -13,8 +13,7 @@
+
+ #include "COLLADABUPrerequisites.h"
+
+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include "pcre.h"
+
+
+ namespace COLLADABU
diff --git a/graphics/opencolorio/opencolorio.SlackBuild b/graphics/opencolorio/opencolorio.SlackBuild
index 81d3e34869..1f4766e8af 100644
--- a/graphics/opencolorio/opencolorio.SlackBuild
+++ b/graphics/opencolorio/opencolorio.SlackBuild
@@ -82,7 +82,7 @@ for v in $PYTHON_VERSIONS ; do
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations -Wno-error=cast-function-type" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DPYTHON=python$v \
diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild
index f96cd057de..54a0c70b7b 100644
--- a/graphics/openimageio/openimageio.SlackBuild
+++ b/graphics/openimageio/openimageio.SlackBuild
@@ -77,14 +77,17 @@ find -L . \
# Remove bundled pugixml
#rm -f src/include/OpenImageIO/pugi*
-# save this for GCC 7.0
-#sed -i "s|std=c++11|std=c++11 -Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new|" CMakeLists.txt
+# newer compilers are stricter
+ADD_FLAGS="-Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new -Wno-error=stringop-truncation -Wno-error=sizeof-pointer-memaccess -Wno-error=class-memaccess"
+
+# needed for the newer boost
+sed -i "s|python-py|python|" src/python/CMakeLists.txt
mkdir -p build
cd build
cmake ../ \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 $ADD_FLAGS" \
-DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
-DOPENJPEG_OPENJPEG_LIBRARIES="openmj2" \
-DCMAKE_BUILD_TYPE=Release \
@@ -99,6 +102,7 @@ cd build
-DUSE_PYTHON:BOOL=TRUE \
-DUSE_PYTHON3:BOOL=TRUE \
-DUSE_EXTERNAL_PUGIXML:BOOL=FALSE \
+ -DBoost_NO_BOOST_CMAKE=ON
make
make install DESTDIR=$PKG
diff --git a/graphics/photoprint/photoprint.SlackBuild b/graphics/photoprint/photoprint.SlackBuild
index 22b0eb2085..f90aed312a 100644
--- a/graphics/photoprint/photoprint.SlackBuild
+++ b/graphics/photoprint/photoprint.SlackBuild
@@ -63,8 +63,6 @@ rm -rf $PRGNAM-$SRCVERSION
tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
cd $PRGNAM-$SRCVERSION
-find . -name "*.cpp" | xargs sed -i 's%glib/.*.h%glib.h%g'
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,6 +70,24 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# sed magic thanks to archlinux
+sed -i 's|^#include <glib/[^>]*>|#include <glib.h>|' \
+ gp_cppsupport/gprintersettings.cpp \
+ gp_cppsupport/gprinter.cpp \
+ pixbufthumbnail/egg-pixbuf-thumbnail.c
+# netpbm-typedef collides with std::tuple
+for __file in imagesource/*.{h,cpp}; do
+ sed -i \
+ -e 's|^\(using namespace std;\)|// \1|' \
+ -e 's|<<[[:blank:]]*\(endl[[:blank:];]*\)|<< std::\1|g' \
+ -e 's|^[^#]\([[:blank:]]\)*\([io]*fstream[[:blank:]]\)|\1std::\2|g' \
+ -e 's#\([[:blank:]|&~^,()=+-]\)\(ios::\)#\1std::\2#g' \
+ $__file
+done
+sed -i '116s|false|NULL|' effects/ppeffect.cpp
+# limit use of 'g_type_init()' to GLIB<2.35 (deprecated use)
+sed -i 's/^\([[:blank:]]*g_type_init();[[:blank:]]*\)$/#if !GLIB_CHECK_VERSION(2,35,0)\n\1\n#endif/' photoprint.cpp
+
LDFLAGS="-lX11" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/graphics/potrace/potrace.SlackBuild b/graphics/potrace/potrace.SlackBuild
index 20dc9cd6a3..ca6ff23a94 100644
--- a/graphics/potrace/potrace.SlackBuild
+++ b/graphics/potrace/potrace.SlackBuild
@@ -95,7 +95,6 @@ patch -p1 < $CWD/patches/make-check-tolerance.diff
CFLAGS="$SLKCFLAGS" \
make
-make check
make install-strip DESTDIR=$PKG
find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
diff --git a/graphics/povray/povray.SlackBuild b/graphics/povray/povray.SlackBuild
index b6372da8c2..4f35a86f34 100644
--- a/graphics/povray/povray.SlackBuild
+++ b/graphics/povray/povray.SlackBuild
@@ -26,8 +26,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=povray
-VERSION=${VERSION:-3.7.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.7.0.3}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCDIR=${DOCDIR:-/usr/doc}
MANDIR=${MANDIR:-/usr/man}
@@ -70,11 +70,7 @@ set -e
rm -rf $TMP/$PRGNAM-$VERSION $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-if [ -f $CWD/v$VERSION.tar.?z* ]; then
- tar xvf $CWD/v$VERSION.tar.?z*
-else
- tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/graphics/povray/povray.info b/graphics/povray/povray.info
index 5f8c0b00f8..412a665356 100644
--- a/graphics/povray/povray.info
+++ b/graphics/povray/povray.info
@@ -1,8 +1,8 @@
PRGNAM="povray"
-VERSION="3.7.0.0"
+VERSION="3.7.0.3"
HOMEPAGE="http://www.povray.org/"
-DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz"
-MD5SUM="c6866a3d71e38754f24b11da6c996b8e"
+DOWNLOAD="https://github.com/POV-Ray/povray/archive/v3.7.0.3/povray-3.7.0.3.tar.gz"
+MD5SUM="1f00b96b71db59e2ea80a8b86e62648f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild
index 30ec653dcb..7a928498aa 100644
--- a/graphics/rawstudio/rawstudio.SlackBuild
+++ b/graphics/rawstudio/rawstudio.SlackBuild
@@ -89,7 +89,7 @@ patch -p1 < $CWD/patches/lensfun03.patch
patch -p1 < $CWD/patches/libpng15.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/graphics/simple-scan/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild
index f781cab523..5fd5429ca8 100644
--- a/graphics/simple-scan/simple-scan.SlackBuild
+++ b/graphics/simple-scan/simple-scan.SlackBuild
@@ -26,7 +26,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="simple-scan"
-VERSION=${VERSION:-3.25.1}
+VERSION=${VERSION:-3.30.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info
index 5c6d85d344..9f33f5941c 100644
--- a/graphics/simple-scan/simple-scan.info
+++ b/graphics/simple-scan/simple-scan.info
@@ -1,8 +1,8 @@
PRGNAM="simple-scan"
-VERSION="3.25.1"
-HOMEPAGE="https://launchpad.net/simple-scan"
-DOWNLOAD="https://launchpad.net/simple-scan/3.25/3.25.1/+download/simple-scan-3.25.1.tar.xz"
-MD5SUM="6bff2b9bdfb529e21582f4a65c3f2d27"
+VERSION="3.30.1.1"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+DOWNLOAD="https://gitlab.gnome.org/GNOME/simple-scan/-/archive/3.30.1.1/simple-scan-3.30.1.1.tar.bz2"
+MD5SUM="0f4da95ee93ee2eb5421af16100190c9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="colord packagekit meson libgusb vala"
diff --git a/graphics/simple-scan/slack-desc b/graphics/simple-scan/slack-desc
index d201d02f6e..3fb33b54f3 100644
--- a/graphics/simple-scan/slack-desc
+++ b/graphics/simple-scan/slack-desc
@@ -11,8 +11,8 @@ simple-scan:
simple-scan: simple-scan is a simple scanning utility without the overwhelming
simple-scan: options of xsane.
simple-scan:
+simple-scan: Homepage: https://gitlab.gnome.org/GNOME/simple-scan
simple-scan:
-simple-scan: Homepage: https://launchpad.net/simple-scan
simple-scan:
simple-scan:
simple-scan:
diff --git a/graphics/yafaray-blender/yafaray-blender.SlackBuild b/graphics/yafaray-blender/yafaray-blender.SlackBuild
index c2a0c49b98..f72c5b24fe 100644
--- a/graphics/yafaray-blender/yafaray-blender.SlackBuild
+++ b/graphics/yafaray-blender/yafaray-blender.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Slackware build script for yafaray
+# Slackware build script for yafaray-blender
# Copyright (c) 2009 Alan Alberghini <414N@slacky.it>
# All rights reserved.
@@ -29,7 +29,7 @@
# 1 - Initial release.
PRGNAM=yafaray-blender
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-3.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,28 +40,26 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-BLENDER_PLUGIN_DIR="/opt/blender/script"
+BLENDER_PLUGIN_DIR="/opt/blender/scripts/addons"
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-unzip "$CWD/YafaRay-blender.${VERSION}.zip"
-cd $PRGNAM
+rm -rf Blender-Exporter-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd Blender-Exporter-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-mkdir -p ${PKG}/usr/share/yafaray/blender ${PKG}/${BLENDER_PLUGIN_DIR}
-cp -t ${PKG}/usr/share/yafaray/blender *.py
-
-# This link is needed to install the plugin system-wide
-ln -sf /usr/share/yafaray/blender/yafaray_ui.py ${PKG}/${BLENDER_PLUGIN_DIR}
+cd ..
+mkdir -p ${PKG}${BLENDER_PLUGIN_DIR}
+mv Blender-Exporter-$VERSION ${PKG}${BLENDER_PLUGIN_DIR}/yafaray_v3
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/yafaray-blender/yafaray-blender.info b/graphics/yafaray-blender/yafaray-blender.info
index 026dcdf5f8..9756fb5c1a 100644
--- a/graphics/yafaray-blender/yafaray-blender.info
+++ b/graphics/yafaray-blender/yafaray-blender.info
@@ -1,8 +1,8 @@
PRGNAM="yafaray-blender"
-VERSION="0.1.1"
+VERSION="3.2.0"
HOMEPAGE="http://www.yafaray.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/YafaRay-blender.0.1.1.zip"
-MD5SUM="d7e7f86b9e90e7f960707ebaea1843ab"
+DOWNLOAD="https://github.com/YafaRay/Blender-Exporter/archive/v3.2.0/yafaray-blender-3.2.0.tar.gz"
+MD5SUM="1660eb796fb204f07691dd0571f4bceb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="yafaray blender"
diff --git a/graphics/yafaray/README b/graphics/yafaray/README
index 0634be71c9..29763c62d7 100644
--- a/graphics/yafaray/README
+++ b/graphics/yafaray/README
@@ -2,10 +2,6 @@ YafaRay is a free open-source raytracing engine. Raytracing is a rendering
technique for generating realistic images by tracing the path of light
through a 3D scene.
-This package is built by default with QT4 support (needed if you intend to use
-the blender plugin too). If you don't want it, launch the script as follows:
-# USEQT=no ./yafaray.SlackBuild (assuming you're root)
+python3 is an optional dependency, to enable python bindings.
-You can also build Python bindings, provided you have swig and Python
-installed. Simply run
-# BUILDPYTHON=yes ./yafaray.SlackBuild (always assuming you're root)
+To disable building the Qt gui pass the script the variable QTGUI=OFF
diff --git a/graphics/yafaray/yafaray.SlackBuild b/graphics/yafaray/yafaray.SlackBuild
index c5c40c292b..9b2ee9e9dd 100644
--- a/graphics/yafaray/yafaray.SlackBuild
+++ b/graphics/yafaray/yafaray.SlackBuild
@@ -29,14 +29,16 @@
# 1.0 - Initial release.
# 1.1 - Removed a bashism (==) to become ash-compatible.
+# Modified by the SlackBuilds.org project
+
PRGNAM=yafaray
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-3.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -47,14 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="LICENSE CODING INSTALL"
-# Set to yes to build the qt4 gui (needs qt4)
-USEQT=${USEQT:-yes}
-# Set to yes to build python bindings too (needs swig)
-BUILDPYTHON=${BUILDPYTHON:-no}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,61 +68,37 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-unzip "$CWD/YafaRay.${VERSION}.zip"
-cd $PRGNAM
+rm -rf Core-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd Core-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-if [ ${USEQT} = yes ]; then
- QTTARGET="YF_QTDIR=/usr WITH_YF_QT=true"
-else
- QTTARGET=""
-fi
-
-# The build system is kinda 'naive': it hardcodes the PREFIX and other
-# directories specified at configure-time into the final libs, so we can't
-# specify PREFIX=${PKG}/usr, YF_LIBOUT=${PKG}/usr/lib.. because, when the
-# package will be installed, the program will try to find its libraries in a
-# /tmp path, and not in /usr/lib/yafaray as it should.
-# An easy workaround is to exploit the included debian package creator to
-# install all the files in a temporary location without having to specify a
-# "fake" PREFIX location. However, this seems to be glitchy too, as specifying
-# a different YF_PACKPATH doesn't seem to work fine, so we have to manually
-# copy the files from the temporary debian build path to $PKG in the end.
-
-if [ ${BUILDPYTHON} = no ]; then
- scons debian $QTTARGET PREFIX=/usr \
- YF_LIBOUT=/usr/lib${LIBDIRSUFFIX} \
- YF_PLUGINPATH=/usr/lib${LIBDIRSUFFIX}/yafaray \
- REL_CCFLAGS="${SLKCFLAGS}" || echo "Don't worry about the dpkg error"
-else
- scons swig debian $QTTARGET PREFIX=/usr \
- YF_LIBOUT=/usr/lib${LIBDIRSUFFIX} \
- YF_PLUGINPATH=/usr/lib${LIBDIRSUFFIX}/yafaray \
- REL_CCFLAGS="${SLKCFLAGS}" || echo "Don't worry about the dpkg error"
- # Install also python bindings (manually T_T)
- mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages
- mv bindings/python/* ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages/
-fi
-
-# Copy "debian" package root to our package root.
-# mv may complain if the python bindings have already been
-# moved to their new home, hence we use cp + rm.
-cp -r debian/${PRGNAM}/* ${PKG}
-rm -rf debian/${PRGNAM}
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DYAF_LIB_DIR=lib$LIBDIRSUFFIX \
+ -DWITH_QT=${QTGUI:-ON} \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+# We install these manually
+rm -fR $PKG/usr/share/doc
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- $DOCS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG CODING LICENSES README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/graphics/yafaray/yafaray.info b/graphics/yafaray/yafaray.info
index a65706fcc5..c6af52edc6 100644
--- a/graphics/yafaray/yafaray.info
+++ b/graphics/yafaray/yafaray.info
@@ -1,10 +1,10 @@
PRGNAM="yafaray"
-VERSION="0.1.1"
+VERSION="3.2.0"
HOMEPAGE="http://www.yafaray.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/YafaRay.0.1.1.zip"
-MD5SUM="d1722dec25299f6f3fcc1d7c661a4e90"
+DOWNLOAD="https://github.com/YafaRay/Core/archive/v3.2.0/yafaray-3.2.0.tar.gz"
+MD5SUM="191e81b3d8c942302b97c142049365df"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="opencv"
MAINTAINER="Alan Alberghini"
EMAIL="414N@slacky.it"