diff options
Diffstat (limited to 'graphics')
128 files changed, 1010 insertions, 2374 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index a8c4ca8b9d..c6499142fc 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Blender -VERSION=${VERSION:-2.83.8} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.92.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCNAM=blender @@ -87,12 +87,6 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION -patch -p0 < $CWD/01_FindEmbree_so.diff -if [ ${FORCE_FFMPEG4:-no} = "yes" ]; then - echo "Force use of ffmpeg4" - SLKCFLAGS="$SLKCFLAGS -I/usr/include/ffmpeg4 -L/usr/lib${LIBDIRSUFFIX}/ffmpeg4" - sed -i -e "s|\"exitcode=0\"|&,\"LD_LIBRARY_PATH\":\"/usr/lib$LIBDIRSUFFIX/ffmpeg4\"|g" doc/manpage/blender.1.py -fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -132,6 +126,7 @@ cd build -DCMAKE_BUILD_TYPE=Release \ $cuda \ $embree \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="-lboost_locale" make make install DESTDIR=$PKG @@ -145,7 +140,7 @@ for bin in $BLENDERBINS ; do mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin cat <<EOF >$PKG/usr/bin/$bin #!/bin/sh -export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada:/usr/lib$LIBDIRSUFFIX/ffmpeg4 +export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada exec $bin.bin "\$@" EOF chmod 0755 $PKG/usr/bin/$bin diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info index 26038a5885..58cabcb046 100644 --- a/graphics/Blender/Blender.info +++ b/graphics/Blender/Blender.info @@ -1,10 +1,10 @@ PRGNAM="Blender" -VERSION="2.83.8" +VERSION="2.92.0" HOMEPAGE="https://blender.org" -DOWNLOAD="https://download.blender.org/source/blender-2.83.8.tar.xz" -MD5SUM="1a920506a3a695d629d5f312b9b45c01" +DOWNLOAD="https://download.blender.org/source/blender-2.92.0.tar.xz" +MD5SUM="edcbd38e7cdbeeba301de1d57a7ff33c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ffmpeg jack opencollada opus python-requests valgrind numpy3 SDL2 openimageio freealut tbb embree" +REQUIRES="potrace OpenSubdiv pugixml jack opencollada valgrind numpy3 openimageio freealut embree" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/graphics/Blender/README b/graphics/Blender/README index e6fe94d6e9..aa1613683c 100644 --- a/graphics/Blender/README +++ b/graphics/Blender/README @@ -21,10 +21,6 @@ successful build. The CUDA handling above remains for cases which may: Support for embree may be disabled by passing EMBREE=no when building e.g. EMBREE=no sh ./Blender.SlackBuild -Support in 14.2 for using SBo's ffmpeg4 SlackBuild may be enabled by -passing FORCE_FFMPEG4=yes when building e.g. - FORCE_FFMPEG4=yes sh ./Blender.SlackBuild - Version 2.83.8 is the last SBo supported version of Blender for building from source code in Slackware64-14.2. A more recent compiler (gcc-9.3.1) is required for 2.90.x and later blender versions. diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild index 2efa262ff0..63c8c07832 100644 --- a/graphics/FreeCAD/FreeCAD.SlackBuild +++ b/graphics/FreeCAD/FreeCAD.SlackBuild @@ -25,8 +25,7 @@ # Maintained by David Spencer <baildon.research@googlemail.com> PRGNAM=FreeCAD -VERSION=${VERSION:-0.17.13541} -COMMIT=${COMMIT:-9948ee4f1570df9216862a79705afb367b2c6ffb} +VERSION=${VERSION:-0.18.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$COMMIT -tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -72,6 +71,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 {} \; +# Patch to fix boost header include according to https://github.com/FreeCAD/FreeCAD/commit/200c7c7e00d569ed9f00e06c9d9751a27fa67c2d#diff-b3a49ec758b2fdfb5ee0069b6c113f656133a89cabc0ae789398b41c3295aa57 +patch -p1 < $CWD/addBoostHeaders-200c7c7.patch + # SBo's OpenCASCADE 6.9.1 includes were in /opt/OpenCASCADE, but for 7.3.0 # the includes are in /usr/include/opencascade, so let's accept either :) if [ -d /usr/include/opencascade ]; then @@ -96,6 +98,7 @@ cd build -DOCC_LIBRARY:PATH=/usr/lib${LIBDIRSUFFIX} \ -DRESOURCEDIR=/opt/$PRGNAM/share/data \ -DBUILD_FEM=OFF \ + -DOCCT_CMAKE_FALLBACK=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/FreeCAD/FreeCAD.info b/graphics/FreeCAD/FreeCAD.info index b9449797bc..6bca6eeea7 100644 --- a/graphics/FreeCAD/FreeCAD.info +++ b/graphics/FreeCAD/FreeCAD.info @@ -1,8 +1,8 @@ PRGNAM="FreeCAD" -VERSION="0.17.13541" +VERSION="0.18.4" HOMEPAGE="https://www.freecadweb.org/" -DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/9948ee4/FreeCAD-9948ee4f1570df9216862a79705afb367b2c6ffb.tar.gz" -MD5SUM="1cc16667376a7c9d981319144b857e46" +DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/0.18.4.tar.gz" +MD5SUM="fe797a27a8ee4fb2def4f95e8eadacdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenCASCADE Pivy matplotlib pyside pyside-tools shiboken xerces-c" diff --git a/graphics/FreeCAD/addBoostHeaders-200c7c7.patch b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch new file mode 100644 index 0000000000..3e607c4366 --- /dev/null +++ b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch @@ -0,0 +1,34 @@ +From 200c7c7e00d569ed9f00e06c9d9751a27fa67c2d Mon Sep 17 00:00:00 2001 +From: wmayer <wmayer@users.sourceforge.net> +Date: Sun, 7 Jun 2020 17:21:37 +0200 +Subject: [PATCH] [skip ci] include missing boost header + +--- + src/Gui/DAGView/DAGView.cpp | 1 + + src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp +index c4820b35606..e0f11e0bfde 100644 +--- a/src/Gui/DAGView/DAGView.cpp ++++ b/src/Gui/DAGView/DAGView.cpp +@@ -22,6 +22,7 @@ + + #include "PreCompiled.h" + #ifndef _PreComp_ ++#include <boost/bind.hpp> + #include <QAbstractEventDispatcher> + #include <QVBoxLayout> + #endif +diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +index dd8161a90f1..e8bf2a629d3 100644 +--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp ++++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h"
+
+ #ifndef _PreComp_
++#include <boost/bind.hpp>
+ #endif
+
+ #include "ui_TaskSketcherGeneral.h"
diff --git a/graphics/GraphicsMagick/README b/graphics/GraphicsMagick/README index 6591c88ff2..a6f8945cd3 100644 --- a/graphics/GraphicsMagick/README +++ b/graphics/GraphicsMagick/README @@ -14,6 +14,9 @@ to 1.3.30 has been tested and seems to work, but I make no guarantees. This build includes PerlMagick (the Perl language bindings for GraphicsMagick) and TclMagick (Tcl bindings). If you really need to, you can disable these via PERL=no and/or TCL=no in the environment. +*WARNING* +be advised that the tests that run during the build of PerlMagick need +TMP=/tmp or they will fail. Starting with 1.3.30, GraphicsMagick is built with OpenMP support, which allows it to take better advantage of multiple cores. If you experience diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild index b9ce861e66..c9336eb31a 100644 --- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild +++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild @@ -74,6 +74,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 {} \; +patch -p1 < $CWD/fix-flow-control-nesting.patch + # Thanks to Chris Willing for the fix for VTK-8.1.0 compatibility. # This new version of the patch is still needed for occt 7.3.0 :( patch -p0 < $CWD/occt-7.3.0_vtk_InsertNextTupleValue.diff diff --git a/graphics/OpenCASCADE/fix-flow-control-nesting.patch b/graphics/OpenCASCADE/fix-flow-control-nesting.patch new file mode 100644 index 0000000000..7e2bb1d7b2 --- /dev/null +++ b/graphics/OpenCASCADE/fix-flow-control-nesting.patch @@ -0,0 +1,31 @@ +From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 24 Feb 2021 20:06:02 +0100 +Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting + +Fix an unbalanced nesting of flow control statements +for >=cmake-3.20.0 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/cmake/vtk.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake +index c5692fd6..00b7ff4a 100644 +--- a/adm/cmake/vtk.cmake ++++ b/adm/cmake/vtk.cmake +@@ -156,8 +156,8 @@ if (VTK_FOUND) + endif() + endif() + endif() +- endif() +- endforeach() ++ endforeach() ++ endif() + endif() + + if (3RDPARTY_VTK_INCLUDE_DIRS) +-- +2.30.1 + diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild index 5a2f374bbe..6b6954a788 100644 --- a/graphics/darktable/darktable.SlackBuild +++ b/graphics/darktable/darktable.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=darktable -VERSION=${VERSION:-2.4.4} +VERSION=${VERSION:-3.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -68,6 +68,10 @@ 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 {} \; +# If you want to use llvm instead of gcc uncomment the following two lines +#export CC=clang +#export CXX=clang++ + mkdir -p build cd build cmake \ @@ -78,6 +82,7 @@ cd build -DDONT_USE_INTERNAL_LUA=Off \ -DUSE_LIBSECRET=On \ -DBINARY_PACKAGE_BUILD=1 \ + -DDONT_USE_INTERNAL_LUA=0 \ -DCMAKE_BUILD_TYPE=Release .. VERBOSE=1 make make install DESTDIR=$PKG diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info index e53831c9ec..5e0ffc4eb7 100644 --- a/graphics/darktable/darktable.info +++ b/graphics/darktable/darktable.info @@ -1,10 +1,10 @@ PRGNAM="darktable" -VERSION="2.4.4" +VERSION="3.4.0" HOMEPAGE="https://www.darktable.org/" -DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.4.4/darktable-2.4.4.tar.xz" -MD5SUM="32e4b9e75758b5d3fc803b857fd101ff" +DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-3.4.0.tar.xz" +MD5SUM="e360fbf37eb256ce8c31c2181e5197c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="json-glib lensfun pugixml" +REQUIRES="gmic json-glib lensfun pugixml" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/graphics/digikam/README b/graphics/digikam/README deleted file mode 100644 index a002764d17..0000000000 --- a/graphics/digikam/README +++ /dev/null @@ -1,14 +0,0 @@ -digiKam is a simple digital photo management application for KDE, -which makes importing and organizing digital photos a "snap". The -photos can be organized in albums which can be sorted chronologically, -by directory layout or by custom collections. An easy to use interface -is provided that enables you to connect to your camera and preview, -download and/or delete your images. - -enblend-enfuse, hugin, sqlite2, and libdc1394 are optional dependencies. - -NOTES: -- digikam now ships with its own internal version of kipi-plugins. -- please remove previous version before building the current version. -- Make sure qt5 is not installed before building opencv or else digiKam - will segfault. diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild deleted file mode 100644 index dd492bcb28..0000000000 --- a/graphics/digikam/digikam.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for digiKam - -# Copyright 2007-2011 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2013-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# 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=digikam -VERSION=${VERSION:-4.14.0} -BUILD=${BUILD:-4} -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" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 {} \; - -cd core -# patch for lensfun 0.3.2 -patch -p1 < $CWD/lensfun-0.3.2.patch - -# workaround for flex-2.6.0 -sed -e '/fno-tree-pre/d' -i CMakeLists.txt -cd .. - -patch -p0 < $CWD/libpgf.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=$(kde4-config --libsuffix) \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \ - -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=ON \ - -DDIGIKAMSC_COMPILE_DOC=OFF \ - -DCMAKE_CXX_FLAGS:STRING="$(/usr/bin/Magick++-config --libs)" \ - -DENABLE_OPENCV3=ON \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_BUILD_TYPE=Release .. - 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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING* NEWS README $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info deleted file mode 100644 index 3e6158f3c8..0000000000 --- a/graphics/digikam/digikam.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="digikam" -VERSION="4.14.0" -HOMEPAGE="https://www.digikam.org/" -DOWNLOAD="https://download.kde.org/Attic/digikam/digikam-4.14.0.tar.bz2" -MD5SUM="8fd3cb0a822e8c2d4102e8adc00c082f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="liblqr lensfun ffmpeg libpgf libkvkontakte libkface libkgeomap4" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/graphics/digikam/doinst.sh b/graphics/digikam/doinst.sh deleted file mode 100644 index 7ffea19638..0000000000 --- a/graphics/digikam/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications/kde4 >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/graphics/digikam/lensfun-0.3.2.patch b/graphics/digikam/lensfun-0.3.2.patch deleted file mode 100644 index 37776f6e31..0000000000 --- a/graphics/digikam/lensfun-0.3.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Gilles Caulier <caulier.gilles@gmail.com> -Date: Mon, 14 Dec 2015 21:41:55 +0000 -Subject: fix compilation with Lensfun 0.3.2 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468 ---- -fix compilation with Lensfun 0.3.2 -It still compatible with older lensfun releases. -BUGS: 356672 -FIXED-IN: 5.0.0 ---- - - ---- a/libs/dimg/filters/lens/lensfuniface.h -+++ b/libs/dimg/filters/lens/lensfuniface.h -@@ -24,10 +24,7 @@ - - // Lib LensFun includes - --extern "C" --{ - #include <lensfun.h> --} - - // Local includes - - diff --git a/graphics/digikam/libpgf.patch b/graphics/digikam/libpgf.patch deleted file mode 100644 index 5d2e7498bb..0000000000 --- a/graphics/digikam/libpgf.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- core/libs/dimg/loaders/pgfloader.cpp.orig 2019-03-17 16:52:40.102888509 +0700 -+++ core/libs/dimg/loaders/pgfloader.cpp 2019-03-17 16:52:51.404020146 +0700 -@@ -442,14 +442,6 @@ - } - } - --#ifdef PGFCodecVersionID --# if PGFCodecVersionID < 0x061142 -- header.background.rgbtBlue = 0; -- header.background.rgbtGreen = 0; -- header.background.rgbtRed = 0; --# endif --#endif -- - pgf.SetHeader(header); - - // NOTE: see bug #273765 : Loading PGF thumbs with OpenMP support through a separated thread do not work properlly with libppgf 6.11.24 ---- core/libs/threadimageio/pgfutils.cpp.orig 2019-03-17 17:07:35.586244318 +0700 -+++ core/libs/threadimageio/pgfutils.cpp 2019-03-17 17:07:47.110376670 +0700 -@@ -262,13 +262,6 @@ - header.mode = ImageModeRGBA; - header.usedBitsPerChannel = 0; // Auto - --#ifdef PGFCodecVersionID --# if PGFCodecVersionID < 0x061142 -- header.background.rgbtBlue = 0; -- header.background.rgbtGreen = 0; -- header.background.rgbtRed = 0; --# endif --#endif - pgfImg.SetHeader(header); - - // NOTE: see bug #273765 : Loading PGF thumbs with OpenMP support through a separated thread do not work properlly with libppgf 6.11.24 diff --git a/graphics/digikam/slack-desc b/graphics/digikam/slack-desc deleted file mode 100644 index cf90391876..0000000000 --- a/graphics/digikam/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------------------------------------------------------| -digikam: digikam (KDE Photo Management Application) -digikam: -digikam: digiKam is a simple digital photo management application for KDE, -digikam: which makes importing and organizing digital photos a "snap". The -digikam: photos can be organized in albums which can be sorted chronologically, -digikam: by directory layout or by custom collections. An easy to use interface -digikam: is provided that enables you to connect to your camera and preview, -digikam: download and/or delete your images. -digikam: -digikam: Homepage: http://www.digikam.org/ -digikam: diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild index 26381c3f52..7d16524301 100644 --- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild +++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild @@ -70,6 +70,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 {} \; +sed -i '/^#include <vector>$/a #include <limits>' src/minimizer.h + CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch b/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch new file mode 100644 index 0000000000..9f9210abf5 --- /dev/null +++ b/graphics/exact-image/Provide-gif-quantization-for-giflib-5.2.patch @@ -0,0 +1,384 @@ +From: Sven Eckelmann <sven@narfation.org> +Date: Sat, 31 Aug 2019 14:13:11 +0200 +Subject: Provide gif quantization for giflib >= 5.2 + +Bug-Debian: https://bugs.debian.org/939031 + +diff -Naur exact-image-1.0.2.orig/codecs/Makefile exact-image-1.0.2/codecs/Makefile +--- exact-image-1.0.2.orig/codecs/Makefile 2016-06-18 21:49:25.000000000 +0200 ++++ exact-image-1.0.2/codecs/Makefile 2020-12-11 15:30:44.374504000 +0100 +@@ -21,7 +21,7 @@ + ifeq "$(WITHLIBGIF)" "1" + LDFLAGS += -lgif + else +-NOT_SRCS += gif.cc ++NOT_SRCS += gif.cc gif_quantization.c + endif + + ifeq "$(WITHJASPER)" "1" +diff -Naur exact-image-1.0.2.orig/codecs/gif.cc exact-image-1.0.2/codecs/gif.cc +--- exact-image-1.0.2.orig/codecs/gif.cc 2017-07-21 16:19:01.000000000 +0200 ++++ exact-image-1.0.2/codecs/gif.cc 2020-12-11 15:34:55.340504000 +0100 +@@ -160,6 +160,17 @@ + return true; + } + ++extern "C" int ++eiGifQuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap); ++ ++ + bool GIFCodec::writeImage (std::ostream* stream, Image& image, int quality, + const std::string& compress) + { +@@ -203,8 +214,7 @@ + *bptr++ = b; + } + +- +- if (GifQuantizeBuffer(image.w, image.h, &ColorMapSize, ++ if (eiGifQuantizeBuffer(image.w, image.h, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) { + return false; +diff -Naur exact-image-1.0.2.orig/codecs/gif_quantization.c exact-image-1.0.2/codecs/gif_quantization.c +--- exact-image-1.0.2.orig/codecs/gif_quantization.c 1970-01-01 01:00:00.000000000 +0100 ++++ exact-image-1.0.2/codecs/gif_quantization.c 2020-12-11 15:30:19.181504000 +0100 +@@ -0,0 +1,331 @@ ++/***************************************************************************** ++ ++ quantize.c - quantize a high resolution image into lower one ++ ++ Based on: "Color Image Quantization for frame buffer Display", by ++ Paul Heckbert SIGGRAPH 1982 page 297-307. ++ ++ This doesn't really belong in the core library, was undocumented, ++ and was removed in 4.2. Then it turned out some client apps were ++ actually using it, so it was restored in 5.0. ++ ++SPDX-License-Identifier: MIT ++ ++******************************************************************************/ ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include "gif_lib.h" ++ ++#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); ++ ++/****************************************************************************** ++ Quantize high resolution image into lower one. Input image consists of a ++ 2D array for each of the RGB colors with size Width by Height. There is no ++ Color map for the input. Output is a quantized image with 2D array of ++ indexes into the output color map. ++ Note input image can be 24 bits at the most (8 for red/green/blue) and ++ the output has 256 colors at the most (256 entries in the color map.). ++ ColorMapSize specifies size of color map up to 256 and will be updated to ++ real size before returning. ++ Also non of the parameter are allocated by this routine. ++ This function returns GIF_OK if successful, GIF_ERROR otherwise. ++******************************************************************************/ ++int ++eiGifQuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ Routine to subdivide the RGB space recursively using median cut in each ++ axes alternatingly until ColorMapSize different cubes exists. ++ The biggest cube in one dimension is subdivide unless it has only one entry. ++ Returns GIF_ERROR if failed, otherwise GIF_OK. ++*******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ unsigned int i, j, Index = 0; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ long Sum, Count; ++ int MaxSize = -1; ++ unsigned int NumEntries, MinColor, MaxColor; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ /* ++ * Because qsort isn't stable, this can produce differing ++ * results for the order of tuples depending on platform ++ * details of how qsort() is implemented. ++ * ++ * We mitigate this problem by sorting on all three axes rather ++ * than only the one specied by SortRGBAxis; that way the instability ++ * can only become an issue if there are multiple color indices ++ * referring to identical RGB tuples. Older versions of this ++ * sorted on only the one axis. ++ */ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while (QuantizedColor->Pnext != NULL && ++ (Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ /* coverity[var_deref_op] */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ Routine called by qsort to compare two entries. ++*****************************************************************************/ ++ ++static int ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { ++ QuantizedColorType *entry1 = (*((QuantizedColorType **) Entry1)); ++ QuantizedColorType *entry2 = (*((QuantizedColorType **) Entry2)); ++ ++ /* sort on all axes of the color space! */ ++ int hash1 = entry1->RGB[SortRGBAxis] * 256 * 256 ++ + entry1->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry1->RGB[(SortRGBAxis+2) % 3]; ++ int hash2 = entry2->RGB[SortRGBAxis] * 256 * 256 ++ + entry2->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry2->RGB[(SortRGBAxis+2) % 3]; ++ ++ return hash1 - hash2; ++} ++ ++/* end */ diff --git a/graphics/exact-image/exact-image.SlackBuild b/graphics/exact-image/exact-image.SlackBuild index bc64a31f5b..673ec8456f 100644 --- a/graphics/exact-image/exact-image.SlackBuild +++ b/graphics/exact-image/exact-image.SlackBuild @@ -74,6 +74,7 @@ eval $(perl -V:vendorlib) sed "s,@vendorlib@,$vendorlib,g" $CWD/fixup-perl_paths.diff | patch -p1 --verbose patch -p1 < $CWD/c98.patch +patch -p1 < $CWD/Provide-gif-quantization-for-giflib-5.2.patch ./configure \ --bindir=/usr/bin \ diff --git a/graphics/fim/fim.SlackBuild b/graphics/fim/fim.SlackBuild index c2ae121b29..1416014e31 100644 --- a/graphics/fim/fim.SlackBuild +++ b/graphics/fim/fim.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fim -VERSION=${VERSION:-0.5_rc1} +VERSION=${VERSION:-0.6_trunk} SRCVER=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,11 @@ 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 {} \; +# Workaround for gcc 10 (hanks garron@AUR) +sed -i -e 's/#define FIM_WANT_BACKGROUND_LOAD.*//' src/fim.h +sed -i -e 's/void exit/FIM_NORETURN void exit/' src/CommandConsole.h +sed -i -e 's/°//g' src/fim.cpp + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -82,14 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --disable-debug \ - --with-default-consolefont=/usr/share/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz \ + --enable-hardcoded-font \ + --enable-sdl \ + --enable-unicode \ --build=$ARCH-slackware-linux -# Fix build with bison-3 -sed -i \ - -e '/^fim_LDADD = /s/ \$(LEXLIB)//' \ - src/Makefile - make -j1 make install DESTDIR=$PKG diff --git a/graphics/fim/fim.info b/graphics/fim/fim.info index c2c082121b..25e19a7188 100644 --- a/graphics/fim/fim.info +++ b/graphics/fim/fim.info @@ -1,8 +1,8 @@ PRGNAM="fim" -VERSION="0.5_rc1" +VERSION="0.6_trunk" HOMEPAGE="http://www.nongnu.org/fbi-improved/" -DOWNLOAD="http://download.savannah.gnu.org/releases/fbi-improved/fim-0.5-rc1.tar.gz" -MD5SUM="03d4dd36c894c1d319b5d5ca7a82dfb3" +DOWNLOAD="http://download.savannah.nongnu.org/releases/fbi-improved/fim-0.6-trunk.tar.gz" +MD5SUM="96492d5c53f806ebdf6d624e73360bdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/frescobaldi/frescobaldi.SlackBuild b/graphics/frescobaldi/frescobaldi.SlackBuild index 62c49cc3ac..ad85248c44 100644 --- a/graphics/frescobaldi/frescobaldi.SlackBuild +++ b/graphics/frescobaldi/frescobaldi.SlackBuild @@ -4,7 +4,7 @@ PRGNAM=frescobaldi -VERSION=${VERSION:-2.20.0} +VERSION=${VERSION:-3.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -50,8 +50,12 @@ 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 {} \; +# Provided by hyphen-* +rm -f frescobaldi_app/hyphdicts/hyph_*.dic +rm -f frescobaldi_app/hyphdicts/README* + mkdir -p $PKG/usr/bin -python setup.py install --root $PKG +python3 setup.py install --root $PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/graphics/frescobaldi/frescobaldi.info b/graphics/frescobaldi/frescobaldi.info index f54bcc64ff..38c9b114e6 100644 --- a/graphics/frescobaldi/frescobaldi.info +++ b/graphics/frescobaldi/frescobaldi.info @@ -1,10 +1,10 @@ PRGNAM="frescobaldi" -VERSION="2.20.0" +VERSION="3.1.3" HOMEPAGE="http://frescobaldi.org/" -DOWNLOAD="https://github.com/wbsoft/frescobaldi/archive/v2.20.0/frescobaldi-2.20.0.tar.gz" -MD5SUM="5d9c3d9543dc226fc3196ca2b90101ad" +DOWNLOAD="https://github.com/frescobaldi/frescobaldi/releases/download/v3.1.3/frescobaldi-3.1.3.tar.gz" +MD5SUM="45c3dddb673afb892a6b66459dd8c9dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lilypond python-poppler-qt4 python-ly" +REQUIRES="lilypond python-poppler-qt5 python-ly" MAINTAINER="Michales Michaloudes" EMAIL="korgie@gmail.com" diff --git a/graphics/gimagereader/gimagereader.SlackBuild b/graphics/gimagereader/gimagereader.SlackBuild index 34b703f8c6..8cf3197e8d 100644 --- a/graphics/gimagereader/gimagereader.SlackBuild +++ b/graphics/gimagereader/gimagereader.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gimagereader -VERSION=${VERSION:-3.2.3} +VERSION=${VERSION:-20201201_2d32618} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,16 +70,18 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Path where manual will be installed -sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt +sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt || exit 1 -# Interface type: qt4/qt5/gtk +sed -i "s|QuaZip-Qt5-1\.0|QuaZip-Qt5-1.1|" CMakeLists.txt || exit 1 + +# Interface type: qt5/gtk mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINTERFACE_TYPE=qt4 \ + -DINTERFACE_TYPE=qt5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -89,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/gimagereader/gimagereader.info b/graphics/gimagereader/gimagereader.info index 8694e7743e..20803afacf 100644 --- a/graphics/gimagereader/gimagereader.info +++ b/graphics/gimagereader/gimagereader.info @@ -1,8 +1,8 @@ PRGNAM="gimagereader" -VERSION="3.2.3" +VERSION="20201201_2d32618" HOMEPAGE="https://github.com/manisandro/gImageReader/" -DOWNLOAD="https://github.com/manisandro/gImageReader/releases/download/v3.2.3/gimagereader-3.2.3.tar.xz" -MD5SUM="f4af1b531812a4a3c7fa5a7d49436acd" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/gimagereader-20201201_2d32618.tar.xz" +MD5SUM="56b696dff8ae247fa55b1cc4f91cdd52" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tesseract qtspell podofo" 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/glslang/README b/graphics/glslang/README deleted file mode 100644 index d61381b370..0000000000 --- a/graphics/glslang/README +++ /dev/null @@ -1,5 +0,0 @@ -Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, -and a SPIR-V generator. - -If SPIRV-Tools is not installed a package will be created where illegal -SPIRV may be generated for HLSL. diff --git a/graphics/glslang/SPIRV-Tools-shared.patch b/graphics/glslang/SPIRV-Tools-shared.patch deleted file mode 100644 index 34cb8ad9bc..0000000000 --- a/graphics/glslang/SPIRV-Tools-shared.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1504af077935a0bfd1b1b59f77d8b1cd89f913b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com> -Date: Mon, 10 Dec 2018 13:05:15 +0100 -Subject: [PATCH] CMake: Allow linking against system-installed SPIRV-Tools - -Fixes #1585. ---- - CMakeLists.txt | 7 ++++++- - SPIRV/CMakeLists.txt | 21 +++++++++++++-------- - 2 files changed, 19 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada2b8fb9..22243f491 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -320,7 +320,12 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) - add_subdirectory(External) - endif() - --if(NOT TARGET SPIRV-Tools-opt) -+find_package(PkgConfig) -+if(PkgConfig_FOUND) -+ pkg_check_modules(SPIRV-Tools SPIRV-Tools) -+endif() -+# Former would be system-installed, later is from External -+if(NOT SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools-opt) - set(ENABLE_OPT OFF) - endif() - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699daddb..28beb47bb 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -91,14 +91,19 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - - if(ENABLE_OPT) -- target_include_directories(SPIRV -- PRIVATE ${spirv-tools_SOURCE_DIR}/include -- PRIVATE ${spirv-tools_SOURCE_DIR}/source -- ) -- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -- target_include_directories(SPIRV PUBLIC -- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ if(SPIRV-Tools_FOUND) -+ target_include_directories(SPIRV PUBLIC ${SPIRV-Tools_INCLUDEDIR}) -+ target_link_libraries(SPIRV glslang ${SPIRV-Tools_LIBRARIES}) -+ else() -+ target_include_directories(SPIRV -+ PRIVATE ${spirv-tools_SOURCE_DIR}/include -+ PRIVATE ${spirv-tools_SOURCE_DIR}/source -+ ) -+ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -+ target_include_directories(SPIRV PUBLIC -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ endif() - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif(ENABLE_OPT) diff --git a/graphics/glslang/glslang.SlackBuild b/graphics/glslang/glslang.SlackBuild deleted file mode 100644 index db38ad19a9..0000000000 --- a/graphics/glslang/glslang.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for glslang - -# Copyright 2020-2021 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=glslang -VERSION=${VERSION:-11.1.0} -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.tar.gz -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 {} \; - -# CMake: Allow linking against system-installed SPIRV-Tools -# https://github.com/KhronosGroup/glslang/issues/1585 -# https://github.com/KhronosGroup/glslang/pull/1621 -patch -p1 < $CWD/SPIRV-Tools-shared.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DBUILD_EXTERNAL=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_TYPE=Release .. - 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 CHANGES.md CODE_OF_CONDUCT.md LICENSE.txt README-spirv-remap.txt \ - README.md $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/glslang/glslang.info b/graphics/glslang/glslang.info deleted file mode 100644 index 2fd87c7139..0000000000 --- a/graphics/glslang/glslang.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="glslang" -VERSION="11.1.0" -HOMEPAGE="https://github.com/KhronosGroup/glslang" -DOWNLOAD="https://github.com/KhronosGroup/glslang/archive/11.1.0/glslang-11.1.0.tar.gz" -MD5SUM="1688a1e36945d72df960b859ede55078" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SPIRV-Tools" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/graphics/glslang/slack-desc b/graphics/glslang/slack-desc deleted file mode 100644 index 0693d091db..0000000000 --- a/graphics/glslang/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------------------------------------------------------| -glslang: glslang (GLSL/ESSL front end, HLSL front end SPIR-V generator) -glslang: -glslang: Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, -glslang: and a SPIR-V generator. -glslang: -glslang: Homepage: https://github.com/KhronosGroup/glslang -glslang: -glslang: -glslang: -glslang: -glslang: diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild index 5c54c3b4d7..ccc1ca09b8 100644 --- a/graphics/gmic/gmic.SlackBuild +++ b/graphics/gmic/gmic.SlackBuild @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gmic -VERSION=${VERSION:-2.7.5} -COMMUNITYVERSION=${COMMUNITYVERSION:-5a9aefc05e9585c1198c1d68f4b47ee32ff68ae2} +VERSION=${VERSION:-2.9.4} +COMMUNITYVERSION=${COMMUNITYVERSION:-6e9a20ef40e1db99c9b761853ad493ee7439e1b7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,7 +46,7 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O0 -march=i686 -mtune=i686 -fno-fast-math" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O3 -fPIC" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O0 -fno-fast-math" @@ -78,16 +78,11 @@ sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \ -e "s|/etc/bash_completion.d|/usr/share/bash-completion/completions|g" \ -e "s|pkg-config opencv|pkg-config opencv4|" \ -e "s|qmake|qmake-qt5|g" \ - src/Makefile + src/Makefile || exit 1 sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \ - gmic-qt/gmic_qt.pro + gmic-qt/gmic_qt.pro || exit 1 -# fix build with openCV 4.x -cd zart -patch -p1 -i $CWD/zart-opencv4.patch -cd - - -make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " -j1 +make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " cd gmic-qt qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info index 3d609c7b98..99ae716a5b 100644 --- a/graphics/gmic/gmic.info +++ b/graphics/gmic/gmic.info @@ -1,10 +1,10 @@ PRGNAM="gmic" -VERSION="2.7.5" +VERSION="2.9.4" HOMEPAGE="https://gmic.eu" -DOWNLOAD="https://gmic.eu/files/source/gmic_2.7.5.tar.gz \ - https://github.com/dtschump/gmic-community/archive/5a9aefc05e9585c1198c1d68f4b47ee32ff68ae2.zip" -MD5SUM="d1c9baba2726b8ce8421804c91406a34 \ - a54fa39b205e6dd712f42a2f3c1f45ae" +DOWNLOAD="https://gmic.eu/files/source/gmic_2.9.4.tar.gz \ + https://github.com/dtschump/gmic-community/archive/6e9a20ef40e1db99c9b761853ad493ee7439e1b7.zip" +MD5SUM="e0d396ab6406c9baeb4929c1dd6a0d6a \ + 75f88fa1423f253714e84905a05f37da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 opencv" diff --git a/graphics/gmic/zart-opencv4.patch b/graphics/gmic/zart-opencv4.patch deleted file mode 100644 index 6396db571a..0000000000 --- a/graphics/gmic/zart-opencv4.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/include/VideoFileSource.h b/include/VideoFileSource.h -index 0fda14e..8c15178 100644 ---- a/include/VideoFileSource.h -+++ b/include/VideoFileSource.h -@@ -50,5 +50,7 @@ - #include <QString> - #include <opencv2/opencv.hpp> -+#include <opencv2/videoio.hpp> -+#include <opencv2/videoio/videoio_c.h> - #include "ImageSource.h" - - class VideoFileSource : public ImageSource { -diff --git a/include/WebcamSource.h b/include/WebcamSource.h -index 8c1911a..9194385 100644 ---- a/include/WebcamSource.h -+++ b/include/WebcamSource.h -@@ -53,6 +53,8 @@ - #include <QString> - #include <QVector> - #include <opencv2/opencv.hpp> -+#include <opencv2/videoio.hpp> -+#include <opencv2/videoio/videoio_c.h> - #include "ImageSource.h" - - class QSplashScreen; -diff --git a/zart.pro b/zart.pro -index d98a192..ddb2d3b 100644 ---- a/zart.pro -+++ b/zart.pro -@@ -19,7 +19,7 @@ - CONFIG += warn_on - QT_CONFIG -= no-pkg-config - CONFIG += link_pkgconfig --PKGCONFIG += opencv fftw3 zlib -+PKGCONFIG += opencv4 fftw3 zlib - # LIBS += -lfftw3_threads - DEFINES += cimg_use_fftw3 cimg_use_zlib - -diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp ---- a/src/ImageConverter.cpp -+++ b/src/ImageConverter.cpp -@@ -70,7 +70,7 @@ - - cv::Mat tmp(in->cols, in->rows, in->depth()); - -- cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); -+ cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); - - const unsigned int w3 = 3 * tmp.cols; - unsigned char * src = reinterpret_cast<unsigned char *>(tmp.ptr()); -@@ -106,7 +106,7 @@ - dst += step; - } - } -- cvtColor(**out, **out, CV_BGR2RGB); -+ cvtColor(**out, **out, cv::COLOR_BGR2RGB); - } - - void ImageConverter::convert(const cimg_library::CImg<float> & in, QImage * out) 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/gpaint/gpaint.SlackBuild b/graphics/gpaint/gpaint.SlackBuild index a1c3993328..0c3b7861ba 100644 --- a/graphics/gpaint/gpaint.SlackBuild +++ b/graphics/gpaint/gpaint.SlackBuild @@ -84,6 +84,7 @@ patch -p1 -i $CWD/patches/24_fix_crash_on_failed_write.patch patch -p1 -i $CWD/patches/25_fix_color_selection.patch patch -p1 -i $CWD/patches/26_fix_toolbar.patch +LIBS="-lm" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/graphene/README b/graphics/graphene/README deleted file mode 100644 index 08152a6c50..0000000000 --- a/graphics/graphene/README +++ /dev/null @@ -1,22 +0,0 @@ -When creating graphic libraries you most likely end up dealing with -points and rectangles. If you're particularly unlucky, you may end -up dealing with affine matrices and 2D transformations. If you're -writing a graphic library with 3D transformations, though, you are -going to hit the jackpot: 4x4 matrices, projections, transformations, -vectors, and quaternions. - -Most of this stuff exists, in various forms, in other libraries, -but it has the major drawback of coming along with the rest of those -libraries, which may or may not be what you want. Those libraries -are also available in various languages, as long as those languages -are C++; again, it may or may not be something you want. - -For this reason, I decided to write the thinnest, smallest possible -layer needed to write a canvas library; given its relative size, and -the propensity for graphics libraries to have a pun in their name, -I decided to call it Graphene. - -This library provides types and their relative API; it does not deal -with windowing system surfaces, drawing, scene graphs, or input. You're -supposed to do that yourself, in your own canvas implementation, -which is the whole point of writing the library in the first place. diff --git a/graphics/graphene/graphene.SlackBuild b/graphics/graphene/graphene.SlackBuild deleted file mode 100644 index 7b0bfa773d..0000000000 --- a/graphics/graphene/graphene.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -# Slackware build script for graphene - -# Copyright 2020 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=graphene -VERSION=${VERSION:-1.10.2} -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.tar.xz -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 {} \; - -if [ "${DEBUG:=0}" != 0 ]; then - NDEBUG=false - RELEASE=debug - SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" -else - NDEBUG=true - RELEASE=plain -fi - -# Don't create the __pycache__ directory. -export PYTHONDONTWRITEBYTECODE=1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - -Dinstalled_tests=false \ - -Dstrip=$NDEBUG \ - -Db_ndebug=$NDEBUG \ - -Dbuildtype=$RELEASE \ - build - -"${NINJA:=ninja}" -C build -DESTDIR=$PKG "$NINJA" -C build install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE.txt README.md \ - $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/graphene/graphene.info b/graphics/graphene/graphene.info deleted file mode 100644 index fcc80acf74..0000000000 --- a/graphics/graphene/graphene.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="graphene" -VERSION="1.10.2" -HOMEPAGE="https://ebassi.github.io/graphene/" -DOWNLOAD="https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz" -MD5SUM="a2c26c4f44a02ca053e0e9afb63cc94c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/graphics/graphene/slack-desc b/graphics/graphene/slack-desc deleted file mode 100644 index 2815360bf5..0000000000 --- a/graphics/graphene/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------------------------------------------------------| -graphene: graphene (graphic data types layer) -graphene: -graphene: A thin layer of graphic data types. -graphene: -graphene: Homepage: https://ebassi.github.io/graphene/ -graphene: -graphene: -graphene: -graphene: -graphene: -graphene: diff --git a/graphics/graphite2/README b/graphics/graphite2/README deleted file mode 100644 index 03a0e630a8..0000000000 --- a/graphics/graphite2/README +++ /dev/null @@ -1,10 +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. - -python3 is an optional dependency. diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild deleted file mode 100644 index c047c832bf..0000000000 --- a/graphics/graphite2/graphite2.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for graphite2 - -# Copyright 2015-2018, 2020 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.14} -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_SKIP_RPATH=TRUE \ - -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 3402fcc300..0000000000 --- a/graphics/graphite2/graphite2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="graphite2" -VERSION="1.3.14" -HOMEPAGE="http://graphite.sil.org/" -DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.tgz" -MD5SUM="1bccb985a7da01092bfb53bb5041e836" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" 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/inkscape/README b/graphics/inkscape/README index 1d9e9dd712..61391c1df2 100644 --- a/graphics/inkscape/README +++ b/graphics/inkscape/README @@ -7,5 +7,3 @@ Creative Commons meta-data, node editing, layers, complex path operations, bitmap tracing, text-on-path, flowed text, direct XML editing, and more. It imports formats such as JPEG, PNG, TIFF, and others and exports PNG as well as multiple vector-based formats. - -Optional dependency: potrace (for bitmap tracing functionality). diff --git a/graphics/inkscape/glib-2.68.patch b/graphics/inkscape/glib-2.68.patch new file mode 100644 index 0000000000..bc23d7df01 --- /dev/null +++ b/graphics/inkscape/glib-2.68.patch @@ -0,0 +1,47 @@ +diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h +index 2ce6f272a997cee8c7839412a520106d5584ce4c..e56be9a74c4308cacc4043ef0855edae9cdef0a6 100644 +--- a/src/3rdparty/autotrace/autotrace.h ++++ b/src/3rdparty/autotrace/autotrace.h +@@ -23,6 +23,9 @@ + + #include <stdio.h> + ++#include "types.h" ++#include "color.h" ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ +@@ -35,9 +38,6 @@ extern "C" { + * Typedefs + * ===================================================================== */ + +-#include "types.h" +-#include "color.h" +- + /* Third degree is the highest we deal with. */ + enum _at_polynomial_degree { + AT_LINEARTYPE = 1, +diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h +index e50ab30ae04d1861c4d9aa0f393650d2f2c102da..88651db9f73571cdc5f14cdf4645e8fa69e03912 100644 +--- a/src/3rdparty/autotrace/color.h ++++ b/src/3rdparty/autotrace/color.h +@@ -24,6 +24,10 @@ + #include <glib.h> + #include <glib-object.h> + ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ + typedef struct _at_color at_color; + struct _at_color { + guint8 r; +@@ -43,4 +47,7 @@ void at_color_free(at_color * color); + GType at_color_get_type(void); + #define AT_TYPE_COLOR (at_color_get_type ()) + ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ + #endif /* not AT_COLOR_H */ diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 4471bf3c1b..d61c6507a8 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inkscape -VERSION=${VERSION:-0.92.4} +VERSION=${VERSION:-1.0.2} +EXTRAVER=${EXTRAVER:-2021-01-15_e86c870879} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf ${PRGNAM}-${VERSION}_${EXTRAVER} tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +cd ${PRGNAM}-${VERSION}_${EXTRAVER} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,31 +70,51 @@ 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 {} \; -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ -./configure \ - --enable-strict-build=no \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +patch -p1 < $CWD/glib-2.68.patch + +# strip invalid tag +sed -i /url/d org.inkscape.Inkscape.appdata.xml.in + +# https://bugs.launchpad.net/inkscape/+bug/314381 +# a couple of files have executable bits set, +# despite not being executable +find . -name '*.cpp' | xargs chmod -x +find . -name '*.h' | xargs chmod -x +# Fix end of line encodings +dos2unix -k -q share/extensions/*.py + +# Fix man page location: +sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" + +mkdir -p build +cd build + # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DBUILD_SHARED_LIBS=ON \ + -DWITH_DBUS=ON \ + -DWITH_GRAPHICS_MAGICK=ON \ + -DWITH_IMAGE_MAGICK=OFF \ + .. + make + make install DESTDIR=$PKG +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README TRANSLATORS doc/* \ + AUTHORS COPYING* README* TRANSLATORS LICENSES *.md doc/* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -name "Makefile*" -exec rm {} \; diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index 39fe0759fd..9e0d9b3bb9 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,10 +1,10 @@ PRGNAM="inkscape" -VERSION="0.92.4" +VERSION="1.0.2" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2" -MD5SUM="ac30f6d5747fd9c620c00dad500f414f" +DOWNLOAD="https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz" +MD5SUM="ec90e0c1e4c7e3dba8f46b16c73462b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lxml numpy" +REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" 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/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index ff0c67222a..baf39a00b2 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -4,13 +4,13 @@ # By default the demo pictures and movie are packaged. PRGNAM=kphotoalbum -VERSION=${VERSION:-4.7.1} +VERSION=${VERSION:-5.7.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 @@ -25,8 +25,8 @@ OUTPUT=${OUTPUT:-/tmp} # set DEMO to no to omit them. DEMO=${DEMO:-yes} -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" @@ -56,13 +56,12 @@ find -L . \ mkdir build && cd build cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ .. - make -j1 + make make install DESTDIR=$PKG cd - @@ -71,7 +70,7 @@ if [ "$DEMO" = "no" ]; then fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog tips README \ +cp -a COPYING ChangeLog tips README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/kphotoalbum/kphotoalbum.info b/graphics/kphotoalbum/kphotoalbum.info index bd8364de7e..a096855d90 100644 --- a/graphics/kphotoalbum/kphotoalbum.info +++ b/graphics/kphotoalbum/kphotoalbum.info @@ -1,8 +1,8 @@ PRGNAM="kphotoalbum" -VERSION="4.7.1" +VERSION="5.7.0" HOMEPAGE="http://kphotoalbum.org" -DOWNLOAD="http://download.kde.org/stable/kphotoalbum/4.7.1/src/kphotoalbum-4.7.1.tar.xz" -MD5SUM="6994263a53780e1f5d40cc197db8f10b" +DOWNLOAD="https://download.kde.org/stable/kphotoalbum/5.7.0/kphotoalbum-5.7.0.tar.xz" +MD5SUM="c52404d5edd89b53d0201a736584df1e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/kuickshow/README b/graphics/kuickshow/README index ba6aa9daba..af4cb52b89 100644 --- a/graphics/kuickshow/README +++ b/graphics/kuickshow/README @@ -1,6 +1,6 @@ -KuickShow displays images using all the available space, without being wasted -in bars or menus. It also has a smart automatic zooming that scales images -according to its size. You can use the integrated file browser to choose -images, or navigate through a folder with the mousewheel or the keyboard. It -also has fullscreen view and slideshow, and supports a wide range of image -formats. +KuickShow displays images using all the available space, without being +wasted in bars or menus. It also has a smart automatic zooming that +scales images according to its size. You can use the integrated file +browser to choose images, or navigate through a folder with the +mousewheel or the keyboard. It also has fullscreen view and slideshow, +and supports a wide range of image formats. diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index 6a82e2deba..13d0aac83b 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for KuickShow -# Copyright 2013, David Melik, Spokane, WA, USA +# Copyright 2013-2020, SlackBuilds.org Project, David Melik, Spokane, WA, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by David Melik <dchmelik @ gmail dot com> - PRGNAM=kuickshow -VERSION=${VERSION:-0.9.1} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -78,6 +76,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DKDE_INSTALL_DOCBUNDLEDIR=/usr/doc/HTML \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -86,6 +85,13 @@ 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 \ + AUTHORS ChangeLog TODO BUGS COPYING README doc/ \ + $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/kuickshow/kuickshow.info b/graphics/kuickshow/kuickshow.info index 3fa2738bfe..d3fc55a98c 100644 --- a/graphics/kuickshow/kuickshow.info +++ b/graphics/kuickshow/kuickshow.info @@ -1,8 +1,8 @@ PRGNAM="kuickshow" -VERSION="0.9.1" +VERSION="0.10.1" HOMEPAGE="https://userbase.kde.org/KuickShow" -DOWNLOAD="http://hosti.leonde.de/~gis/kuickshow-0.9.1.tar.bz2" -MD5SUM="6866128ee3ef3d0dde809cd5b23d2472" +DOWNLOAD="https://github.com/KDE/kuickshow/archive/v0.10.1/kuickshow-0.10.1.tar.gz" +MD5SUM="9a62b261885c202434719526b5bf7df4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib" diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild index 70e31a9fb4..8a2efbb31a 100644 --- a/graphics/lilypond/lilypond.SlackBuild +++ b/graphics/lilypond/lilypond.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lilypond -VERSION=${VERSION:-2.18.2} +VERSION=${VERSION:-2.22.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -71,7 +71,8 @@ chmod -R u+w,go-w,a+rX-st . sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in # configure searches for naming variants like guile1.8-config but not this: -GUILE_CONFIG=guile-config1.8 \ +export GUILE=guile1.8 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info index b3864d97c9..71fc8756b1 100644 --- a/graphics/lilypond/lilypond.info +++ b/graphics/lilypond/lilypond.info @@ -1,10 +1,10 @@ PRGNAM="lilypond" -VERSION="2.18.2" +VERSION="2.22.0" HOMEPAGE="http://www.lilypond.org/" -DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz" -MD5SUM="3c4bcbb708d12644668b32bfe82ebf25" +DOWNLOAD="https://lilypond.org/download/sources/v2.22/lilypond-2.22.0.tar.gz" +MD5SUM="4b0d869873b0120bda2e8bd94e1a628a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fontforge t1utils guile1.8" +REQUIRES="extractpdfmark fontforge guile1.8 t1utils" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/graphics/mcomix/README b/graphics/mcomix/README deleted file mode 100644 index 0bb478ae18..0000000000 --- a/graphics/mcomix/README +++ /dev/null @@ -1,20 +0,0 @@ -mcomix (comic book viewer) - -MComix is a user-friendly, customizable image viewer. It is specifically -designed to handle comic books, but also serves as a generic viewer. It -reads images in ZIP, RAR, 7Zip or tar archives as well as plain image files. It -is written in Python and uses GTK+ through the PyGTK bindings. - -MComix is a fork of the Comix project, and aims to add bug fixes and stability -improvements after Comix development came to a halt in late 2009. - -OPTIONAL DEPENDENCIES: -You also need either the "unrar" or the "rar" program installed if you wish -to read RAR (.cbr) archives. - -Alternatively, MComix can be built over the optional dependency libunrar -from Rarlab. - -To read 7Zip archives, you need to have the "7z" program installed. Likewise, -"lha" is needed to open LHA/LZA archives. Note that "7z" can be used as -substitute for both "unrar" and "lha". diff --git a/graphics/mcomix/doinst.sh b/graphics/mcomix/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/graphics/mcomix/doinst.sh +++ /dev/null @@ -1,13 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/graphics/mcomix/mcomix.SlackBuild b/graphics/mcomix/mcomix.SlackBuild deleted file mode 100644 index 03a72c7275..0000000000 --- a/graphics/mcomix/mcomix.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# Slackware build script for mcomix - -# written by Joze Zobec <jozze.zepl@gmail.com> - -# modified by B. Watson <yalhcru@gmail.com> - -# 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=mcomix -VERSION=${VERSION:-1.2.1} -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 -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p $PKG/usr - -python setup.py install --single-version-externally-managed \ - --root=$PKG \ - --prefix=/usr \ - --record mcomix-files.txt - -# man page already gzipped, nice -mv $PKG/usr/share/man $PKG/usr/man - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README PKG-INFO COPYING $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/graphics/mcomix/mcomix.info b/graphics/mcomix/mcomix.info deleted file mode 100644 index 235888c5d2..0000000000 --- a/graphics/mcomix/mcomix.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mcomix" -VERSION="1.2.1" -HOMEPAGE="http://mcomix.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/project/mcomix/MComix-1.2.1/mcomix-1.2.1.tar.bz2" -MD5SUM="1d05ed7596bd670e5b3a97896e6d4d47" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/graphics/mcomix/slack-desc b/graphics/mcomix/slack-desc deleted file mode 100644 index f13a70e456..0000000000 --- a/graphics/mcomix/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------------------------------------------------------| -mcomix: mcomix (comic book viewer) -mcomix: -mcomix: MComix is a user-friendly, customizable image viewer. It is -mcomix: specifically designed to handle comic books, but also serves as a -mcomix: generic viewer. It reads images in ZIP, RAR, 7Zip or tar archives as -mcomix: well as plain image files. It is written in Python and uses GTK+ -mcomix: through the PyGTK bindings. -mcomix: -mcomix: Homepage: mcomix.sourceforge.net -mcomix: -mcomix: 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/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild index 8eaa6158ae..423f012b3d 100644 --- a/graphics/nomacs/nomacs.SlackBuild +++ b/graphics/nomacs/nomacs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nomacs -# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nomacs -VERSION=${VERSION:-3.14.2} -PVERSION=${PVERSION:-3.14} +VERSION=${VERSION:-3.17.2206} +PVERSION=${PVERSION:-3.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,8 +55,6 @@ else LIBDIRSUFFIX="" fi -DOCS="Readme/COPYRIGHT Readme/LICENSE* Readme/README" - set -e rm -rf $PKG @@ -66,6 +64,7 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION/ImageLounge tar xvf $CWD/$PRGNAM-plugins-$PVERSION.tar.?z +rm -fR plugins mv $PRGNAM-plugins-$PVERSION plugins cd .. chown -R root:root . @@ -75,6 +74,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 {} \; +zcat $CWD/nomacs-$VERSION-quazip-1.0.0.patch.gz | patch -p1 || exit 1 + cd ImageLounge # Fix man pages and plugins installation path @@ -90,6 +91,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_QUAZIP=1 \ -DUSE_SYSTEM_QUAZIP=1 \ + -DENABLE_TRANSLATIONS=1 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -102,7 +104,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a license $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/nomacs/nomacs.info b/graphics/nomacs/nomacs.info index 94fb09717d..ff720bc129 100644 --- a/graphics/nomacs/nomacs.info +++ b/graphics/nomacs/nomacs.info @@ -1,12 +1,14 @@ PRGNAM="nomacs" -VERSION="3.14.2" +VERSION="3.17.2206" HOMEPAGE="http://www.nomacs.org" -DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.14.2/nomacs-3.14.2.tar.gz \ - https://github.com/nomacs/nomacs-plugins/archive/3.14/nomacs-plugins-3.14.tar.gz" -MD5SUM="65bd50be8f611305850d3c071adcfcc3 \ - 52eff2a14ff70e2f439f7f2119d80895" +DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.17.2206/nomacs-3.17.2206.tar.gz \ + https://github.com/nomacs/nomacs-plugins/archive/3.16/nomacs-plugins-3.16.tar.gz \ + http://ponce.cc/slackware/sources/repo/nomacs-3.17.2206-quazip-1.0.0.patch.gz" +MD5SUM="26358fe1754dada245022331df3b0d35 \ + fe809775c82da4e55fb47a6e0d05b97a \ + 8c01a5917a49a30c10f0b78a576701d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lcov opencv quazip-qt5" +REQUIRES="lcov" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild index 3bd2b9f561..1ccfdc1d02 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/oiio-include-cstdio.diff b/graphics/openimageio/oiio-include-cstdio.diff deleted file mode 100644 index 48d6aad832..0000000000 --- a/graphics/openimageio/oiio-include-cstdio.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/jpeg2000.imageio/jpeg2000output-v1.cpp.orig 2019-08-02 13:53:54.000000000 +1000 -+++ src/jpeg2000.imageio/jpeg2000output-v1.cpp 2019-08-07 21:54:04.354000000 +1000 -@@ -28,6 +28,7 @@ - (This is the Modified BSD License) - */ - -+#include <cstdio> - #include <vector> - - #include "openjpeg.h" diff --git a/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff b/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff deleted file mode 100644 index b0955d5c7d..0000000000 --- a/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff +++ /dev/null @@ -1,326 +0,0 @@ ---- oiio-Release-2.0.13/src/libOpenImageIO/exif.cpp 2019-12-03 23:28:14.000000000 +0100 -+++ oiio-Release-2.0.13/src/libOpenImageIO/exif.cpp 2021-02-02 02:54:55.000000000 +0100 -@@ -554,40 +528,44 @@ - - - -+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define -+// them ourselves. -+#ifndef GPSTAG_VERSIONID - enum GPSTag { -- GPSTAG_VERSIONID = 0, -- GPSTAG_LATITUDEREF = 1, -- GPSTAG_LATITUDE = 2, -- GPSTAG_LONGITUDEREF = 3, -- GPSTAG_LONGITUDE = 4, -- GPSTAG_ALTITUDEREF = 5, -- GPSTAG_ALTITUDE = 6, -- GPSTAG_TIMESTAMP = 7, -- GPSTAG_SATELLITES = 8, -- GPSTAG_STATUS = 9, -- GPSTAG_MEASUREMODE = 10, -- GPSTAG_DOP = 11, -- GPSTAG_SPEEDREF = 12, -- GPSTAG_SPEED = 13, -- GPSTAG_TRACKREF = 14, -- GPSTAG_TRACK = 15, -- GPSTAG_IMGDIRECTIONREF = 16, -- GPSTAG_IMGDIRECTION = 17, -- GPSTAG_MAPDATUM = 18, -- GPSTAG_DESTLATITUDEREF = 19, -- GPSTAG_DESTLATITUDE = 20, -- GPSTAG_DESTLONGITUDEREF = 21, -- GPSTAG_DESTLONGITUDE = 22, -- GPSTAG_DESTBEARINGREF = 23, -- GPSTAG_DESTBEARING = 24, -- GPSTAG_DESTDISTANCEREF = 25, -- GPSTAG_DESTDISTANCE = 26, -- GPSTAG_PROCESSINGMETHOD = 27, -- GPSTAG_AREAINFORMATION = 28, -- GPSTAG_DATESTAMP = 29, -- GPSTAG_DIFFERENTIAL = 30, -- GPSTAG_HPOSITIONINGERROR = 31 -+ GPSTAG_VERSIONID = 0, -+ GPSTAG_LATITUDEREF = 1, -+ GPSTAG_LATITUDE = 2, -+ GPSTAG_LONGITUDEREF = 3, -+ GPSTAG_LONGITUDE = 4, -+ GPSTAG_ALTITUDEREF = 5, -+ GPSTAG_ALTITUDE = 6, -+ GPSTAG_TIMESTAMP = 7, -+ GPSTAG_SATELLITES = 8, -+ GPSTAG_STATUS = 9, -+ GPSTAG_MEASUREMODE = 10, -+ GPSTAG_DOP = 11, -+ GPSTAG_SPEEDREF = 12, -+ GPSTAG_SPEED = 13, -+ GPSTAG_TRACKREF = 14, -+ GPSTAG_TRACK = 15, -+ GPSTAG_IMGDIRECTIONREF = 16, -+ GPSTAG_IMGDIRECTION = 17, -+ GPSTAG_MAPDATUM = 18, -+ GPSTAG_DESTLATITUDEREF = 19, -+ GPSTAG_DESTLATITUDE = 20, -+ GPSTAG_DESTLONGITUDEREF = 21, -+ GPSTAG_DESTLONGITUDE = 22, -+ GPSTAG_DESTBEARINGREF = 23, -+ GPSTAG_DESTBEARING = 24, -+ GPSTAG_DESTDISTANCEREF = 25, -+ GPSTAG_DESTDISTANCE = 26, -+ GPSTAG_PROCESSINGMETHOD = 27, -+ GPSTAG_AREAINFORMATION = 28, -+ GPSTAG_DATESTAMP = 29, -+ GPSTAG_DIFFERENTIAL = 30, -+ GPSTAG_GPSHPOSITIONINGERROR = 31 - }; -+#endif - - static const TagInfo gps_tag_table[] = { - // clang-format off -@@ -622,7 +600,7 @@ - { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 }, - { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 }, - { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 }, -- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 } -+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 } - // clang-format on - }; - -@@ -685,7 +663,7 @@ - } - if (dirp->tdir_type == TIFF_RATIONAL) { - int n = dirp->tdir_count; // How many -- float* f = (float*)alloca(n * sizeof(float)); -+ float* f = OIIO_ALLOCA(float, n); - for (int i = 0; i < n; ++i) { - unsigned int num, den; - num = ((const unsigned int*)dataptr)[2 * i + 0]; -@@ -704,7 +682,7 @@ - } - if (dirp->tdir_type == TIFF_SRATIONAL) { - int n = dirp->tdir_count; // How many -- float* f = (float*)alloca(n * sizeof(float)); -+ float* f = OIIO_ALLOCA(float, n); - for (int i = 0; i < n; ++i) { - int num, den; - num = ((const int*)dataptr)[2 * i + 0]; -@@ -799,7 +777,7 @@ - - #if DEBUG_EXIF_READ - std::cerr << "Read " << tagmap.mapname() << " "; -- print_dir_entry(tagmap, dir, buf, offset_adjustment); -+ print_dir_entry(std::cerr, tagmap, dir, buf, offset_adjustment); - #endif - - if (dir.tdir_tag == TIFFTAG_EXIFIFD || dir.tdir_tag == TIFFTAG_GPSIFD) { -@@ -808,7 +786,7 @@ - unsigned int offset = dirp->tdir_offset; // int stored in offset itself - if (swab) - swap_endian(&offset); -- if (offset >= buf.size()) { -+ if (offset >= size_t(buf.size())) { - #if DEBUG_EXIF_READ - unsigned int off2 = offset; - swap_endian(&off2); -@@ -863,6 +841,16 @@ - unsigned int offset = dirp->tdir_offset; // int stored in offset itself - if (swab) - swap_endian(&offset); -+ if (offset >= size_t(buf.size())) { -+#if DEBUG_EXIF_READ -+ unsigned int off2 = offset; -+ swap_endian(&off2); -+ std::cerr << "Bad Exif block? ExifIFD has offset " << offset -+ << " inexplicably greater than exif buffer length " -+ << buf.size() << " (byte swapped = " << off2 << ")\n"; -+#endif -+ return; -+ } - // Don't recurse if we've already visited this IFD - if (ifd_offsets_seen.find(offset) != ifd_offsets_seen.end()) - return; - -@@ -964,49 +946,46 @@ - const char* s = *(const char**)p.data(); - int len = strlen(s) + 1; - append_tiff_dir_entry(dirs, data, tag, type, len, s, -- offset_correction); -+ offset_correction, 0, endianreq); - return; - } - break; - case TIFF_RATIONAL: - if (element == TypeDesc::FLOAT) { -- unsigned int* rat = (unsigned int*)alloca(2 * count -- * sizeof(unsigned int)); -+ unsigned int* rat = OIIO_ALLOCA(unsigned int, 2 * count); - const float* f = (const float*)p.data(); - for (size_t i = 0; i < count; ++i) - float_to_rational(f[i], rat[2 * i], rat[2 * i + 1]); - append_tiff_dir_entry(dirs, data, tag, type, count, rat, -- offset_correction); -+ offset_correction, 0, endianreq); - return; - } - break; - case TIFF_SRATIONAL: - if (element == TypeDesc::FLOAT) { -- int* rat = (int*)alloca(2 * count * sizeof(int)); -+ int* rat = OIIO_ALLOCA(int, 2 * count); - const float* f = (const float*)p.data(); - for (size_t i = 0; i < count; ++i) - float_to_rational(f[i], rat[2 * i], rat[2 * i + 1]); - append_tiff_dir_entry(dirs, data, tag, type, count, rat, -- offset_correction); -+ offset_correction, 0, endianreq); - return; - } - break; - case TIFF_SHORT: -- if (append_tiff_dir_entry_integer<unsigned short>(p, dirs, data, tag, -- type, -- offset_correction)) -+ if (append_tiff_dir_entry_integer<unsigned short>( -+ p, dirs, data, tag, type, offset_correction, endianreq)) - return; - break; - case TIFF_LONG: - if (append_tiff_dir_entry_integer<unsigned int>(p, dirs, data, tag, -- type, -- offset_correction)) -+ type, offset_correction, -+ endianreq)) - return; - break; - case TIFF_BYTE: -- if (append_tiff_dir_entry_integer<unsigned char>(p, dirs, data, tag, -- type, -- offset_correction)) -+ if (append_tiff_dir_entry_integer<unsigned char>( -+ p, dirs, data, tag, type, offset_correction, endianreq)) - return; - break; - default: break; -@@ -1091,14 +1097,24 @@ - bool - decode_exif(cspan<uint8_t> exif, ImageSpec& spec) - { -+ // Sometimes an exif blob starts with "Exif". Skip it. -+ if (exif.size() >= 6 && exif[0] == 'E' && exif[1] == 'x' && exif[2] == 'i' -+ && exif[3] == 'f' && exif[4] == 0 && exif[5] == 0) { -+ exif = exif.subspan(6); -+ } -+ - #if DEBUG_EXIF_READ - std::cerr << "Exif dump:\n"; -- for (size_t i = 0; i < exif.size(); ++i) { -+ for (size_t i = 0; i < std::min(200L, exif.size()); ++i) { -+ if ((i % 16) == 0) -+ std::cerr << "[" << i << "] "; - if (exif[i] >= ' ') - std::cerr << (char)exif[i] << ' '; - std::cerr << "(" << (int)exif[i] << ") "; -+ if ((i % 16) == 15) -+ std::cerr << "\n"; - } -- std::cerr << "\n"; -+ std::cerr << std::endl; - #endif - - // The first item should be a standard TIFF header. Note that HERE, -@@ -1176,8 +1192,10 @@ - - template<class T> - inline void --append(std::vector<char>& blob, const T& v) -+append(std::vector<char>& blob, T v, endian endianreq = endian::native) - { -+ if (endianreq != endian::native) -+ swap_endian(&v); - blob.insert(blob.end(), (const char*)&v, (const char*)&v + sizeof(T)); - } - -@@ -1191,10 +1209,20 @@ - - - -+// DEPRECATED(2.1) -+void -+encode_exif(const ImageSpec& spec, std::vector<char>& blob) -+{ -+ encode_exif(spec, blob, endian::native); -+} -+ -+ -+ - // Construct an Exif data block from the ImageSpec, appending the Exif - // data as a big blob to the char vector. - void --encode_exif(const ImageSpec& spec, std::vector<char>& blob) -+encode_exif(const ImageSpec& spec, std::vector<char>& blob, -+ OIIO::endian endianreq) - { - const TagMap& exif_tagmap(exif_tagmap_ref()); - const TagMap& gps_tagmap(gps_tagmap_ref()); -@@ -1243,9 +1271,9 @@ - // Put a TIFF header - size_t tiffstart = blob.size(); // store initial size - TIFFHeader head; -- head.tiff_magic = littleendian() ? 0x4949 : 0x4d4d; -+ head.tiff_magic = (endianreq == endian::little) ? 0x4949 : 0x4d4d; - head.tiff_version = 42; -- // head.tiff_diroff -- fix below, once we know the sizes -+ // N.B. need to swap_endian head.tiff_diroff below, once we know the sizes - append(blob, head); - - // Accumulate separate tag directories for TIFF, Exif, GPS, and Interop. -@@ -1259,7 +1287,8 @@ - if (Strutil::starts_with(p.name(), "GPS:")) { - int tag = gps_tagmap.tag(p.name()); - if (tag >= 0) -- encode_exif_entry(p, tag, gpsdirs, blob, gps_tagmap, tiffstart); -+ encode_exif_entry(p, tag, gpsdirs, blob, gps_tagmap, tiffstart, -+ endianreq); - } else { - // Not GPS - int tag = exif_tagmap.tag(p.name()); -@@ -1267,10 +1296,10 @@ - // This range of Exif tags go in the main TIFF directories, - // not the Exif IFD. Whatever. - encode_exif_entry(p, tag, tiffdirs, blob, exif_tagmap, -- tiffstart); -+ tiffstart, endianreq); - } else { - encode_exif_entry(p, tag, exifdirs, blob, exif_tagmap, -- tiffstart); -+ tiffstart, endianreq); - } - } - } -@@ -1293,12 +1322,14 @@ - if (exifdirs.size() || makerdirs.size()) { - // Add some required Exif tags that wouldn't be in the spec - append_tiff_dir_entry(exifdirs, blob, EXIF_EXIFVERSION, TIFF_UNDEFINED, -- 4, "0230", tiffstart); -+ 4, "0230", tiffstart, 0, endianreq); - append_tiff_dir_entry(exifdirs, blob, EXIF_FLASHPIXVERSION, -- TIFF_UNDEFINED, 4, "0100", tiffstart); -+ TIFF_UNDEFINED, 4, "0100", tiffstart, 0, -+ endianreq); - static char componentsconfig[] = { 1, 2, 3, 0 }; - append_tiff_dir_entry(exifdirs, blob, EXIF_COMPONENTSCONFIGURATION, -- TIFF_UNDEFINED, 4, componentsconfig, tiffstart); -+ TIFF_UNDEFINED, 4, componentsconfig, tiffstart, 0, -+ endianreq); - } - - // If any GPS info was found, add a version tag to the GPS fields. -@@ -1306,7 +1337,7 @@ - // Add some required Exif tags that wouldn't be in the spec - static char ver[] = { 2, 2, 0, 0 }; - append_tiff_dir_entry(gpsdirs, blob, GPSTAG_VERSIONID, TIFF_BYTE, 4, -- &ver, tiffstart); -+ &ver, tiffstart, 0, endianreq); - } - - // Compute offsets: diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild index fa21c74582..37e69bcd78 100644 --- a/graphics/openimageio/openimageio.SlackBuild +++ b/graphics/openimageio/openimageio.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=openimageio SRCNAM=oiio-Release -VERSION=${VERSION:-2.0.13} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.1.19.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PYLIB3_INSTALL_DIRECTORY=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -65,14 +65,6 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION -patch -p0 < $CWD/oiio-include-cstdio.diff - -grep 20191103 /usr/include/tiffvers.h 2>&1 >/dev/null || { -# libtiff-4.2.0 requires additional patches -# (thanks to Giancarlo Dessi) - patch -p1 < $CWD/rawinput.diff - patch -p1 < $CWD/oiio-libopenimageio-exif-cpp.diff -} chown -R root:root . find -L . \ @@ -95,13 +87,10 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DPYLIB_INCLUDE_SONAME:BOOL=TRUE \ -DPYLIB_LIB_PREFIX:BOOL=FALSE \ - -DUSE_OCIO:BOOL=TRUE \ -DUSE_OPENJPEG:BOOL=TRUE \ -DOIIO_BUILD_TESTS:BOOL=FALSE \ -DUSE_PYTHON:BOOL=TRUE \ -DPYTHON_VERSION=$(python3 --version | cut -d' ' -f2) \ - -DUSE_EXTERNAL_PUGIXML:BOOL=FALSE \ - make make install DESTDIR=$PKG diff --git a/graphics/openimageio/openimageio.info b/graphics/openimageio/openimageio.info index 95dd9e8323..8d8d9a4f4a 100644 --- a/graphics/openimageio/openimageio.info +++ b/graphics/openimageio/openimageio.info @@ -1,10 +1,10 @@ PRGNAM="openimageio" -VERSION="2.0.13" +VERSION="2.1.19.0" HOMEPAGE="https://sites.google.com/site/openimageio/home" -DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/Release-2.0.13/oiio-Release-2.0.13.tar.gz" -MD5SUM="76ce4d246409de331ad04453423479bf" +DOWNLOAD="https://github.com/OpenImageIO/oiio/archive/Release-2.1.19.0/oiio-Release-2.1.19.0.tar.gz" +MD5SUM="3654fff35d5c55cecff857101c7b79e8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ffmpeg libwebp opencv opencolorio pybind11 robin-map qt5 dcmtk" +REQUIRES="opencolorio pybind11 robin-map dcmtk tbb fmt hdf5" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/graphics/openimageio/rawinput.diff b/graphics/openimageio/rawinput.diff deleted file mode 100644 index e465621ac2..0000000000 --- a/graphics/openimageio/rawinput.diff +++ /dev/null @@ -1,114 +0,0 @@ ---- oiio-Release-2.0.13/src/raw.imageio/rawinput.cpp 2019-12-03 23:28:14.000000000 +0100 -+++ oiio-Release-2.0.13-fix/src/raw.imageio/rawinput.cpp 2020-12-20 23:29:30.556780764 +0100 -@@ -643,7 +643,7 @@ - #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 17, 0) - if (other.parsed_gps.gpsparsed) { - add("GPS", "Latitude", other.parsed_gps.latitude, false, 0.0f); -- add("GPS", "Longitude", other.parsed_gps.longtitude, false, -+ add("GPS", "Longitude", other.parsed_gps.longitude, false, - 0.0f); // N.B. wrong spelling! - add("GPS", "TimeStamp", other.parsed_gps.gpstimestamp, false, 0.0f); - add("GPS", "Altitude", other.parsed_gps.altitude, false, 0.0f); -@@ -667,12 +667,12 @@ - // float AmbientTemperature; - // float BatteryTemperature; - // float exifAmbientTemperature; -- add("Exif", "Humidity", other.exifHumidity, false, 0.0f); -- add("Exif", "Pressure", other.exifPressure, false, 0.0f); -- add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f); -- add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f); -- add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false, -- 0.0f); -+ //add("Exif", "Humidity", other.exifHumidity, false, 0.0f); -+ //add("Exif", "Pressure", other.exifPressure, false, 0.0f); -+ //add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f); -+ //add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f); -+ //add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false, -+ // 0.0f); - // float real_ISO; - #endif - -@@ -861,9 +861,9 @@ - { - #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0) - auto const& mn(m_processor->imgdata.makernotes.olympus); -- MAKERF(OlympusCropID); -- MAKERF(OlympusFrame); /* upper left XY, lower right XY */ -- MAKERF(OlympusSensorCalibration); -+ //MAKERF(OlympusCropID); -+ //MAKERF(OlympusFrame); /* upper left XY, lower right XY */ -+ //MAKERF(OlympusSensorCalibration); - MAKERF(FocusMode); - MAKERF(AutoFocus); - MAKERF(AFPoint); -@@ -938,12 +938,12 @@ - { - #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0) - auto const& mn(m_processor->imgdata.makernotes.fuji); -- add(m_make, "ExpoMidPointShift", mn.FujiExpoMidPointShift); -- add(m_make, "DynamicRange", mn.FujiDynamicRange); -- add(m_make, "FilmMode", mn.FujiFilmMode); -- add(m_make, "DynamicRangeSetting", mn.FujiDynamicRangeSetting); -- add(m_make, "DevelopmentDynamicRange", mn.FujiDevelopmentDynamicRange); -- add(m_make, "AutoDynamicRange", mn.FujiAutoDynamicRange); -+ add(m_make, "ExpoMidPointShift", mn.ExpoMidPointShift); -+ add(m_make, "DynamicRange", mn.DynamicRange); -+ add(m_make, "FilmMode", mn.FilmMode); -+ add(m_make, "DynamicRangeSetting", mn.DynamicRangeSetting); -+ add(m_make, "DevelopmentDynamicRange", mn.DevelopmentDynamicRange); -+ add(m_make, "AutoDynamicRange", mn.AutoDynamicRange); - MAKERF(FocusMode); - MAKERF(AFMode); - MAKERF(FocusPixel); -@@ -967,7 +967,7 @@ - { - #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0) - auto const& mn(m_processor->imgdata.makernotes.sony); -- MAKERF(SonyCameraType); -+ MAKERF(CameraType); - #endif - #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 19, 0) - // uchar Sony0x9400_version; /* 0 if not found/deciphered, 0xa, 0xb, 0xc following exiftool convention */ -@@ -976,12 +976,12 @@ - // uchar Sony0x9400_SequenceLength1; - // unsigned Sony0x9400_SequenceFileNumber; - // uchar Sony0x9400_SequenceLength2; -- if (mn.raw_crop.cwidth || mn.raw_crop.cheight) { -- add(m_make, "cropleft", mn.raw_crop.cleft, true); -- add(m_make, "croptop", mn.raw_crop.ctop, true); -- add(m_make, "cropwidth", mn.raw_crop.cwidth, true); -- add(m_make, "cropheight", mn.raw_crop.cheight, true); -- } -+ //if (mn.raw_crop.cwidth || mn.raw_crop.cheight) { -+ // add(m_make, "cropleft", mn.raw_crop.cleft, true); -+ // add(m_make, "croptop", mn.raw_crop.ctop, true); -+ // add(m_make, "cropwidth", mn.raw_crop.cwidth, true); -+ // add(m_make, "cropheight", mn.raw_crop.cheight, true); -+ //} - MAKERF(AFMicroAdjValue); - MAKERF(AFMicroAdjOn); - MAKER(AFMicroAdjRegisteredLenses, 0); -@@ -1054,17 +1054,17 @@ - MAKER(Adapter, 0); - MAKER(AttachmentID, 0ULL); - MAKER(Attachment, 0); -- MAKER(CanonFocalUnits, 0); -+ MAKER(FocalUnits, 0); - MAKER(FocalLengthIn35mmFormat, 0.0f); - } - - if (Strutil::iequals(m_make, "Nikon")) { - auto const& mn(m_processor->imgdata.lens.nikon); -- add(m_make, "EffectiveMaxAp", mn.NikonEffectiveMaxAp); -- add(m_make, "LensIDNumber", mn.NikonLensIDNumber); -- add(m_make, "LensFStops", mn.NikonLensFStops); -- add(m_make, "MCUVersion", mn.NikonMCUVersion); -- add(m_make, "LensType", mn.NikonLensType); -+ add(m_make, "EffectiveMaxAp", mn.EffectiveMaxAp); -+ add(m_make, "LensIDNumber", mn.LensIDNumber); -+ add(m_make, "LensFStops", mn.LensFStops); -+ add(m_make, "MCUVersion", mn.MCUVersion); -+ add(m_make, "LensType", mn.LensType); - } - if (Strutil::iequals(m_make, "DNG")) { - auto const& mn(m_processor->imgdata.lens.dng); diff --git a/graphics/openscad/openscad.SlackBuild b/graphics/openscad/openscad.SlackBuild index b49eeb8acc..8554e46a1f 100644 --- a/graphics/openscad/openscad.SlackBuild +++ b/graphics/openscad/openscad.SlackBuild @@ -23,14 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openscad -VERSION=${VERSION:-2015.03.3} -SRCVER=${SRCVER:-$(echo $VERSION | sed 's/\./-/2')} +VERSION=${VERSION:-2021.01} +#SRCVER=${SRCVER:-$(echo $VERSION | sed 's/\./-/2')} 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 @@ -41,8 +41,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" @@ -60,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.src.tar.gz -cd $PRGNAM-$SRCVER +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz +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 \) \ @@ -70,7 +70,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -qmake -recursive openscad.pro \ +qmake-qt5 -recursive openscad.pro \ PREFIX=/usr \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" @@ -86,7 +86,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING README.md RELEASE_NOTES doc/*.pdf doc/TODO.txt \ + COPYING README.md RELEASE_NOTES.md doc/*.pdf doc/TODO.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/openscad/openscad.info b/graphics/openscad/openscad.info index 1cbdbf06e5..753a847121 100644 --- a/graphics/openscad/openscad.info +++ b/graphics/openscad/openscad.info @@ -1,10 +1,10 @@ PRGNAM="openscad" -VERSION="2015.03.3" +VERSION="2021.01" HOMEPAGE="http://www.openscad.org/" -DOWNLOAD="http://files.openscad.org/openscad-2015.03-3.src.tar.gz" -MD5SUM="a498a218a247468eee140ccc44c73afa" +DOWNLOAD="https://files.openscad.org/openscad-2021.01.src.tar.gz" +MD5SUM="79f8e3a42bcfeeb3ddde9e5bc2311f76" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="CGAL OpenCSG" +REQUIRES="CGAL OpenCSG double-conversion" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/graphics/photoprint/photoprint.SlackBuild b/graphics/photoprint/photoprint.SlackBuild index 387d6db429..565187bded 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/photoqt/photoqt.SlackBuild b/graphics/photoqt/photoqt.SlackBuild index 7463b80cff..5c87a6726b 100644 --- a/graphics/photoqt/photoqt.SlackBuild +++ b/graphics/photoqt/photoqt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for photoqt -# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=photoqt -VERSION=${VERSION:-1.7.1} +VERSION=${VERSION:-2.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,6 +60,7 @@ if pkg-config --exists libraw; then RAW=ON; else RAW=OFF; fi if pkg-config --exists IL; then DEVIL=ON; else DEVIL=OFF; fi if pkg-config --exists poppler-qt5; then POPPLER=ON; else POPPLER=OFF; fi if [ -f /usr/include/FreeImage.h ]; then FREEIMAGE=ON; else FREEIMAGE=OFF; fi +FREEIMAGE=OFF # FreeImage support looks broken ATM so it's forced to OFF set -e diff --git a/graphics/photoqt/photoqt.info b/graphics/photoqt/photoqt.info index e133538d8e..e5720703be 100644 --- a/graphics/photoqt/photoqt.info +++ b/graphics/photoqt/photoqt.info @@ -1,10 +1,10 @@ PRGNAM="photoqt" -VERSION="1.7.1" +VERSION="2.1.1" HOMEPAGE="https://photoqt.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/photoqt-1.7.1.tar.gz" -MD5SUM="656fee6f9923499992f069496a0aaa5d" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/photoqt-2.1.1.tar.gz" +MD5SUM="ff9127a68664d5be825638c6c66c1061" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="extra-cmake-modules qt5" +REQUIRES="extra-cmake-modules pugixml qt5" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/graphics/povray/povray.SlackBuild b/graphics/povray/povray.SlackBuild index b6372da8c2..9cd52fcf77 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.8} +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..c65b13c685 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.8" 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.8/povray-3.7.0.8.tar.gz" +MD5SUM="ec56b6a59e383e85369850841f910cff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/qrencode/README b/graphics/qrencode/README deleted file mode 100644 index 5b095d47c3..0000000000 --- a/graphics/qrencode/README +++ /dev/null @@ -1,4 +0,0 @@ -Libqrencode is a C library for encoding data in a QR Code symbol, a -kind of 2D symbology that can be scanned by handy terminals such as a -mobile phone with CCD. The capacity of QR Code is up to 7000 digits -or 4000 characters, and is highly robust. diff --git a/graphics/qrencode/qrencode.SlackBuild b/graphics/qrencode/qrencode.SlackBuild deleted file mode 100644 index 52fd2710fd..0000000000 --- a/graphics/qrencode/qrencode.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# SlackBuild Script for qrencode - -# Copyright 2012 Matthew "mfillpot" Fillpot -# Copyright 2018, 2020 Lenard Spencer, Orlando, Florida, 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=qrencode -VERSION=${VERSION:-4.1.1} -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 -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $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/qrencode/qrencode.info b/graphics/qrencode/qrencode.info deleted file mode 100644 index ecdb156112..0000000000 --- a/graphics/qrencode/qrencode.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qrencode" -VERSION="4.1.1" -HOMEPAGE="https://fukuchi.org/works/qrencode/" -DOWNLOAD="https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2" -MD5SUM="de7185bcab635a34730e1b73d4efa705" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Lenard Spencer" -EMAIL="lenardrspencer@gmail.com" diff --git a/graphics/qrencode/slack-desc b/graphics/qrencode/slack-desc deleted file mode 100644 index e266e06223..0000000000 --- a/graphics/qrencode/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------------------------------------------------------| -qrencode: qrencode (QR code generation library and application) -qrencode: -qrencode: Libqrencode is a C library for encoding data in a QR Code symbol, a -qrencode: kind of 2D symbology that can be scanned by handy terminals such as a -qrencode: mobile phone with CCD. The capacity of QR Code is up to 7000 digits -qrencode: or 4000 characters, and is highly robust. -qrencode: -qrencode: Interaction can be programmed or through the command line. -qrencode: -qrencode: Homepage: http://fukuchi.org/works/qrencode/ -qrencode: 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/rawtherapee/rawtherapee.SlackBuild b/graphics/rawtherapee/rawtherapee.SlackBuild index 2638650503..13101b5bda 100644 --- a/graphics/rawtherapee/rawtherapee.SlackBuild +++ b/graphics/rawtherapee/rawtherapee.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rawtherapee -VERSION=${VERSION:-5.4} +VERSION=${VERSION:-5.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/graphics/rawtherapee/rawtherapee.info b/graphics/rawtherapee/rawtherapee.info index c904bf1dc5..7fccd9253d 100644 --- a/graphics/rawtherapee/rawtherapee.info +++ b/graphics/rawtherapee/rawtherapee.info @@ -1,8 +1,8 @@ PRGNAM="rawtherapee" -VERSION="5.4" +VERSION="5.8" HOMEPAGE="http://rawtherapee.com/" -DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.4.tar.xz" -MD5SUM="07bbb401dee4abaa3e38b4e1f3e498ce" +DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz" +MD5SUM="7c4b2d8246664d84d5061e4c7271d3af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lensfun libiptcdata" diff --git a/graphics/ristretto/ristretto.SlackBuild b/graphics/ristretto/ristretto.SlackBuild index 29782fd1d4..9f39310db6 100644 --- a/graphics/ristretto/ristretto.SlackBuild +++ b/graphics/ristretto/ristretto.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ristretto -VERSION=${VERSION:-0.8.4} +VERSION=${VERSION:-0.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/graphics/ristretto/ristretto.info b/graphics/ristretto/ristretto.info index 1bef9673f0..c0c8ee0ef0 100644 --- a/graphics/ristretto/ristretto.info +++ b/graphics/ristretto/ristretto.info @@ -1,8 +1,8 @@ PRGNAM="ristretto" -VERSION="0.8.4" +VERSION="0.10.0" HOMEPAGE="https://docs.xfce.org/apps/ristretto/start" -DOWNLOAD="https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-0.8.4.tar.bz2" -MD5SUM="0142c8b9c492cf447e563b00c6204359" +DOWNLOAD="https://archive.xfce.org/src/apps/ristretto/0.10/ristretto-0.10.0.tar.bz2" +MD5SUM="4249e14fba78728481d89ce61a8771fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/scantailor-advanced/scantailor-advanced.SlackBuild b/graphics/scantailor-advanced/scantailor-advanced.SlackBuild index 9a07e6a768..a726ce6261 100644 --- a/graphics/scantailor-advanced/scantailor-advanced.SlackBuild +++ b/graphics/scantailor-advanced/scantailor-advanced.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scantailor-advanced -VERSION=${VERSION:-1.0.16} +VERSION=${VERSION:-20200531_3d1e74e} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -75,14 +75,13 @@ sed -i \ -e 's/^set(CMAKE_CXX_STANDARD 17)$/set(CMAKE_CXX_STANDARD 14)/' \ CMakeLists.txt -sed -i 's/>Deksew:</>Deskew:</' \ - translations/scantailor_*.ts ui/SettingsDialog.ui +sed -i '/^#include <memory>$/a #include <vector>' src/core/filters/page_layout/Settings.h mkdir -p build cd build cmake -G "Unix Makefiles" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated-declarations" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/graphics/scantailor-advanced/scantailor-advanced.info b/graphics/scantailor-advanced/scantailor-advanced.info index 6883eb99ea..89ebaa2207 100644 --- a/graphics/scantailor-advanced/scantailor-advanced.info +++ b/graphics/scantailor-advanced/scantailor-advanced.info @@ -1,8 +1,8 @@ PRGNAM="scantailor-advanced" -VERSION="1.0.16" +VERSION="20200531_3d1e74e" HOMEPAGE="https://github.com/4lex4/scantailor-advanced" -DOWNLOAD="https://github.com/4lex4/scantailor-advanced/archive/v1.0.16/scantailor-advanced-1.0.16.tar.gz" -MD5SUM="1011e3ed6fe0e65fcedc25389a29bd23" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/scantailor-advanced-20200531_3d1e74e.tar.xz" +MD5SUM="61dfa53ca5f607aa03f4809a796cef08" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/graphics/scantailor/README b/graphics/scantailor/README deleted file mode 100644 index a54118cbd1..0000000000 --- a/graphics/scantailor/README +++ /dev/null @@ -1,6 +0,0 @@ -Scan Tailor is an interactive post-processing tool for scanned -pages. It performs operations such as page splitting, deskewing, -adding/removing borders, and others. You give it raw scans, and you -get pages ready to be printed or assembled into a PDF or DJVU file. -Scanning, optical character recognition, and assembling multi-page -documents are out of scope of this project. diff --git a/graphics/scantailor/doinst.sh b/graphics/scantailor/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/graphics/scantailor/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/graphics/scantailor/scantailor.SlackBuild b/graphics/scantailor/scantailor.SlackBuild deleted file mode 100644 index 11e7a7e3a3..0000000000 --- a/graphics/scantailor/scantailor.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# Slackware build script for scantailor - -# Written by Zhischenko Sergey <gishenko@mail.ru> - -PRGNAM=scantailor -SRCNAM=EXPERIMENTAL -VERSION=${VERSION:-2016_01_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} - -set -e - -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 - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-${SRCNAM}_${VERSION} -tar xvf $CWD/${SRCNAM}_${VERSION}.tar.gz || tar xvf $CWD/$PRGNAM-${SRCNAM}_${VERSION}.tar.gz -cd $PRGNAM-${SRCNAM}_${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 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release .. - - make - make install DESTDIR=$PKG -cd .. - -find $PKG | xargs 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/share/icons/hicolor/scalable/apps/ -cp resources/appicon.svg $PKG/usr/share/icons/hicolor/scalable/apps/scantailor.svg -mkdir -p $PKG/usr/share/applications -cp $CWD/scantailor.desktop $PKG/usr/share/applications/scantailor.desktop - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING GPL3.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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/graphics/scantailor/scantailor.desktop b/graphics/scantailor/scantailor.desktop deleted file mode 100644 index 03ef07fd16..0000000000 --- a/graphics/scantailor/scantailor.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Scan Tailor -Comment=An interactive post-processing tool for scanned pages. -Icon=scantailor -Exec=scantailor %u -TryExec=scantailor -Terminal=false -Type=Application -StartupNotify=true -Categories=Graphics; - diff --git a/graphics/scantailor/scantailor.info b/graphics/scantailor/scantailor.info deleted file mode 100644 index 15146007f0..0000000000 --- a/graphics/scantailor/scantailor.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="scantailor" -VERSION="2016_01_13" -HOMEPAGE="http://scantailor.sourceforge.net/" -DOWNLOAD="https://github.com/Tulon/scantailor/archive/EXPERIMENTAL_2016_01_13.tar.gz" -MD5SUM="90617c2bc82f288bfed472b9b03a1eef" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="qt5-legacy" -MAINTAINER="Zhischenko Sergey" -EMAIL="gishenko@mail.ru" diff --git a/graphics/scantailor/slack-desc b/graphics/scantailor/slack-desc deleted file mode 100644 index ad70749353..0000000000 --- a/graphics/scantailor/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------------------------------------------------------| -scantailor: scantailor (interactive post-processing tool for scanned pages) -scantailor: -scantailor: Scan Tailor is an interactive post-processing tool for scanned -scantailor: pages. It performs operations such as page splitting, deskewing, -scantailor: adding/removing borders, and others. You give it raw scans, and you -scantailor: get pages ready to be printed or assembled into a PDF or DJVU file. -scantailor: Scanning, optical character recognition, and assembling multi-page -scantailor: documents are out of scope of this project. -scantailor: -scantailor: -scantailor: diff --git a/graphics/screengrab/screengrab.SlackBuild b/graphics/screengrab/screengrab.SlackBuild index 33aedaac88..cf6c465bd4 100644 --- a/graphics/screengrab/screengrab.SlackBuild +++ b/graphics/screengrab/screengrab.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for screengrab -# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=screengrab -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-2.1.0} BUILD=${BUILD:-2} 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 @@ -39,9 +39,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -IS64BITS=0 -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" @@ -49,7 +48,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - IS64BITS=1 else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -61,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,11 +71,8 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DIS64BITS=$IS64BITS \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -86,7 +81,7 @@ 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 -# move the docs in slackware standard location +# move the docs in Slackware standard location mkdir $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION rmdir $PKG/usr/share/doc diff --git a/graphics/screengrab/screengrab.info b/graphics/screengrab/screengrab.info index e65afe4eac..03f727edae 100644 --- a/graphics/screengrab/screengrab.info +++ b/graphics/screengrab/screengrab.info @@ -1,10 +1,10 @@ PRGNAM="screengrab" -VERSION="1.2.1" -HOMEPAGE="http://screengrab.doomer.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/screengrab-1.2.1.tar.gz" -MD5SUM="b233b108558c509419bd754ba1c2c318" +VERSION="2.1.0" +HOMEPAGE="https://github.com/lxqt/screengrab" +DOWNLOAD="https://github.com/lxqt/screengrab/releases/download/2.1.0/screengrab-2.1.0.tar.xz" +MD5SUM="fdde74326b8155f1e926f329c00ff86e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libqtxdg" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/graphics/simple-scan/libwebpmux.patch b/graphics/simple-scan/libwebpmux.patch new file mode 100644 index 0000000000..51d17eb7dd --- /dev/null +++ b/graphics/simple-scan/libwebpmux.patch @@ -0,0 +1,38 @@ +From 47d3532459863e3b0bc1c7fd3a200f612863c814 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 14 Sep 2019 20:03:47 +0200 +Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable + 'data' + +--- + src/libwebpmux.vapi | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi +index f2461a2..42d2886 100644 +--- a/src/libwebpmux.vapi ++++ b/src/libwebpmux.vapi +@@ -61,9 +61,7 @@ namespace WebP + [CCode (cname = "vala_set_image")] + public MuxError set_image (uint8[] bitstream, bool copy_data) + { +- Data data; +- data.bytes = bitstream; +- data.size = bitstream.length; ++ Data data = { bitstream, bitstream.length }; + return _set_image (data, copy_data); + } + +@@ -89,9 +87,7 @@ namespace WebP + public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data) + requires (fourcc.length == 4) + { +- Data data; +- data.bytes = chunk_data; +- data.size = chunk_data.length; ++ Data data = { chunk_data ,chunk_data.length }; + return _set_chunk ((uchar[]) fourcc, data, copy_data); + } + +-- +2.22.0 diff --git a/graphics/simple-scan/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild index 4014836c87..d8ac34317d 100644 --- a/graphics/simple-scan/simple-scan.SlackBuild +++ b/graphics/simple-scan/simple-scan.SlackBuild @@ -26,8 +26,8 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM="simple-scan" -VERSION=${VERSION:-3.25.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.34.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,6 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/libwebpmux.patch + meson --prefix $PKG/usr build # Fix for meson-0.44.0, thanks to Andrew Clemons diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info index 5c6d85d344..826b74bacf 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.34.0" +HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" +DOWNLOAD="https://gitlab.gnome.org/GNOME/simple-scan/-/archive/3.34.0/simple-scan-3.34.0.tar.bz2" +MD5SUM="69464d41aa25c5de2385f332dd22f508" 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..9df18325a6 100644 --- a/graphics/simple-scan/slack-desc +++ b/graphics/simple-scan/slack-desc @@ -12,7 +12,7 @@ simple-scan: simple-scan is a simple scanning utility without the overwhelming simple-scan: options of xsane. simple-scan: simple-scan: -simple-scan: Homepage: https://launchpad.net/simple-scan +simple-scan: Homepage: https://gitlab.gnome.org/GNOME/simple-scan simple-scan: simple-scan: simple-scan: diff --git a/graphics/ufraw/patches/0001-Change-use-of-header-files.patch b/graphics/ufraw/patches/0001-Change-use-of-header-files.patch new file mode 100644 index 0000000000..64cf176726 --- /dev/null +++ b/graphics/ufraw/patches/0001-Change-use-of-header-files.patch @@ -0,0 +1,30 @@ +From a9fc8b39010640fd8e931e8d635160430ade57bc Mon Sep 17 00:00:00 2001 +From: Neil Mayhew <neil_mayhew@users.sourceforge.net> +Date: Fri, 5 Jul 2019 13:08:18 -0600 +Subject: [PATCH 1/2] Change use of header files to follow best practices +Content-Type: text/plain; charset=utf-8 + +This also fixes build errors after recent changes to dependencies +--- + ufraw_exiv2.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc +index f03011b..9a6ec86 100644 +--- a/ufraw_exiv2.cc ++++ b/ufraw_exiv2.cc +@@ -15,9 +15,8 @@ + #include "ufraw.h" + + #ifdef HAVE_EXIV2 +-#include <exiv2/image.hpp> +-#include <exiv2/easyaccess.hpp> +-#include <exiv2/exif.hpp> ++#include <exiv2/exiv2.hpp> ++#include <iostream> + #include <sstream> + #include <cassert> + +-- +2.22.0 + diff --git a/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch b/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch new file mode 100644 index 0000000000..1859ca702a --- /dev/null +++ b/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch @@ -0,0 +1,26 @@ +From b85e03dd607fb697f69eb9afb044924f046f9eb3 Mon Sep 17 00:00:00 2001 +From: Neil Mayhew <neil_mayhew@users.sourceforge.net> +Date: Fri, 5 Jul 2019 13:08:35 -0600 +Subject: [PATCH 2/2] Use symbolic error code +Content-Type: text/plain; charset=utf-8 + +--- + ufraw_exiv2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc +index 9a6ec86..5958b3d 100644 +--- a/ufraw_exiv2.cc ++++ b/ufraw_exiv2.cc +@@ -66,7 +66,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; +- throw Exiv2::Error(1, error); ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); + } + + /* List of tag names taken from exiv2's printSummary() in actions.cpp */ +-- +2.22.0 + diff --git a/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch b/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch new file mode 100644 index 0000000000..8b26ee3a3d --- /dev/null +++ b/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch @@ -0,0 +1,32 @@ +--- a/dcraw_api.cc 2015-06-16 04:58:38.000000000 +0100 ++++ b/dcraw_api.cc 2019-06-30 16:37:05.503409567 +0100 +@@ -689,3 +689,3 @@ + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ firstprivate(black,pixels) shared(h,dark,rgbWB) + #endif +@@ -702,3 +702,3 @@ + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ firstprivate(black,pixels) shared(h,dark,rgbWB) + #endif +--- a/dcraw_indi.c 2015-06-16 04:58:38.000000000 +0100 ++++ b/dcraw_indi.c 2019-06-30 17:03:59.692710441 +0100 +@@ -140,2 +140,3 @@ + default(none) \ ++ firstprivate(iheight,iwidth,noise,threshold) \ + shared(nc,image,size,noise) \ +@@ -145,2 +146,3 @@ + default(none) \ ++ firstprivate(iheight,iwidth,noise,threshold) \ + shared(nc,image,size) \ +@@ -416,2 +418,3 @@ + default(none) \ ++ firstprivate(colors,filters,height,width) \ + shared(image,code,prow,pcol,h) \ +@@ -502,3 +502,4 @@ + default(none) \ +- shared(image,dir,diff) \ ++ firstprivate(filters,height,width) \ ++ shared(image,dir,diff) \ + private(row,col,i,d,c,pix,guess) diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild index 35408d8af8..8e8735b2c8 100644 --- a/graphics/ufraw/ufraw.SlackBuild +++ b/graphics/ufraw/ufraw.SlackBuild @@ -83,6 +83,10 @@ patch -p1 < $CWD/patches/05_fix_build_due_to_unsigned_char.patch patch -p1 < $CWD/patches/gcc7.patch patch -p1 < $CWD/patches/CVE-2015-8366.patch patch -p1 < $CWD/patches/no-gimp-remote.patch +# More patches suggested by Lockywolf on LQ +patch -p1 < $CWD/patches/0001-Change-use-of-header-files.patch +patch -p1 < $CWD/patches/0002-Use-symbolic-error-code.patch +patch -p1 < $CWD/patches/0003-ufraw-0.22-fix_omp_definitions.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README deleted file mode 100644 index 0796ec1f1a..0000000000 --- a/graphics/vulkan-sdk/README +++ /dev/null @@ -1,11 +0,0 @@ -Vulkan supports multiple GPUs and multiple global contexts (VkInstance). -The ICD loader is necessary to support multiple GPUs and the VkInstance -level Vulkan commands. Additionally, the loader manages inserting Vulkan -layer libraries, including validation layers between the application and -the ICD. - -qt5 is an optional dependency for vkconfig. - -This will not provide a vulkan driver which must be acquired elsewhere. - -This SlackBuild will compile vulkan-sdk from source. diff --git a/graphics/vulkan-sdk/slack-desc b/graphics/vulkan-sdk/slack-desc deleted file mode 100644 index 1d3eec170b..0000000000 --- a/graphics/vulkan-sdk/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------------------------------------------------------| -vulkan-sdk: vulkan-sdk (Vulkan ICD Loader and Validation Layers) -vulkan-sdk: -vulkan-sdk: Vulkan supports multiple GPUs and multiple global contexts -vulkan-sdk: (VkInstance). The ICD loader is necessary to support multiple GPUs -vulkan-sdk: and the VkInstance level Vulkan commands. Additionally, the loader -vulkan-sdk: manages inserting Vulkan layer libraries, including validation layers -vulkan-sdk: between the application and the ICD. -vulkan-sdk: -vulkan-sdk: Homepage: https://www.khronos.org/vulkan/ -vulkan-sdk: -vulkan-sdk: diff --git a/graphics/vulkan-sdk/vulkan-loader-cmake.patch b/graphics/vulkan-sdk/vulkan-loader-cmake.patch deleted file mode 100644 index dcb63fd6cc..0000000000 --- a/graphics/vulkan-sdk/vulkan-loader-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d15214545..fe277fcd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -138,7 +138,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") - # all compilers until they all accept the C++17 standard - if(CMAKE_COMPILER_IS_GNUCC) - set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wno-stringop-truncation -Wno-stringop-overflow") -- if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 7.1) -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.1 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.1) - set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wimplicit-fallthrough=0") - endif() - endif() diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild deleted file mode 100644 index 86909bc79f..0000000000 --- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild +++ /dev/null @@ -1,217 +0,0 @@ -#!/bin/sh - -# Slackware build script for vulkan-sdk - -# Copyright 2016, 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019-2020 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=vulkan-sdk -VERSION=${VERSION:-1.2.162.0} -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 -SRC=$TMP/$PRGNAM-$VERSION -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 - -# VulkanTools from LunarG doesn't support an external jsoncpp -JSONCPP_VERSION=${JSONCPP_VERSION:-1.8.0} - -chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; } - -cmake_build () { - mkdir -p build - cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_TYPE=Release \ - "${@:-}" .. - make - make install DESTDIR=$PKG -} - -copydocs () { - dir="$1" - mkdir -p -- "$PKG/usr/doc/$PRGNAM-$VERSION/$dir" - shift - for i do - cp -a -- "$dir-sdk-$VERSION/$i" "$PKG/usr/doc/$PRGNAM-$VERSION/$dir/" - done -} - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz -tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz -tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz -tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz - -( - cd VulkanTools-sdk-$VERSION/submodules - tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz - rm -rf jsoncpp - mv jsoncpp-$JSONCPP_VERSION jsoncpp -) - -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 {} \+ - -##################### -### vulkan-loader ### -##################### - -chdir Vulkan-Loader-sdk-$VERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -# cmake 3.5.2 does not have GREATER_EQUAL -patch -p1 < $CWD/vulkan-loader-cmake.patch - -cmake_build \ - -DBUILD_TESTS=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr - -############################### -### vulkan-validationlayers ### -############################### - -chdir Vulkan-ValidationLayers-sdk-$VERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -cmake_build \ - -DCMAKE_INSTALL_DATADIR=share \ - -DBUILD_LAYER_SUPPORT_FILES=ON \ - -DBUILD_TESTS=OFF \ - -DBUILD_WERROR=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DSPIRV_HEADERS_INSTALL_DIR=/usr \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr - -################### -### vulkantools ### -################### - -chdir VulkanTools-sdk-$VERSION - -# Generate missing jsoncpp sources -( - cd submodules/jsoncpp - python3 ./amalgamate.py -) - -# Require an older cmake version. -find . -type f -name CMakeLists.txt | xargs grep -l '3\.10\.2' | - xargs sed -i 's/3.10.2/3.5.2/' - -cmake_build \ - -DBUILD_GMOCK=OFF \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DINSTALL_GTEST=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=/usr \ - -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ - -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr - -###################### -### gfxreconstruct ### -###################### - -chdir gfxreconstruct-sdk-$VERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -# cmake 3.5.2 does not have FILTER for the list command -sed -i '/generate_target_source_files(/d' cmake/CodeStyle.cmake - -cmake_build \ - -DBUILD_WERROR=OFF \ - -DVULKAN_HEADER=/usr/include/vulkan - -cd -- "$SRC" - -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 - -copydocs Vulkan-Loader CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md \ - LICENSE.txt README.md -copydocs Vulkan-ValidationLayers CODE_OF_CONDUCT.md CONTRIBUTING.md \ - GOVERNANCE.md LAYER_CONFIGURATION.md LICENSE.txt README.md -copydocs VulkanTools CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md -copydocs gfxreconstruct CONTRIBUTING.md LICENSE.txt LICENSE_ThirdParty.txt \ - README.md USAGE_android.md USAGE_desktop.md - -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/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info deleted file mode 100644 index 879c8f7d73..0000000000 --- a/graphics/vulkan-sdk/vulkan-sdk.info +++ /dev/null @@ -1,18 +0,0 @@ -PRGNAM="vulkan-sdk" -VERSION="1.2.162.0" -HOMEPAGE="https://www.khronos.org/vulkan/" -DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.162.0/Vulkan-Loader-sdk-1.2.162.0.tar.gz \ - https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.162.0/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz \ - https://github.com/LunarG/VulkanTools/archive/sdk-1.2.162.0/VulkanTools-sdk-1.2.162.0.tar.gz \ - https://github.com/LunarG/gfxreconstruct/archive/sdk-1.2.162.0/gfxreconstruct-sdk-1.2.162.0.tar.gz \ - https://github.com/open-source-parsers/jsoncpp/archive/1.8.0/jsoncpp-1.8.0.tar.gz" -MD5SUM="97de90f2b599979ea492a3ed92c025fb \ - 5c0c6daedacd2d535bb0cd41dcbd2995 \ - aa116fff3ef50d7c299bc168953eacec \ - 7d48f5d115f8baad2ed800769545f21a \ - 6d6cbd82b5fe4a9cbae4ffef01f9e9fc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="Vulkan-Headers glslang" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/graphics/wayland-protocols/README b/graphics/wayland-protocols/README deleted file mode 100644 index 6bd446926c..0000000000 --- a/graphics/wayland-protocols/README +++ /dev/null @@ -1,9 +0,0 @@ -wayland-protocols contains Wayland protocols that add functionality -not available in the Wayland core protocol. Such protocols either add -completely new functionality, or extend the functionality of some -other protocol either in Wayland core, or some other protocol in -wayland-protocols. - -A protocol in wayland-protocols consists of a directory containing a -set of XML files containing the protocol specification, and a README -file containing detailed state and a list of maintainers. diff --git a/graphics/wayland-protocols/slack-desc b/graphics/wayland-protocols/slack-desc deleted file mode 100644 index 94d8845e55..0000000000 --- a/graphics/wayland-protocols/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------------------------------------------------------| -wayland-protocols: wayland-protocols (Wayland protocols) -wayland-protocols: -wayland-protocols: wayland-protocols contains Wayland protocols that add functionality -wayland-protocols: not available in the Wayland core protocol. Such protocols either add -wayland-protocols: completely new functionality, or extend the functionality of some -wayland-protocols: other protocol either in Wayland core, or some other protocol in -wayland-protocols: wayland-protocols. -wayland-protocols: -wayland-protocols: A protocol in wayland-protocols consists of a directory containing a -wayland-protocols: set of XML files containing the protocol specification, and a README -wayland-protocols: file containing detailed state and a list of maintainers. diff --git a/graphics/wayland-protocols/wayland-protocols.SlackBuild b/graphics/wayland-protocols/wayland-protocols.SlackBuild deleted file mode 100644 index e335be7b3a..0000000000 --- a/graphics/wayland-protocols/wayland-protocols.SlackBuild +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -# Slackware build script for wayland-protocols - -# Copyright 2017 Duncan Roe, Melbourne, Australia -# 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=wayland-protocols -VERSION=${VERSION:-1.18} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -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 {} \; - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README $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/wayland-protocols/wayland-protocols.info b/graphics/wayland-protocols/wayland-protocols.info deleted file mode 100644 index c8846e3309..0000000000 --- a/graphics/wayland-protocols/wayland-protocols.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wayland-protocols" -VERSION="1.18" -HOMEPAGE="https://wayland.freedesktop.org/" -DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz" -MD5SUM="af38f22d8e233c2f2e00ddc8dcc94694" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="wayland" -MAINTAINER="Duncan Roe" -EMAIL="duncan_roe@optusnet.com.au" 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" |