[packages/openexr_ctl] - updated URLs - added include patch (missing includes requied with current glibc/g++) - added opene

[qboosh]

commit 0548be98c12252d67e18a4aa356a2e05a25a1bb6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 28 22:18:10 2013 +0100

    - updated URLs
    - added include patch (missing includes requied with current glibc/g++)
    - added openexr2 patch (include OpenEXR headers instead of declaration hacks which stopped to work with OpenEXR 2)
    - added link patch (fix library linking)
    - release 2

 openexr_ctl-include.patch  | 42 ++++++++++++++++++++++++++++++++++++++++++
 openexr_ctl-link.patch     | 14 ++++++++++++++
 openexr_ctl-openexr2.patch | 19 +++++++++++++++++++
 openexr_ctl.spec           | 19 ++++++++++++++++---
 4 files changed, 91 insertions(+), 3 deletions(-)
---
diff --git a/openexr_ctl.spec b/openexr_ctl.spec
index 97ef09a..800c272 100644
--- a/openexr_ctl.spec
+++ b/openexr_ctl.spec
@@ -2,15 +2,21 @@ Summary:	OpenEXR interface to CTL (Color Transform Language)
 Summary(pl.UTF-8):	Interfejs OpenEXR do CTL (języka przekształceń kolorów)
 Name:		openexr_ctl
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	BSD + IP clause
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/ampasctl/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/ampasctl/%{name}-%{version}.tar.gz
 # Source0-md5:	035a68db3b1cc40fe99a7c4012d7f024
-URL:		http://www.oscars.org/council/ctl.html
+Patch0:		%{name}-include.patch
+Patch1:		%{name}-openexr2.patch
+Patch2:		%{name}-link.patch
+URL:		http://www.oscars.org/science-technology/council/projects/ctl.html
 BuildRequires:	OpenEXR-devel >= 1.6.1
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1.6.3
 BuildRequires:	ctl-devel >= 1.4.1
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,8 +85,15 @@ serii przekształceń CTL na piksele w pliku OpenEXR.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}
 
diff --git a/openexr_ctl-include.patch b/openexr_ctl-include.patch
new file mode 100644
index 0000000..95954a9
--- /dev/null
+++ b/openexr_ctl-include.patch
@@ -0,0 +1,42 @@
+--- openexr_ctl-1.0.1/configure.ac.orig	2007-10-10 00:13:37.000000000 +0200
++++ openexr_ctl-1.0.1/configure.ac	2013-03-28 21:22:22.716662089 +0100
+@@ -108,6 +108,7 @@
+    [$CTL_LIBS],[[
+ #include <CtlSimdInterpreter.h>
+ #include <Iex.h>
++#include <cstdlib>
+ ]],
+    [[Ctl::SimdInterpreter interp; interp.setMaxInstCount(10);]],
+    AC_MSG_RESULT([The ctl test program succeeded.]), 
+--- openexr_ctl-1.0.1/exrdpx/main.cpp.orig	2007-07-25 08:28:17.000000000 +0200
++++ openexr_ctl-1.0.1/exrdpx/main.cpp	2013-03-28 22:07:33.649881655 +0100
+@@ -57,6 +57,8 @@
+ #include <exrToDpx.h>
+ #include <ImfTestFile.h>
+ #include <ImfThreading.h>
++#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <string>
+ #include <exception>
+--- openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp.orig	2007-07-13 05:24:37.000000000 +0200
++++ openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp	2013-03-28 22:09:13.796544120 +0100
+@@ -61,6 +61,8 @@
+ #include <ImfHeader.h>
+ #include <ImfFrameBuffer.h>
+ #include <cassert>
++#include <cstdio>
++#include <cstdlib>
+ #include <iostream>
+ #include <vector>
+ #include <string>
+--- openexr_ctl-1.0.1/exr_ctl_exr/main.cpp.orig	2007-07-25 08:02:11.000000000 +0200
++++ openexr_ctl-1.0.1/exr_ctl_exr/main.cpp	2013-03-28 22:10:49.799873425 +0100
+@@ -56,6 +56,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <exrCtlExr.h>
++#include <cstdlib>
+ #include <iostream>
+ #include <string>
+ #include <exception>
diff --git a/openexr_ctl-link.patch b/openexr_ctl-link.patch
new file mode 100644
index 0000000..99f7873
--- /dev/null
+++ b/openexr_ctl-link.patch
@@ -0,0 +1,14 @@
+--- openexr_ctl-1.0.1/IlmImfCtl/Makefile.am.orig	2007-03-29 23:13:01.000000000 +0200
++++ openexr_ctl-1.0.1/IlmImfCtl/Makefile.am	2013-03-28 22:14:24.946531063 +0100
+@@ -4,9 +4,9 @@
+ 
+ INCLUDES = @CTL_CXXFLAGS@ @OPENEXR_CXXFLAGS@
+ 
+-AM_LDFLAGS = @CTL_LDFLAGS@ @OPENEXR_LDFLAGS@ @CTL_LIBS@ @OPENEXR_LIBS@
+-
++AM_LDFLAGS = @CTL_LDFLAGS@ @OPENEXR_LDFLAGS@
+ 
++libIlmImfCtl_la_LIBADD = @CTL_LIBS@ @OPENEXR_LIBS@
+ libIlmImfCtl_la_SOURCES = \
+ 	ImfCtlApplyTransforms.cpp \
+ 	ImfCtlApplyTransforms.h \
diff --git a/openexr_ctl-openexr2.patch b/openexr_ctl-openexr2.patch
new file mode 100644
index 0000000..7d0e39b
--- /dev/null
+++ b/openexr_ctl-openexr2.patch
@@ -0,0 +1,19 @@
+--- openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h.orig	2007-07-25 00:28:03.000000000 +0200
++++ openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h	2013-03-28 22:00:00.596567336 +0100
+@@ -185,14 +185,10 @@
+ #include <string>
+ #include <vector>
+ #include <ImathBox.h>
++#include <ImfFrameBuffer.h>
++#include <ImfHeader.h>
+ #include <ImfThreading.h>
+ 
+-namespace Imf
+-{
+-    class Header;
+-    class FrameBuffer;
+-}
+-
+ namespace Ctl
+ {
+     class Interpreter;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openexr_ctl.git/commitdiff/0548be98c12252d67e18a4aa356a2e05a25a1bb6