Author: kwizart Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18704/devel Modified Files: .cvsignore OpenEXR_Viewers-nonfree.spec sources Added Files: namespaceAlias.h openexr_viewers-2.0.1-dso.patch openexr_viewers-2.1.0-headers.patch Removed Files: openexr_viewers-1.0.1-gcc43.patch openexr_viewers-1.0.1-gcc44.patch openexr_viewers-1.0.2-dso.patch openexr_viewers-1.0.2-gcc47.patch openexr_viewers-1.0.2-gccCg.patch Log Message: Sync with fedora version --- NEW FILE namespaceAlias.h --- /////////////////////////////////////////////////////////////////////////// // // Copyright (c) 2012, Industrial Light & Magic, a division of Lucas // Digital Ltd. LLC // // All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above // copyright notice, this list of conditions and the following disclaimer // in the documentation and/or other materials provided with the // distribution. // * Neither the name of Industrial Light & Magic nor the names of // its contributors may be used to endorse or promote products derived // from this software without specific prior written permission. // // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // /////////////////////////////////////////////////////////////////////////// #ifndef NAMESPACEALIAS_H_ #define NAMESPACEALIAS_H_ #include "ImfNamespace.h" #include "ImathNamespace.h" #include "IexNamespace.h" namespace IMF = OPENEXR_IMF_NAMESPACE; namespace IMATH = IMATH_NAMESPACE; namespace IEX = IEX_NAMESPACE; #endif /* NAMESPACEALIAS_H_ */ openexr_viewers-2.0.1-dso.patch: configure.ac | 12 ++++++++++++ exrdisplay/Makefile.am | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE openexr_viewers-2.0.1-dso.patch --- diff -up openexr_viewers-2.0.1/configure.ac.dso openexr_viewers-2.0.1/configure.ac --- openexr_viewers-2.0.1/configure.ac.dso 2013-06-18 15:58:29.000000000 -0500 +++ openexr_viewers-2.0.1/configure.ac 2013-10-11 14:15:38.870351295 -0500 @@ -75,6 +75,18 @@ AM_PATH_PKGCONFIG( [-lIlmImfCtl -lIlmImf -lz -lImath -lHalf -lIex -lIlmThread -lpthread -lIlmCtlSimd -lIlmCtlMath -lIlmCtl], [openexrctl-prefix]) +dnl +dnl check gl +dnl +AM_PATH_PKGCONFIG( + [GL_CFLAGS], + [GL_LDFLAGS], + [GL_LIBS], + [gl], + , + [$LIB64_IF_EXISTS -L/usr/local/lib], + [-lGL], + [gl-prefix]) dnl --enable-threading AC_ARG_ENABLE(threading, diff -up openexr_viewers-2.0.1/exrdisplay/Makefile.am.dso openexr_viewers-2.0.1/exrdisplay/Makefile.am --- openexr_viewers-2.0.1/exrdisplay/Makefile.am.dso 2013-06-18 14:51:41.000000000 -0500 +++ openexr_viewers-2.0.1/exrdisplay/Makefile.am 2013-10-11 14:17:07.953771623 -0500 @@ -5,11 +5,12 @@ if HAVE_FLTK bin_PROGRAMS = exrdisplay INCLUDES = @OPENEXR_CXXFLAGS@ \ - @GL_CXXFLAGS@ @CG_CXXFLAGS@ @FLTK_CXXFLAGS@ -I$(top_builddir) \ + @GL_CFLAGS@ @GL_CXXFLAGS@ @CG_CXXFLAGS@ @FLTK_CXXFLAGS@ -I$(top_builddir) \ @OPENEXR_CTL_CXXFLAGS@ LDADD = @OPENEXR_LDFLAGS@ @OPENEXR_LIBS@ \ @OPENEXR_CTL_LDFLAGS@ @OPENEXR_CTL_LIBS@ \ + @GL_LDFLAGS@ @GL_LIBS@ \ @CG_LDFLAGS@ @FLTK_LDFLAGS@ all-local: openexr_viewers-2.1.0-headers.patch: Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE openexr_viewers-2.1.0-headers.patch --- diff -up openexr_viewers-2.1.0/exrdisplay/Makefile.am.headers openexr_viewers-2.1.0/exrdisplay/Makefile.am --- openexr_viewers-2.1.0/exrdisplay/Makefile.am.headers 2014-01-31 10:09:46.514343641 -0600 +++ openexr_viewers-2.1.0/exrdisplay/Makefile.am 2014-01-31 10:11:59.636924846 -0600 @@ -44,7 +44,8 @@ noinst_HEADERS = \ scaleImage.h \ applyCtl.h \ GlWindow3d.h \ - GlWindow3d.cpp + GlWindow3d.cpp \ + namespaceAlias.h EXTRA_DIST = $(exrdisplay_SOURCES) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2010 12:49:43 -0000 1.3 +++ .cvsignore 6 Dec 2014 11:36:02 -0000 1.4 @@ -1 +1 @@ -openexr_viewers-1.0.2.tar.gz +openexr_viewers-2.1.0.tar.gz Index: OpenEXR_Viewers-nonfree.spec =================================================================== RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/OpenEXR_Viewers-nonfree.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- OpenEXR_Viewers-nonfree.spec 20 Dec 2013 17:58:09 -0000 1.21 +++ OpenEXR_Viewers-nonfree.spec 6 Dec 2014 11:36:02 -0000 1.22 @@ -1,3 +1,5 @@ +%global _default_patch_fuzz 2 + # nVidia Cg toolkit is not free %define with_Cg 1 %if %with_Cg @@ -10,28 +12,32 @@ %define priority 5 %endif +%if 0%{?fedora} < 21 +# https://bugzilla.redhat.com/1017873 +%define openexr_ctl 1 +%endif + Name: %{real_name} -Version: 1.0.2 -Release: 15%{?dist} +Version: 2.1.0 +Release: 3%{?dist} Summary: Viewers programs for OpenEXR Group: Applications/Multimedia License: AMPAS BSD URL: http://www.openexr.com Source0: http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-%{ve... -Patch0: openexr_viewers-1.0.1-gcc43.patch -Patch1: openexr_viewers-1.0.1-gcc44.patch -Patch2: openexr_viewers-1.0.2-gccCg.patch -# fix dso (missing symbols) by explicitly linking -lGL too -Patch3: openexr_viewers-1.0.2-dso.patch -Patch4: openexr_viewers-1.0.2-gcc47.patch +# missing header from ^^, should be fixed/included in subsequent releases +Source1: namespaceAlias.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: openexr_viewers-2.0.1-dso.patch +# fix ftbfs due to missing header +Patch2: openexr_viewers-2.1.0-headers.patch + BuildRequires: libtool -BuildRequires: OpenEXR_CTL-devel -BuildRequires: OpenEXR_CTL -BuildRequires: fltk-devel +BuildRequires: fltk-devel >= 1.1 +BuildRequires: pkgconfig(OpenEXR) >= 2.1 %if %with_Cg BuildRequires: Cg BuildRequires: freeglut-devel @@ -40,7 +46,11 @@ BuildConflicts: Cg %endif +%if 0%{?openexr_ctl} +BuildRequires: OpenEXR_CTL-devel +BuildRequires: OpenEXR_CTL Requires: OpenEXR_CTL +%endif Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives @@ -70,21 +80,25 @@ %prep %setup -q -n openexr_viewers-%{version} -%patch0 -p1 -b .gcc43 -%patch1 -p1 -b .gcc44 -%patch2 -p1 -b .gccCg -%patch3 -p1 -b .ld -%patch4 -p1 -b .gcc47 + +%patch1 -p1 -b .dso +cp -n %{SOURCE1} exrdisplay/namespaceAlias.h +#patch2 -p1 -b .header %if %{_lib} == lib64 sed -i -e 's|ACTUAL_PREFIX/lib/CTL|ACTUAL_PREFIX/lib64/CTL|' configure.ac %endif -#Needed to update CTL compiler test +#Needed for patch1 and to update CTL compiler test +#autoconf ./bootstrap +sed -i -e 's|#include <vector>\n using namespace Ctl|#include <vector>\n #include <cstdlib>\nusing namespace Ctl|' configure + %build export CXXFLAGS="$RPM_OPT_FLAGS -L%{_libdir}" %configure --disable-static \ + --disable-openexrtest \ + --disable-openexrctltest \ %if %with_Cg --with-cg-prefix=%{_prefix} %endif @@ -138,38 +152,55 @@ %endif %changelog -* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-15 -- Rebuilt +* Fri Aug 15 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Nov 27 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.1.0-1 +- 2.1.0 + +* Fri Oct 11 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.0.1-3 +- OpenEXR_Viewers FTBFS: ImplicitDSO Linking issues (#1017880) + +* Thu Oct 10 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.0.1-2 +- make OpenEXR_CTL support optional (since it doesn't support openexr-2.x yet) -* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-14 -- Rebuilt +* Sat Oct 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.1-1 +- Update to 2.0.1 -* Tue Mar 12 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-13 +* Sat Sep 14 2013 Bruno Wolff III <bruno(a)wolff.to&gt; - 1.0.2-13 +- Rebuild for ilmbase related soname bumps + +* Fri Aug 02 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 11 2013 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.0.2-11 +- rebuild (OpenEXR) + +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-10 -- Fix for gcc47 +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-9 +* Tue Feb 28 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-8 - Rebuilt for c++ ABI breakage -* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-8 +* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Fri Jul 08 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-7 -- Bump - -* Thu Jul 07 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-6 -- Bump for fltk rebuilt - -* Wed Jul 06 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-5 -- Add patch from rdieter +* Fri Jun 24 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 1.0.2-6 +- FTBFS OpenEXR_Viewers-1.0.2-3.fc15: ImplicitDSOLinking (#716011) -* Sun Oct 10 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-4 -- rebuilt for compiler bug +* Fri May 27 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-5 +- Update gcc44 patch +- Rebuild for new fltk +- Drop old Obsoletes OpenEXR-utils < 1.6.0 -* Sat Sep 18 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-3 -- Fix gcc44 in Cg case +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Sun Sep 05 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.2-2 - Fix CTL Module search path on lib64 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2010 12:49:43 -0000 1.3 +++ sources 6 Dec 2014 11:36:02 -0000 1.4 @@ -1 +1 @@ -5d4c74ebcaf942267b0353e4c53f8b9e openexr_viewers-1.0.2.tar.gz +da541c054fe8cf3d6e98c3124fd5ad99 openexr_viewers-2.1.0.tar.gz --- openexr_viewers-1.0.1-gcc43.patch DELETED --- --- openexr_viewers-1.0.1-gcc44.patch DELETED --- --- openexr_viewers-1.0.2-dso.patch DELETED --- --- openexr_viewers-1.0.2-gcc47.patch DELETED --- --- openexr_viewers-1.0.2-gccCg.patch DELETED ---