Date: Saturday, April 24, 2021 @ 21:21:30
Author: arojas
Revision: 923749
openexr 3.0 rebuild
Added:
povray/trunk/povray-openexr3.patch
Modified:
povray/trunk/PKGBUILD
Deleted:
povray/trunk/povray3.7.0_rc3-user-conf.patch
---------------------------------+
PKGBUILD | 12 ++++---
povray-openexr3.patch | 65 ++++++++++++++++++++++++++++++++++++++
povray3.7.0_rc3-user-conf.patch | 27 ---------------
3 files changed, 73 insertions(+), 31 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-24 21:08:15 UTC (rev 923748)
+++ PKGBUILD 2021-04-24 21:21:30 UTC (rev 923749)
@@ -7,7 +7,7 @@
pkgname=povray
pkgver=3.7.0.8
_v=${pkgver%.*.*} # 3.7
-pkgrel=9
+pkgrel=10
epoch=2
pkgdesc='Script based raytracer for creating 3D graphics'
arch=('x86_64')
@@ -17,12 +17,16 @@
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";)
-sha512sums=('4de3090cb4c1f7d8004bf5548297f4b95496b3265e5b8b5c861f331bda20de06c9d1ce67858a233740f8091e61315abdd3e519c8db5557b6b37c7a864b85d1c6')
+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/unix"
+ 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
Added: povray-openexr3.patch
===================================================================
--- povray-openexr3.patch (rev 0)
+++ povray-openexr3.patch 2021-04-24 21:21:30 UTC (rev 923749)
@@ -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
Deleted: povray3.7.0_rc3-user-conf.patch
===================================================================
--- povray3.7.0_rc3-user-conf.patch 2021-04-24 21:08:15 UTC (rev 923748)
+++ povray3.7.0_rc3-user-conf.patch 2021-04-24 21:21:30 UTC (rev 923749)
@@ -1,27 +0,0 @@
- Makefile.am | 13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 76b394c..9822c52 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,19 +107,6 @@ install-data-local:
- for f in $$filelist ; do \
- $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f &&
echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
- done
-- @echo "Creating user directories..."; \
-- for p in $(povuser) $(povconfuser) ; do \
-- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p &&
printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
-- done
-- @echo "Copying user configuration and INI files..."; \
-- for f in povray.conf povray.ini ; do \
-- if test -f $(povconfuser)/$$f; then \
-- echo "Creating backup of $(povconfuser)/$$f"; \
-- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
-- fi; \
-- done; \
-- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf &&
chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup)
$(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >>
$(povinstall); \
-- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini &&
chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup)
$(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall)
-
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders
(e.g. scripts).
