[csw-devel] SF.net SVN: gar:[7862] csw/mgar/pkg/openexr/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Mon Jan 4 20:05:04 CET 2010


Revision: 7862
          http://gar.svn.sourceforge.net/gar/?rev=7862&view=rev
Author:   hson
Date:     2010-01-04 19:01:36 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
Split package into two
Prepare for 64-bit build pending ilmbase install

Modified Paths:
--------------
    csw/mgar/pkg/openexr/trunk/Makefile
    csw/mgar/pkg/openexr/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch
    csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch

Modified: csw/mgar/pkg/openexr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openexr/trunk/Makefile	2010-01-04 16:27:14 UTC (rev 7861)
+++ csw/mgar/pkg/openexr/trunk/Makefile	2010-01-04 19:01:36 UTC (rev 7862)
@@ -22,27 +22,52 @@
 DISTFILES += libIlmImf.so.2.0.2.i
 DISTFILES += libIlmImf.so.2.0.2.s
 
+PACKAGES = CSWopenexr CSWopenexrdevel
+CATALOGNAME_CSWopenexr = openexr
+CATALOGNAME_CSWopenexrdevel = openexr_devel
+
+SPKG_DESC_CSWopenexr += High dynamic-range (HDR) image file format developed by Industrial Light & Magic
+SPKG_DESC_CSWopenexrdevel += High dynamic-range (HDR) image file format developed by Industrial Light & Magic - developer package
+
+PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL)
+
+REQUIRED_PKGS_CSWopenexr += CSWilmbase CSWzlib
+REQUIRED_PKGS_CSWopenexrdevel += CSWopenexr
+
 SPKG_SOURCEURL = http://www.openexr.com
+
 LICENSE = LICENSE 
 
-REQUIRED_PKGS += CSWilmbase CSWzlib
-
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PATCHFILES += ltmain.sh.patch
+PATCHFILES += makePreview.cpp.patch
 
-LIBS += -lCstd -lCrun -lc -lm
-export LIBS
+EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm
+EXTRA_CXX_FLAGS_isa-i386    = 
+EXTRA_CXX_FLAGS_isa-sparcv8 = 
+EXTRA_CXX_FLAGS_isa-amd64   = -KPIC
+EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC
+EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION))
 
-TEST_SCRIPTS =
+BUILD64 = 1
 
+# Check fails if library isn't installed /opt/csw/lib and until a 64-bit
+# lib is installed test has to be disabled
+TEST_TARGET = check
+#TEST_TARGET = 
+
+STRIP_LIBTOOL = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
 include gar/category.mk
 
+# Until kdeoffice_gcc is rebuilt using new openexr/ilmbase
 post-install-isa-sparcv8:
 	@cp $(FILEDIR)/libIlmImf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2
-	@ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi )
 
 post-install-isa-i386:
 	@cp $(FILEDIR)/libIlmImf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2
-	@ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi )

Modified: csw/mgar/pkg/openexr/trunk/checksums
===================================================================
--- csw/mgar/pkg/openexr/trunk/checksums	2010-01-04 16:27:14 UTC (rev 7861)
+++ csw/mgar/pkg/openexr/trunk/checksums	2010-01-04 19:01:36 UTC (rev 7862)
@@ -1,3 +1,5 @@
-11951f164f9c872b183df75e66de145a  download/openexr-1.6.1.tar.gz
-0d08a0c9f251d385b5d3c86ac7da84e5  download/libIlmImf.so.2.0.2.i
-32dec457461b5d371eb2dd4a2e5d2231  download/libIlmImf.so.2.0.2.s
+0d08a0c9f251d385b5d3c86ac7da84e5  libIlmImf.so.2.0.2.i
+32dec457461b5d371eb2dd4a2e5d2231  libIlmImf.so.2.0.2.s
+aab7ae39a7fc1317192aa5663e0ba3d7  ltmain.sh.patch
+462c6cb9708c254261fd1515c1294336  makePreview.cpp.patch
+11951f164f9c872b183df75e66de145a  openexr-1.6.1.tar.gz

Added: csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch
===================================================================
--- csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch	                        (rev 0)
+++ csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch	2010-01-04 19:01:36 UTC (rev 7862)
@@ -0,0 +1,43 @@
+diff -Nru openexr-1.6.1.orig/ltmain.sh openexr-1.6.1/ltmain.sh
+--- openexr-1.6.1.orig/ltmain.sh	2004-05-24 20:14:34.000000000 +0200
++++ openexr-1.6.1/ltmain.sh	2010-01-04 18:01:46.879978336 +0100
+@@ -1382,7 +1382,7 @@
+       # but this is not reliable with gcc because gcc may use -mfoo to
+       # select a different linker, different libraries, etc, while
+       # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      -m*|-xarch=*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1393,9 +1393,10 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
++# 64-bit fix for CC
++#        if test "$with_gcc" = "yes" ; then
+           compiler_flags="$compiler_flags $arg"
+-        fi
++#        fi
+         continue
+         ;;
+ 
+@@ -3890,7 +3891,7 @@
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
+-	  eval cmd=\"$cmd\"
++	  eval cmd=\"$cmd -norunpath\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -4512,7 +4513,7 @@
+ 	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+       else
+ 	if test "$fast_install" != no; then
+-	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  link_command="$finalize_var$compile_command -norunpath"
+ 	  if test "$fast_install" = yes; then
+ 	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ 	  else

Added: csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch
===================================================================
--- csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch	                        (rev 0)
+++ csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch	2010-01-04 19:01:36 UTC (rev 7862)
@@ -0,0 +1,23 @@
+diff -Nru openexr-1.6.1.orig/exrmakepreview/makePreview.cpp openexr-1.6.1/exrmakepreview/makePreview.cpp
+--- openexr-1.6.1.orig/exrmakepreview/makePreview.cpp	2006-06-06 07:58:20.000000000 +0200
++++ openexr-1.6.1/exrmakepreview/makePreview.cpp	2010-01-04 17:58:55.457462356 +0100
+@@ -78,7 +78,8 @@
+     // at 0.0, 0.0, and 5.0 respectively.
+     //
+ 
+-    float x = max (0.f, h * m);
++    float x = max (0.f, (float)(h * m));
++
+ 
+     if (x > 1)
+ 	x = 1 + knee (x - 1, 0.184874f);
+@@ -132,7 +133,8 @@
+ 	    preview.r = gamma (pixel.r, m);
+ 	    preview.g = gamma (pixel.g, m);
+ 	    preview.b = gamma (pixel.b, m);
+-	    preview.a = int (clamp (pixel.a * 255.f, 0.f, 255.f) + .5f);
++	    preview.a = int (clamp ((double)(pixel.a * 255.f), (double)0.f, (double)255.f) + .5f);
++
+ 	}
+     }
+ }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list