2021 update

Fix build issues
Make python2 dependency optional
Use imagemagic 7 exclusively
Version number follows the releases

2 files changed, 97 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 146ec791029a..d1aab2de7839 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
 pkgbase = k3d-git
-	pkgdesc = A free 3D modelling and animation software
-	pkgver = r3544.17ef1bf0
-	pkgrel = 2
+	pkgdesc = 3D modelling and animation software
+	pkgver = 0.8.0.6+17
+	pkgrel = 1
 	url = http://www.k-3d.org
-	arch = x86_64
+	arch = i486
 	arch = i686
+	arch = pentium4
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = GPL
-	makedepends = asciidoc
 	makedepends = boost
 	makedepends = cmake
-	makedepends = doxygen
-	makedepends = git
-	makedepends = graphviz
-	makedepends = libxslt
 	makedepends = icoutils
 	makedepends = gendesk
+	makedepends = git
+	makedepends = asciidoc
+	makedepends = doxygen
+	makedepends = libxslt
 	depends = ftgl
 	depends = cairomm
 	depends = dbus-glib
@@ -30,22 +34,24 @@ pkgbase = k3d-git
 	depends = glew
 	depends = zlib
 	depends = libpng
-	depends = python2
 	depends = libsigc++
 	depends = expat
 	depends = boost-libs
 	depends = graphviz
 	depends = opencollada
 	optdepends = aqsis: Rendering engine
+	optdepends = boost-python2: python support
 	provides = k3d
 	conflicts = k3d
 	source = git+https://github.com/K-3D/k3d.git
 	source = k3d.appdata.xml
 	source = workaround.xml
-	source = https://src.fedoraproject.org/rpms/k3d/raw/master/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
+	source = https://src.fedoraproject.org/rpms/k3d/raw/f30/f/0102-Avoid-signed-unsigned-int-warning.patch
+	source = https://src.fedoraproject.org/rpms/k3d/raw/f30/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
 	md5sums = SKIP
-	md5sums = 2018b7e8e1258aa0aa86494032b0a74a
-	md5sums = e93406cc28c4ed55c9640c09d447c53d
+	md5sums = af54b31d0aa00338d1a4b85d8343f327
+	md5sums = 8559903ac6fed3a1a757f8327eab7105
+	md5sums = 341319b07392b21b56bc10a078627e7f
 	md5sums = b08d2fc3e331f732623f6188be800949
 
 pkgname = k3d-git
diff --git a/PKGBUILD b/PKGBUILD
index 6999cb4b7734..8897dce09846 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,112 @@
-# Maintainer: Thomas Ascher <thomas.ascher@gmx.at>
-# Contributor: Severin Glöckner <severin.gloeckner@stud.htwk-leipzig.de>
+# Maintainer: Severin Glöckner <severin.gloeckner@stud.htwk-leipzig.de>
 # Contributor: Thomas Ascher <thomas.ascher@gmx.at>
-_pkgname=k3d
-pkgname=${_pkgname}-git
-pkgver=r3544.17ef1bf0
-pkgrel=2
-pkgdesc="A free 3D modelling and animation software"
-arch=('x86_64' 'i686')
+
+# To build with python support, set this vairable in your /etc/makepkg.conf
+# (Or here, or before calling makepkg)
+# It is only disabled because it is at EOL and requires additional AUR-packages.
+if [[ "$_k3d_python" != "ON" ]]; then
+  _k3d_python=OFF
+fi
+
+pkgname=k3d-git
+pkgver=0.8.0.6+17
+pkgrel=1
+pkgdesc="3D modelling and animation software"
+arch=('i486' 'i686' 'pentium4' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="http://www.k-3d.org"
 license=('GPL')
 depends=('ftgl' 'cairomm' 'dbus-glib' 'freetype2' 'glibmm' 'gtkglext' 'gtkmm'
          'gtksourceview2' 'gts' 'imagemagick' 'openexr' 'libglvnd' 'glew' 'zlib'
-         'libpng' 'python2' 'libsigc++' 'expat' 'boost-libs' 'graphviz'
-         'opencollada')
+         'libpng' 'libsigc++' 'expat' 'boost-libs' 'graphviz' 'opencollada')
 optdepends=('aqsis: Rendering engine')
-makedepends=('asciidoc'
-             'boost'
-             'cmake'
-             'doxygen'
-	     'git'
-             'graphviz'
-             'libxslt'
-             'icoutils'
-             'gendesk')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-source=("git+https://github.com/K-3D/${_pkgname}.git"
+makedepends=('boost' 'cmake' 'icoutils' 'gendesk' 'git'
+             'asciidoc' 'doxygen' 'libxslt' )
+provides=('k3d')
+conflicts=('k3d')
+
+if [[ $_k3d_python = ON ]]; then
+  depends+=('boost-python2-libs' 'python2')
+  makedepends+=('boost-python2')
+else
+  msg2 "Building without Python support"
+fi
+
+source=("git+https://github.com/K-3D/k3d.git"
         "k3d.appdata.xml"
         "workaround.xml"
         # patches from fedora
-        "https://src.fedoraproject.org/rpms/k3d/raw/master/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch")
+        "https://src.fedoraproject.org/rpms/k3d/raw/f30/f/0102-Avoid-signed-unsigned-int-warning.patch"
+        "https://src.fedoraproject.org/rpms/k3d/raw/f30/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch")
+  ->(B Building without Python support(B
 md5sums=('SKIP'
          '2018b7e8e1258aa0aa86494032b0a74a'
          'e93406cc28c4ed55c9640c09d447c53d'
+         '341319b07392b21b56bc10a078627e7f'
          'b08d2fc3e331f732623f6188be800949')
 
 pkgver() {
-  cd "${_pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd k3d
+
+  git describe --tags | sed -e s/k3d-// -e s/-/+/ -e s/-.*//
 }
 
+
 prepare() {
-  cd "${_pkgname}"
-  patch -p1 -i "${srcdir}"/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
+  cd k3d
+
+  # optional
+  patch -p1 < "$srcdir"/0102-Avoid-signed-unsigned-int-warning.patch
+
+  # required for Python 2 on Arch
+  patch -p1 < "$srcdir"/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
   sed -i -e "s/K3D_BOOST_COMPONENTS python)/K3D_BOOST_COMPONENTS python27)/" CMakeLists.txt
+
+  # https://github.com/K-3D/k3d/issues/42
+  sed -i -e "/^namespace k3d/i\ #include <algorithm>" k3dsdk/property_collection.cpp
+
+  # https://github.com/K-3D/k3d/issues/43
+  rm -r k3dsdk/gil/boost/gil/extension/numeric
 }
 
 build() {
-  mkdir -p "${_pkgname}-build"
-  cd "${_pkgname}-build"
-  cmake "${srcdir}/${_pkgname}" \
+  mkdir -p k3d-build
+  cd k3d-build
+
+  # Debian sets the -frounding-math option
+  export CFLAGS="$CFLAGS -frounding-math"
+  export CXXFLAGS="$CXXFLAGS -frounding-math -DBOOST_BIND_GLOBAL_PLACEHOLDERS"
+
+  # The cmake script finds a mix of imagmagick 6 and 7, specify 7 directly.
+  # The python paths are given to sort out python 3.
+  cmake ../k3d \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python27.so \
       -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+      -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+      -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+      -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python27.so \
+      -DK3D_ENABLE_PYTHON=$_k3d_python \
+      -DK3D_BUILD_NGUI_PYTHON_SHELL_MODULE=$_k3d_python \
+      -DK3D_BUILD_PYTHON_MODULE=$_k3d_python \
+      -DK3D_BUILD_PYUI_MODULE=$_k3d_python \
+      -DImageMagick_Magick++_ARCH_INCLUDE_DIR=/usr/include/ImageMagick-7 \
       -Wno-dev
+
   make
 }
 
 package() {
   # For some reason the file generation fails for this one:
-  cp "${srcdir}"/workaround.xml "${_pkgname}-build"/lib/k3d/plugins/k3d-imagemagick-io.module.proxy
+  cp workaround.xml k3d-build/lib/k3d/plugins/k3d-imagemagick-io.module.proxy
 
-  cd "${_pkgname}-build"
-  make DESTDIR="${pkgdir}/" install
+  cd k3d-build
+  make install DESTDIR="$pkgdir"
 
   # metadata
-  install -Dm644 "${srcdir}"/k3d.appdata.xml "${pkgdir}"/usr/share/metainfo/k3d.appdata.xml
+  install -Dm644 "$srcdir"/k3d.appdata.xml "$pkgdir"/usr/share/metainfo/k3d.appdata.xml
 
   # create launcher
-  cd "${pkgdir}"/usr/share/applications
+  cd "$pkgdir"/usr/share/applications
   gendesk -f -n \
       --pkgname="k3d" \
       --name="K-3D" \
@@ -84,30 +121,18 @@ package() {
   do
     case $size in
       *)
-        mkdir -p "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps
+        mkdir -p "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps
         ;;&
     384)
         convert -crop 384x384+10+10 \
-           "${srcdir}"/k3d/share/k3d/icons/k3d_large.png \
-           "${pkgdir}"/usr/share/icons/hicolor/384x384/apps/k3d.png
+           "$srcdir"/k3d/share/k3d/icons/k3d_large.png \
+           "$pkgdir"/usr/share/icons/hicolor/384x384/apps/k3d.png
         ;;
       *)
         convert -crop 377x377+13+14 -resize ${size}x${size} \
-           "${srcdir}"/k3d/share/k3d/icons/k3d_large.png \
-           "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/k3d.png
+           "$srcdir"/k3d/share/k3d/icons/k3d_large.png \
+           "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/k3d.png
         ;;
     esac
   done
 }
-
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}