Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23290/10.4/unstable/main/finkinfo/graphics
Modified Files: openexr.info openexr.patch Log Message: new upstream Index: openexr.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/openexr.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- openexr.patch 30 Apr 2007 20:46:54 -0000 1.2 +++ openexr.patch 1 May 2007 15:47:50 -0000 1.3 @@ -1,80 +1,196 @@ -diff -uNr OpenEXR-1.2.2/Half/Makefile.in OpenEXR-1.2.2-new/Half/Makefile.in ---- OpenEXR-1.2.2/Half/Makefile.in 2005-03-09 20:29:27.000000000 -0500 -+++ OpenEXR-1.2.2-new/Half/Makefile.in 2006-01-22 21:50:26.000000000 -0500 -@@ -262,7 +262,7 @@ - rm -f "$${dir}/so_locations"; \ - done - libHalf.la: $(libHalf_la_OBJECTS) $(libHalf_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libHalf_la_LDFLAGS) $(libHalf_la_OBJECTS) $(libHalf_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir) $(libHalf_la_LIBADD) $(libHalf_la_OBJECTS) $(libHalf_la_LDFLAGS) $(LIBS) + +--- openexr-1.4.0/HalfTest/Makefile.in 2006-08-09 01:45:50.000000000 -0400 ++++ openexr-1.4.0-patched/HalfTest/Makefile.in 2007-04-30 15:44:56.000000000 -0400 +@@ -204,7 +204,7 @@ + testSize.h - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -272,10 +272,10 @@ + INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Half -I$(top_srcdir)/config +-LDADD = -L$(top_builddir)/Half -lHalf ++LDADD = $(top_builddir)/Half/libHalf.la + TESTS = HalfTest + all: all-am + +@@ -248,7 +248,7 @@ done - eLut$(EXEEXT): $(eLut_OBJECTS) $(eLut_DEPENDENCIES) - @rm -f eLut$(EXEEXT) -- $(CXXLINK) $(eLut_LDFLAGS) $(eLut_OBJECTS) $(eLut_LDADD) $(LIBS) -+ $(CXXLINK) $(eLut_LDADD) $(eLut_OBJECTS) $(eLut_LDFLAGS) $(LIBS) - toFloat$(EXEEXT): $(toFloat_OBJECTS) $(toFloat_DEPENDENCIES) - @rm -f toFloat$(EXEEXT) -- $(CXXLINK) $(toFloat_LDFLAGS) $(toFloat_OBJECTS) $(toFloat_LDADD) $(LIBS) -+ $(CXXLINK) $(toFloat_LDADD) $(toFloat_OBJECTS) $(toFloat_LDFLAGS) $(LIBS) + HalfTest$(EXEEXT): $(HalfTest_OBJECTS) $(HalfTest_DEPENDENCIES) + @rm -f HalfTest$(EXEEXT) +- $(CXXLINK) $(HalfTest_LDFLAGS) $(HalfTest_OBJECTS) $(HalfTest_LDADD) $(LIBS) ++ $(CXXLINK) $(HalfTest_LDADD) $(HalfTest_LDFLAGS) $(HalfTest_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/Iex/Makefile.in OpenEXR-1.2.2-new/Iex/Makefile.in ---- OpenEXR-1.2.2/Iex/Makefile.in 2005-03-09 20:29:28.000000000 -0500 -+++ OpenEXR-1.2.2-new/Iex/Makefile.in 2006-01-22 21:50:43.000000000 -0500 -@@ -240,7 +240,7 @@ - rm -f "$${dir}/so_locations"; \ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/IexTest/Makefile.in 2006-08-09 01:45:51.000000000 -0400 ++++ openexr-1.4.0-patched/IexTest/Makefile.in 2007-04-30 15:45:21.000000000 -0400 +@@ -195,7 +195,7 @@ + target_alias = @target_alias@ + IexTest_SOURCES = main.cpp testBaseExc.cpp testBaseExc.h + INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config +-LDADD = -L$(top_builddir)/Iex -lIex ++LDADD = $(top_builddir)/Iex/libIex.la + TESTS = IexTest + all: all-am + +@@ -239,7 +239,7 @@ done - libIex.la: $(libIex_la_OBJECTS) $(libIex_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libIex_la_LDFLAGS) $(libIex_la_OBJECTS) $(libIex_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir) $(libIex_la_LIBADD) $(libIex_la_OBJECTS) $(libIex_la_LDFLAGS) $(LIBS) + IexTest$(EXEEXT): $(IexTest_OBJECTS) $(IexTest_DEPENDENCIES) + @rm -f IexTest$(EXEEXT) +- $(CXXLINK) $(IexTest_LDFLAGS) $(IexTest_OBJECTS) $(IexTest_LDADD) $(LIBS) ++ $(CXXLINK) $(IexTest_LDADD) $(IexTest_LDFLAGS) $(IexTest_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/IlmImf/Makefile.in OpenEXR-1.2.2-new/IlmImf/Makefile.in ---- OpenEXR-1.2.2/IlmImf/Makefile.in 2005-03-09 20:29:28.000000000 -0500 -+++ OpenEXR-1.2.2-new/IlmImf/Makefile.in 2006-01-22 21:51:07.000000000 -0500 -@@ -390,7 +390,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/IlmImf/Makefile.in 2006-08-09 01:45:51.000000000 -0400 ++++ openexr-1.4.0-patched/IlmImf/Makefile.in 2007-04-30 14:28:50.000000000 -0400 +@@ -382,7 +382,7 @@ rm -f "$${dir}/so_locations"; \ done libIlmImf.la: $(libIlmImf_la_OBJECTS) $(libIlmImf_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libIlmImf_la_LDFLAGS) $(libIlmImf_la_OBJECTS) $(libIlmImf_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir) $(libIlmImf_la_LIBADD) $(libIlmImf_la_OBJECTS) $(libIlmImf_la_LDFLAGS) $(LIBS) ++ $(CXXLINK) -rpath $(libdir) $(libIlmImf_la_LIBADD) $(libIlmImf_la_LDFLAGS) $(libIlmImf_la_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/IlmImfExamples/Makefile.in OpenEXR-1.2.2-new/IlmImfExamples/Makefile.in ---- OpenEXR-1.2.2/IlmImfExamples/Makefile.in 2005-03-09 20:29:28.000000000 -0500 -+++ OpenEXR-1.2.2-new/IlmImfExamples/Makefile.in 2006-01-22 21:51:27.000000000 -0500 -@@ -247,7 +247,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/IlmImfExamples/Makefile.in 2006-08-09 01:45:51.000000000 -0400 ++++ openexr-1.4.0-patched/IlmImfExamples/Makefile.in 2007-04-30 15:46:22.000000000 -0400 +@@ -214,10 +214,11 @@ + -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \ + -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config + +-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \ +- -L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \ +- -L$(top_builddir)/IlmImf \ +- -lIlmImf -lIlmThread -lImath -lHalf -lIex -lz ++LDADD = $(top_builddir)/Iex/libIex.la \ ++ $(top_builddir)/Half/libHalf.la \ ++ $(top_builddir)/Imath/libImath.la \ ++ $(top_builddir)/IlmThread/libIlmThread.la \ ++ $(top_builddir)/IlmImf/libIlmImf.la + + imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \ + rgbaInterfaceTiledExamples.cpp \ +@@ -274,7 +275,7 @@ done imfexamples$(EXEEXT): $(imfexamples_OBJECTS) $(imfexamples_DEPENDENCIES) @rm -f imfexamples$(EXEEXT) - $(CXXLINK) $(imfexamples_LDFLAGS) $(imfexamples_OBJECTS) $(imfexamples_LDADD) $(LIBS) -+ $(CXXLINK) $(imfexamples_LDADD) $(imfexamples_OBJECTS) $(imfexamples_LDFLAGS) $(LIBS) ++ $(CXXLINK) $(imfexamples_LDADD) $(imfexamples_LDFLAGS) $(imfexamples_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/Imath/Makefile.in OpenEXR-1.2.2-new/Imath/Makefile.in ---- OpenEXR-1.2.2/Imath/Makefile.in 2005-03-09 20:29:29.000000000 -0500 -+++ OpenEXR-1.2.2-new/Imath/Makefile.in 2006-01-22 21:51:44.000000000 -0500 -@@ -263,7 +263,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/IlmImfTest/Makefile.in 2006-08-09 01:45:51.000000000 -0400 ++++ openexr-1.4.0-patched/IlmImfTest/Makefile.in 2007-04-30 15:47:12.000000000 -0400 +@@ -249,10 +249,11 @@ + -I$(top_srcdir)/Imath -I$(top_srcdir)/IlmImf \ + -I$(top_srcdir)/IlmThread -I$(top_srcdir)/config + +-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \ +- -L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \ +- -L$(top_builddir)/IlmImf \ +- -lIlmImf -lIlmThread -lImath -lIex -lHalf -lz ++LDADD = $(top_builddir)/Iex/libIex.la \ ++ $(top_builddir)/Half/libHalf.la \ ++ $(top_builddir)/Imath/libImath.la \ ++ $(top_builddir)/IlmThread/libIlmThread.la \ ++ $(top_builddir)/IlmImf/libIlmImf.la -lz + + TESTS = IlmImfTest + EXTRA_DIST = comp_none.exr comp_piz.exr comp_rle.exr comp_zip.exr \ +@@ -302,7 +303,7 @@ + done + IlmImfTest$(EXEEXT): $(IlmImfTest_OBJECTS) $(IlmImfTest_DEPENDENCIES) + @rm -f IlmImfTest$(EXEEXT) +- $(CXXLINK) $(IlmImfTest_LDFLAGS) $(IlmImfTest_OBJECTS) $(IlmImfTest_LDADD) $(LIBS) ++ $(CXXLINK) $(IlmImfTest_LDADD) $(IlmImfTest_LDFLAGS) $(IlmImfTest_OBJECTS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/IlmThread/Makefile.in 2006-08-09 01:45:51.000000000 -0400 ++++ openexr-1.4.0-patched/IlmThread/Makefile.in 2007-04-30 14:29:06.000000000 -0400 +@@ -290,7 +290,7 @@ + rm -f "$${dir}/so_locations"; \ + done + libIlmThread.la: $(libIlmThread_la_OBJECTS) $(libIlmThread_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(libdir) $(libIlmThread_la_LDFLAGS) $(libIlmThread_la_OBJECTS) $(libIlmThread_la_LIBADD) $(LIBS) ++ $(CXXLINK) -rpath $(libdir) $(libIlmThread_la_LIBADD) $(libIlmThread_la_LDFLAGS) $(libIlmThread_la_OBJECTS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/Imath/Makefile.in 2006-08-09 01:45:52.000000000 -0400 ++++ openexr-1.4.0-patched/Imath/Makefile.in 2007-04-30 14:29:20.000000000 -0400 +@@ -298,7 +298,7 @@ rm -f "$${dir}/so_locations"; \ done libImath.la: $(libImath_la_OBJECTS) $(libImath_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libImath_la_LDFLAGS) $(libImath_la_OBJECTS) $(libImath_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir) $(libImath_la_LIBADD) $(libImath_la_OBJECTS) $(libImath_la_LDFLAGS) $(LIBS) ++ $(CXXLINK) -rpath $(libdir) $(libImath_la_LIBADD) $(libImath_la_LDFLAGS) $(libImath_la_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrdisplay/Makefile.in OpenEXR-1.2.2-new/exrdisplay/Makefile.in ---- OpenEXR-1.2.2/exrdisplay/Makefile.in 2005-03-09 20:29:30.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrdisplay/Makefile.in 2006-01-22 21:48:17.000000000 -0500 -@@ -267,7 +267,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/ImathTest/Makefile.in 2006-08-09 01:45:52.000000000 -0400 ++++ openexr-1.4.0-patched/ImathTest/Makefile.in 2007-04-30 15:47:58.000000000 -0400 +@@ -208,8 +208,9 @@ + INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Imath -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \ + -I$(top_srcdir)/config + +-LDADD = -L$(top_builddir)/Imath -L$(top_builddir)/Iex -L$(top_builddir)/Half \ +- -lImath -lIex -lHalf ++LDADD = $(top_builddir)/Imath/libImath.la \ ++ $(top_builddir)/Iex/libIex.la \ ++ $(top_builddir)/Half/libHalf.la + + TESTS = ImathTest + all: all-am +@@ -254,7 +255,7 @@ + done + ImathTest$(EXEEXT): $(ImathTest_OBJECTS) $(ImathTest_DEPENDENCIES) + @rm -f ImathTest$(EXEEXT) +- $(CXXLINK) $(ImathTest_LDFLAGS) $(ImathTest_OBJECTS) $(ImathTest_LDADD) $(LIBS) ++ $(CXXLINK) $(ImathTest_LDADD) $(ImathTest_LDFLAGS) $(ImathTest_OBJECTS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrdisplay/ImageView.cpp 2006-06-05 20:09:29.000000000 -0400 ++++ openexr-1.4.0-patched/exrdisplay/ImageView.cpp 2007-04-30 14:35:44.000000000 -0400 +@@ -55,8 +55,6 @@ + #endif + #include <windows.h> + #include <GL/gl.h> +-#elif defined HAVE_DARWIN +-#include <OpenGL/gl.h> + #else + #include <GL/gl.h> + #endif +--- openexr-1.4.0/exrdisplay/ImageViewFragShader.cpp 2006-06-08 02:11:07.000000000 -0400 ++++ openexr-1.4.0-patched/exrdisplay/ImageViewFragShader.cpp 2007-04-30 14:35:15.000000000 -0400 +@@ -47,11 +47,7 @@ + #include "OpenEXRConfig.h" + #include <ImageViewFragShader.h> + +-#ifdef HAVE_DARWIN +-#include <OpenGL/glu.h> +-#else + #include <GL/glu.h> +-#endif + #define GL_GLEXT_PROTOTYPES + #include <GL/glext.h> + +--- openexr-1.4.0/exrdisplay/ImageViewFragShader.h 2006-06-05 20:07:50.000000000 -0400 ++++ openexr-1.4.0-patched/exrdisplay/ImageViewFragShader.h 2007-04-30 14:35:55.000000000 -0400 +@@ -49,11 +49,7 @@ + #if defined _WIN32 || defined _WIN64 + #include <windows.h> + #endif +-#ifdef HAVE_DARWIN +-#include <OpenGL/gl.h> +-#else + #include <GL/gl.h> +-#endif + + #include <string> + +--- openexr-1.4.0/exrdisplay/Makefile.in 2006-08-09 01:45:52.000000000 -0400 ++++ openexr-1.4.0-patched/exrdisplay/Makefile.in 2007-04-30 15:48:18.000000000 -0400 +@@ -295,7 +295,7 @@ done exrdisplay$(EXEEXT): $(exrdisplay_OBJECTS) $(exrdisplay_DEPENDENCIES) @rm -f exrdisplay$(EXEEXT) @@ -82,11 +198,10 @@ + $(CXXLINK) $(exrdisplay_LDADD) $(exrdisplay_LDFLAGS) $(exrdisplay_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrenvmap/Makefile.in OpenEXR-1.2.2-new/exrenvmap/Makefile.in ---- OpenEXR-1.2.2/exrenvmap/Makefile.in 2005-03-09 20:29:30.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrenvmap/Makefile.in 2006-01-22 21:48:36.000000000 -0500 -@@ -255,7 +255,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrenvmap/Makefile.in 2006-08-09 01:45:52.000000000 -0400 ++++ openexr-1.4.0-patched/exrenvmap/Makefile.in 2007-04-30 15:48:36.000000000 -0400 +@@ -288,7 +288,7 @@ done exrenvmap$(EXEEXT): $(exrenvmap_OBJECTS) $(exrenvmap_DEPENDENCIES) @rm -f exrenvmap$(EXEEXT) @@ -94,91 +209,48 @@ + $(CXXLINK) $(exrenvmap_LDADD) $(exrenvmap_LDFLAGS) $(exrenvmap_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrheader/Makefile.in OpenEXR-1.2.2-new/exrheader/Makefile.in ---- OpenEXR-1.2.2/exrheader/Makefile.in 2005-03-09 20:29:30.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrheader/Makefile.in 2006-01-22 21:48:50.000000000 -0500 -@@ -233,7 +233,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrheader/Makefile.in 2006-08-09 01:45:52.000000000 -0400 ++++ openexr-1.4.0-patched/exrheader/Makefile.in 2007-04-30 15:49:02.000000000 -0400 +@@ -268,7 +268,7 @@ done exrheader$(EXEEXT): $(exrheader_OBJECTS) $(exrheader_DEPENDENCIES) @rm -f exrheader$(EXEEXT) - $(CXXLINK) $(exrheader_LDFLAGS) $(exrheader_OBJECTS) $(exrheader_LDADD) $(LIBS) -+ $(CXXLINK) $(exrheader_LDADD) $(exrheader_OBJECTS) $(exrheader_LDFLAGS) $(LIBS) ++ $(CXXLINK) $(exrheader_LDADD) $(exrheader_LDFLAGS) $(exrheader_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrmakepreview/Makefile.in OpenEXR-1.2.2-new/exrmakepreview/Makefile.in ---- OpenEXR-1.2.2/exrmakepreview/Makefile.in 2005-03-09 20:29:30.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrmakepreview/Makefile.in 2006-01-22 21:49:11.000000000 -0500 -@@ -246,7 +246,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrmakepreview/Makefile.in 2006-08-09 01:45:53.000000000 -0400 ++++ openexr-1.4.0-patched/exrmakepreview/Makefile.in 2007-04-30 15:49:16.000000000 -0400 +@@ -281,7 +281,7 @@ done exrmakepreview$(EXEEXT): $(exrmakepreview_OBJECTS) $(exrmakepreview_DEPENDENCIES) @rm -f exrmakepreview$(EXEEXT) - $(CXXLINK) $(exrmakepreview_LDFLAGS) $(exrmakepreview_OBJECTS) $(exrmakepreview_LDADD) $(LIBS) -+ $(CXXLINK) $(exrmakepreview_LDADD) $(exrmakepreview_OBJECTS) $(exrmakepreview_LDFLAGS) $(LIBS) ++ $(CXXLINK) $(exrmakepreview_LDADD) $(exrmakepreview_LDFLAGS) $(exrmakepreview_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrmaketiled/Makefile.in OpenEXR-1.2.2-new/exrmaketiled/Makefile.in ---- OpenEXR-1.2.2/exrmaketiled/Makefile.in 2005-03-09 20:29:30.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrmaketiled/Makefile.in 2006-01-22 21:49:28.000000000 -0500 -@@ -248,7 +248,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrmaketiled/Makefile.in 2006-08-09 01:45:53.000000000 -0400 ++++ openexr-1.4.0-patched/exrmaketiled/Makefile.in 2007-04-30 15:49:29.000000000 -0400 +@@ -282,7 +282,7 @@ done exrmaketiled$(EXEEXT): $(exrmaketiled_OBJECTS) $(exrmaketiled_DEPENDENCIES) @rm -f exrmaketiled$(EXEEXT) - $(CXXLINK) $(exrmaketiled_LDFLAGS) $(exrmaketiled_OBJECTS) $(exrmaketiled_LDADD) $(LIBS) -+ $(CXXLINK) $(exrmaketiled_LDADD) $(exrmaketiled_OBJECTS) $(exrmaketiled_LDFLAGS) $(LIBS) ++ $(CXXLINK) $(exrmaketiled_LDADD) $(exrmaketiled_LDFLAGS) $(exrmaketiled_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -uNr OpenEXR-1.2.2/exrstdattr/Makefile.in OpenEXR-1.2.2-new/exrstdattr/Makefile.in ---- OpenEXR-1.2.2/exrstdattr/Makefile.in 2005-03-09 20:29:31.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrstdattr/Makefile.in 2006-01-22 21:49:41.000000000 -0500 -@@ -233,7 +233,7 @@ + -rm -f *.$(OBJEXT) +--- openexr-1.4.0/exrstdattr/Makefile.in 2006-08-09 01:45:53.000000000 -0400 ++++ openexr-1.4.0-patched/exrstdattr/Makefile.in 2007-04-30 15:58:25.000000000 -0400 +@@ -268,7 +268,7 @@ done exrstdattr$(EXEEXT): $(exrstdattr_OBJECTS) $(exrstdattr_DEPENDENCIES) @rm -f exrstdattr$(EXEEXT) - $(CXXLINK) $(exrstdattr_LDFLAGS) $(exrstdattr_OBJECTS) $(exrstdattr_LDADD) $(LIBS) -+ $(CXXLINK) $(exrstdattr_LDADD) $(exrstdattr_OBJECTS) $(exrstdattr_LDFLAGS) $(LIBS) ++ $(CXXLINK) $(exrstdattr_LDADD) $(exrstdattr_LDFLAGS) $(exrstdattr_OBJECTS) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core ---- OpenEXR-1.2.2/exrdisplay/ImageView.cpp 2004-10-28 21:02:18.000000000 -0400 -+++ OpenEXR-1.2.2-new/exrdisplay/ImageView.cpp 2007-04-30 16:30:06.000000000 -0400 -@@ -54,8 +54,6 @@ - #endif - #include <windows.h> - #include <GL/gl.h> --#elif defined PLATFORM_DARWIN_PPC --#include <OpenGL/gl.h> - #else - #include <GL/gl.h> - #endif ---- OpenEXR-1.2.2/exrdisplay/ImageViewFragShader.cpp 2004-02-06 05:02:47.000000000 -0500 -+++ OpenEXR-1.2.2-new/exrdisplay/ImageViewFragShader.cpp 2007-04-30 16:30:14.000000000 -0400 -@@ -46,11 +46,7 @@ - - #include <ImageViewFragShader.h> - --#if defined PLATFORM_DARWIN_PPC --#include <OpenGL/glu.h> --#else - #include <GL/glu.h> --#endif - #define GLH_EXT_SINGLE_FILE - #include <glh/glh_extensions.h> - ---- OpenEXR-1.2.2/exrdisplay/ImageViewFragShader.h 2004-10-28 21:02:18.000000000 -0400 -+++ OpenEXR-1.2.2-new/exrdisplay/ImageViewFragShader.h 2007-04-30 16:30:22.000000000 -0400 -@@ -48,11 +48,7 @@ - #if defined PLATFORM_WINDOWS - #include <windows.h> - #endif --#if defined PLATFORM_DARWIN_PPC --#include <OpenGL/gl.h> --#else - #include <GL/gl.h> --#endif - - #include <string> - + -rm -f *.$(OBJEXT) Index: openexr.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/openexr.info,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- openexr.info 30 Apr 2007 20:46:54 -0000 1.10 +++ openexr.info 1 May 2007 15:47:50 -0000 1.11 @@ -1,30 +1,32 @@ Package: openexr -Version: 1.2.2 -Revision: 34 +Version: 1.4.0 +Revision: 1021 Description: Dynamic-range image file tools License: BSD Maintainer: Benjamin Reed <[EMAIL PROTECTED]> -Depends: fltk-x11-shlibs (>= 1.1.6-11.1), x11-shlibs -BuildDepends: fltk-x11 (>= 1.1.6-11.1), x11-dev +Depends: << + fltk-x11-shlibs, + x11-shlibs +<< +BuildDepends: << + fltk-x11, + x11-dev +<< GCC: 4.0 -Source: http://savannah.nongnu.org/download/%n/OpenEXR-%v.tar.gz -Source-MD5: a2e56af78dc47c7294ff188c8f78394b +Source: http://download.savannah.nongnu.org/releases/%n/%n-%va.tar.gz +Source-MD5: d0a4b9a930c766fa51561b05fb204afe +SourceDirectory: %n-%v Patch: %n.patch -PatchScript: perl -pi -e 's,-L\$\(top_builddir\)\S+,,g;s,-l(IlmImf|Imath|Half|Iex),\$(top_builddir)/\1/lib\1.la,g' `find . -name Makefile.in` -SetMAKEFLAGS: -j1 -NoSetMAKEFLAGS: true -ConfigureParams: --enable-shared=no --enable-imfexamples +ConfigureParams: --enable-shared=no --enable-imfexamples --disable-osx-universal-binaries --disable-dependency-tracking --with-gl-includes=/usr/X11R6/include InstallScript: << -#!/bin/sh -ev - - make install DESTDIR="%d" - install -d -m 755 %i/share/doc/%N - mv %i/share/doc/OpenEXR-%v/examples %i/share/doc/%N/ - rmdir %i/share/doc/OpenEXR-%v + make -j1 install DESTDIR="%d" + install -d -m 755 %i/share/doc/%N + mv %i/share/doc/OpenEXR-%v/examples %i/share/doc/%N/ + rmdir %i/share/doc/OpenEXR-%v << DocFiles: AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* doc/*.pdf SplitOff: << ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits