remove patch

3 files changed, 8 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a925af27852a..90277c6e259d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = aqsis-git
-	pkgdesc = RenderMan-compliant REYES renderer
+	pkgdesc = A Pixar RenderMan-compliant REYES renderer
 	pkgver = 20180401.51fd2a31
 	pkgrel = 1
 	url = https://github.com/aqsis/aqsis
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = boost
 	makedepends = git
 	makedepends = cmake
-	depends = boost
 	depends = libtiff
 	depends = flex
 	depends = bison
@@ -16,9 +16,7 @@ pkgbase = aqsis-git
 	depends = libjpeg
 	depends = openexr
 	source = git+https://github.com/aqsis/aqsis.git
-	source = aqsis-boost.patch
 	md5sums = SKIP
-	md5sums = 74b29b1843b8e16a01a968f8b3bf7273
 
 pkgname = aqsis-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4578ff659731..716fea0eb844 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,17 @@
 # Maintainer:  Martin C. Doege <mdoege at compuserve dot com>
 
 pkgname='aqsis-git'
-pkgdesc='RenderMan-compliant REYES renderer'
-pkgver=20180401.51fd2a31
+pkgdesc='A Pixar RenderMan-compliant REYES renderer'
+pkgver=20200513.883cc9e0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL3')
 url='https://github.com/aqsis/aqsis'
 
-depends=('boost' 'libtiff' 'flex' 'bison' 'zlib' 'libjpeg' 'openexr')
-makedepends=('git' 'cmake')
-
-source=('git+https://github.com/aqsis/aqsis.git'
-        'aqsis-boost.patch')
-md5sums=('SKIP'
-         '74b29b1843b8e16a01a968f8b3bf7273')
+depends=('libtiff' 'flex' 'bison' 'zlib' 'libjpeg' 'openexr')
+makedepends=('boost' 'git' 'cmake')
+source=('git+https://github.com/aqsis/aqsis.git')
+md5sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/aqsis"
@@ -23,7 +20,6 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/aqsis"
-    patch -p1 < "$srcdir/aqsis-boost.patch"
     git submodule update --init
 }
 
diff --git a/aqsis-boost.patch b/aqsis-boost.patch
deleted file mode 100644
index 64cb7d4987f4..000000000000
--- a/aqsis-boost.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/include/aqsis/core/ioptions.h b/include/aqsis/core/ioptions.h
-index e233251a..ba12bd41 100644
---- a/include/aqsis/core/ioptions.h
-+++ b/include/aqsis/core/ioptions.h
-@@ -30,6 +30,7 @@
- #include <aqsis/aqsis.h>
- 
- #include <boost/filesystem/path.hpp>
-+#include <boost/smart_ptr/shared_ptr.hpp>
- 
- #include <aqsis/riutil/primvartype.h>
- #include <aqsis/ri/ritypes.h>
-diff --git a/tools/displays/piqsl/piqsldisplay.cpp b/tools/displays/piqsl/piqsldisplay.cpp
-index a4073902..b31708cd 100644
---- a/tools/displays/piqsl/piqsldisplay.cpp
-+++ b/tools/displays/piqsl/piqsldisplay.cpp
-@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtDspyImageHandle image,
- 
- 	TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");
- 	std::stringstream base64Data;
--	std::copy(	base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), 
--				base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), 
-+	std::copy(	base64_text(data), 
-+				base64_text(data + bufferlength), 
- 				std::ostream_iterator<char>(base64Data));
- 	TiXmlText* dataTextXML = new TiXmlText(base64Data.str());
- 	dataTextXML->SetCDATA(true);
-diff --git a/tools/piqsl/displayserverimage.cpp b/tools/piqsl/displayserverimage.cpp
-index c3894794..4310a63c 100644
---- a/tools/piqsl/displayserverimage.cpp
-+++ b/tools/piqsl/displayserverimage.cpp
-@@ -353,7 +353,7 @@ typedef
-                                 std::string data = dataText->Value();
-                                 std::vector<unsigned char> binaryData;
-                                 binaryData.reserve(count);
--                                base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin()));
-+                                base64_binary ti_begin = base64_binary(data.begin());
-                                 std::size_t padding = 2 - count % 3;
-                                 while(--count > 0)
-                                 {
-diff --git a/tools/piqsl/imagelistmodel.cpp b/tools/piqsl/imagelistmodel.cpp
-index 27feec6a..010c71f4 100644
---- a/tools/piqsl/imagelistmodel.cpp
-+++ b/tools/piqsl/imagelistmodel.cpp
-@@ -42,11 +42,6 @@
- #include <boost/archive/iterators/transform_width.hpp>
- #include <boost/archive/iterators/remove_whitespace.hpp>
- #include <boost/version.hpp>
--#if BOOST_VERSION < 103700
--#   include <boost/pfto.hpp>
--#else
--#   include <boost/serialization/pfto.hpp>
--#endif
- 
- 
- #include "displayserverimage.h"