[arch-commits] Commit in povray/trunk (PKGBUILD povray-openexr3.patch)

[Alexander Rødseth]

    Date: Wednesday, April 6, 2022 @ 22:56:13
  Author: arodseth
Revision: 1182361

upgpkg: povray 2:3.7.0.10-1

Modified:
  povray/trunk/PKGBUILD
Deleted:
  povray/trunk/povray-openexr3.patch

-----------------------+
 PKGBUILD              |   11 ++------
 povray-openexr3.patch |   65 ------------------------------------------------
 2 files changed, 4 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-06 22:53:30 UTC (rev 1182360)
+++ PKGBUILD	2022-04-06 22:56:13 UTC (rev 1182361)
@@ -6,8 +6,8 @@
 
 pkgname=povray
 epoch=2
-pkgver=3.7.0.9
-pkgrel=8
+pkgver=3.7.0.10
+pkgrel=1
 _v=${pkgver%.*.*} # 3.7
 pkgdesc='Script based raytracer for creating 3D graphics'
 arch=(x86_64)
@@ -17,15 +17,12 @@
 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)
-b2sums=('42772b8b055e77c3469312a8a1833c4ca79943ac49f59f6b18c2f8ad41e865d65f8ceb52f228628f26d4f653ec27f85264929cafdb753686e86c5f6fac4675cf'
-        '3c9623a12fff3c568e61f29685069a9c92197f13b7e30b8cbf33eb2591a9d28475f95b35089546f21c818d5f567b347c799fa9c04e667aa0512b8785f2070d03')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/POV-Ray/povray/archive/v$pkgver.tar.gz")
+b2sums=('b9b448bafc1664d7378168905125ef8b60ac5e8a3a213d6216dd0219b2fad0bc43a5c6d8f8f3d8172ff43bcc9a3f11806b2ff04d3b965914fd628c929e46560b')
 
 prepare() {
   cd $pkgname-$pkgver
   rm -frv libraries/ilmbase/Imath
-  patch -p1 < "$srcdir/povray-openexr3.patch"
   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

Deleted: povray-openexr3.patch
===================================================================
--- povray-openexr3.patch	2022-04-06 22:53:30 UTC (rev 1182360)
+++ povray-openexr3.patch	2022-04-06 22:56:13 UTC (rev 1182361)
@@ -1,65 +0,0 @@
-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