[arch-commits] Commit in povray/repos (3 files)

[Evangelos Foutras]

    Date: Tuesday, May 18, 2021 @ 08:08:41
  Author: foutrelis
Revision: 936208

archrelease: copy trunk to community-staging-x86_64

Added:
  povray/repos/community-staging-x86_64/
  povray/repos/community-staging-x86_64/PKGBUILD
    (from rev 936207, povray/trunk/PKGBUILD)
  povray/repos/community-staging-x86_64/povray-openexr3.patch
    (from rev 936207, povray/trunk/povray-openexr3.patch)

-----------------------+
 PKGBUILD              |   63 ++++++++++++++++++++++++++++++++++++++++++++++
 povray-openexr3.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

Copied: povray/repos/community-staging-x86_64/PKGBUILD (from rev 936207, povray/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2021-05-18 08:08:41 UTC (rev 936208)
@@ -0,0 +1,63 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: red_over_blue
+# Contributor: neri
+
+pkgname=povray
+pkgver=3.7.0.8
+_v=${pkgver%.*.*} # 3.7
+pkgrel=11
+epoch=2
+pkgdesc='Script based raytracer for creating 3D graphics'
+arch=('x86_64')
+license=('AGPL3')
+url='http://povray.org/' # bad https cert
+depends=('boost-libs' 'libpng' 'libtiff' 'openexr')
+makedepends=('boost' 'git' 'glu')
+backup=("etc/povray/$_v/povray.conf"
+        "etc/povray/$_v/povray.ini")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/POV-Ray/povray/archive/v$pkgver.tar.gz"
+         povray-openexr3.patch)
+sha512sums=('4de3090cb4c1f7d8004bf5548297f4b95496b3265e5b8b5c861f331bda20de06c9d1ce67858a233740f8091e61315abdd3e519c8db5557b6b37c7a864b85d1c6'
+            '1af541eea5e6371c5c9fb64b622be44b1f3eeb12c0a28280116da10eff50d1010bd3ea738f2d81c394e7aed7bc37fedb106bd70b435965c761ae50c2454eee6e')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 < "$srcdir"/povray-openexr3.patch # Fix build with OpenEXR 3
+
+  cd unix
+  sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
+  sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
+  ./prebuild.sh
+
+  cd ..
+  ./bootstrap
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    LIBS="-lboost_system -lboost_thread" \
+    COMPILED_BY='Arch Linux' \
+    --sysconfdir=/etc \
+    --prefix=/usr
+
+  make CXXFLAGS+="-std=c++11 -lboost_system -lboost_thread -w"
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  install -d "$pkgdir"/usr/share/{doc/,}"$pkgname-$_v"
+  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$_v"
+  cp -r doc "$pkgdir/usr/share/doc/$pkgname-$_v"
+  install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
+  install -Dm644 povray.conf "$pkgdir/etc/povray/$_v/povray.conf"
+  install -Dm644 povray.ini "$pkgdir/etc/povray/$_v/povray.ini"
+  install -Dm644 povray.1 "$pkgdir/usr/share/man/man1/povray.1"
+}
+
+# getver: povray.org/documentation
+# vim:set ts=2 sw=2 et:

Copied: povray/repos/community-staging-x86_64/povray-openexr3.patch (from rev 936207, povray/trunk/povray-openexr3.patch)
===================================================================
--- community-staging-x86_64/povray-openexr3.patch	                        (rev 0)
+++ community-staging-x86_64/povray-openexr3.patch	2021-05-18 08:08:41 UTC (rev 936208)
@@ -0,0 +1,65 @@
+diff --git a/source/backend/povray.cpp b/source/backend/povray.cpp
+index 7692eff8..7b8bb463 100644
+--- a/source/backend/povray.cpp
++++ b/source/backend/povray.cpp
+@@ -68,7 +68,6 @@
+ 		extern "C" const char* TIFFGetVersion(void);
+ 	#endif
+     #ifndef OPENEXR_MISSING
+-        #include <IlmBaseConfig.h>
+         #include <OpenEXRConfig.h>
+         // NOTE:
+         //  Versions of OpenEXR and IlmImf prior to 1.7.1 do not seem to have a way to get the version number,
+diff --git a/source/base/image/openexr.cpp b/source/base/image/openexr.cpp
+index 5050a897..40002b8f 100644
+--- a/source/base/image/openexr.cpp
++++ b/source/base/image/openexr.cpp
+@@ -105,7 +105,7 @@ class POV_EXR_OStream : public Imf::OStream
+ 				throw POV_EXCEPTION(kFileDataErr, "Error while writing EXR output");
+ 		}
+ 
+-		Int64 tellp()
++		uint64_t tellp()
+ 		{
+ 			unsigned long pos = os.tellg();
+ 			if((int) pos == -1)
+@@ -113,7 +113,7 @@ class POV_EXR_OStream : public Imf::OStream
+ 			return(pos);
+ 		}
+ 
+-		void seekp(Int64 pos)
++		void seekp(uint64_t pos)
+ 		{
+ 			if(!os.seekg((unsigned long)pos))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error when writing EXR output");
+@@ -147,7 +147,7 @@ class POV_EXR_IStream : public Imf::IStream
+ 			return (is.tellg() < fsize);
+ 		}
+ 
+-		Int64 tellg()
++		uint64_t tellg()
+ 		{
+ 			unsigned long pos = is.tellg();
+ 			if((int)pos == -1)
+@@ -155,7 +155,7 @@ class POV_EXR_IStream : public Imf::IStream
+ 			return pos;
+ 		}
+ 
+-		void seekg(Int64 pos)
++		void seekg(uint64_t pos)
+ 		{
+ 			if(!is.seekg((unsigned long)pos))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file");
+diff --git a/unix/config/ax_check_openexr.m4 b/unix/config/ax_check_openexr.m4
+index 69a2cb64..40ce88bc 100644
+--- a/unix/config/ax_check_openexr.m4
++++ b/unix/config/ax_check_openexr.m4
+@@ -56,7 +56,7 @@ AC_DEFUN([AX_CHECK_OPENEXR],
+       # check include file
+       AC_CHECK_HEADER(
+         [OpenEXR/ImfCRgbaFile.h],
+-        [AC_CHECK_LIB([IlmImf], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
++        [AC_CHECK_LIB([OpenEXR], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
+         [ax_check_openexr="no headers"]
+       )
+     fi