[csw-devel] SF.net SVN: gar:[16591] csw/mgar/pkg/ilmbase/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Dec 21 15:53:50 CET 2011 

Revision: 16591
          http://gar.svn.sourceforge.net/gar/?rev=16591&view=rev
Author:   dmichelsen
Date:     2011-12-21 14:53:50 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
ilmbase/trunk: Update to 1.0.2 and general rework

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

Removed Paths:
-------------
    csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.i
    csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.s
    csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.i
    csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.s
    csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.i
    csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.s
    csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch

Property Changed:
----------------
    csw/mgar/pkg/ilmbase/trunk/


Property changes on: csw/mgar/pkg/ilmbase/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/ilmbase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/Makefile	2011-12-21 14:50:32 UTC (rev 16590)
+++ csw/mgar/pkg/ilmbase/trunk/Makefile	2011-12-21 14:53:50 UTC (rev 16591)
@@ -1,5 +1,5 @@
 NAME = ilmbase
-VERSION = 1.0.1
+VERSION = 1.0.2
 CATEGORIES = lib
 
 DESCRIPTION = Base libraries used by OpenEXR
@@ -22,87 +22,52 @@
 
 MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += libHalf.so.2.0.2.i
-DISTFILES += libHalf.so.2.0.2.s
-DISTFILES += libIex.so.2.0.2.i
-DISTFILES += libIex.so.2.0.2.s
-DISTFILES += libImath.so.2.0.2.i
-DISTFILES += libImath.so.2.0.2.s
 
-PACKAGES = CSWilmbase CSWilmbasedevel
-CATALOGNAME_CSWilmbase = ilmbase
-CATALOGNAME_CSWilmbasedevel = ilmbase_devel
+PATCHFILES += ImathMath.patch
 
-SPKG_DESC_CSWilmbase += Base libraries used by OpenEXR
-SPKG_DESC_CSWilmbasedevel += Base libraries used by OpenEXR - developer package
+VENDOR_URL = http://www.openexr.com
 
-PKGFILES_CSWilmbasedevel = $(PKGFILES_DEVEL)
+LICENSE = LICENSE
 
-RUNTIME_DEP_PKGS_CSWilmbase += 
-RUNTIME_DEP_PKGS_CSWilmbasedevel += CSWilmbase
+PACKAGES += CSWlibhalf6
+SPKG_DESC_CSWlibhalf6 += $(DESCRIPTION), libHalf.so.6
+PKGFILES_CSWlibhalf6 += $(call pkgfiles_lib,libHalf.so.6)
+OBSOLETED_BY_CSWlibhalf6 += CSWilmbase
+RUNTIME_DEP_PKGS_CSWlibilmthread6 += CSWlibiex6
 
+PACKAGES += CSWlibiex6
+SPKG_DESC_CSWlibiex6 += $(DESCRIPTION), libIex.so.6
+PKGFILES_CSWlibiex6 += $(call pkgfiles_lib,libIex.so.6)
+OBSOLETED_BY_CSWlibiex6 += CSWilmbase
 
-CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIex.so.2.0.2
-CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libHalf.so.2.0.2
-CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.2.0.2
-CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIlmThread.so.6.0.0
-CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.6.0.0
+PACKAGES += CSWlibilmthread6
+SPKG_DESC_CSWlibilmthread6 += $(DESCRIPTION), libIlmThread.so.6
+PKGFILES_CSWlibilmthread6 += $(call pkgfiles_lib,libIlmThread.so.6)
+OBSOLETED_BY_CSWlibilmthread6 += CSWilmbase
 
-SPKG_SOURCEURL = http://www.openexr.com
+PACKAGES += CSWlibimath6
+SPKG_DESC_CSWlibimath6 += $(DESCRIPTION), libImath.so.6
+PKGFILES_CSWlibimath6 += $(call pkgfiles_lib,libImath.so.6)
+RUNTIME_DEP_PKGS_CSWlibimath6 += CSWlibiex6
+OBSOLETED_BY_CSWlibimath6 += CSWilmbase
 
-LICENSE = LICENSE
+PACKAGES += CSWilmbase-dev
+SPKG_DESC_CSWilmbase-dev += Development files for ILM base libraries
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibilmthread6
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibhalf6
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibiex6
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibimath6
+OBSOLETED_BY_CSWilmbase-dev += CSWilmbasedevel
+CATALOGNAME_CSWilmbasedevel = ilmbase_devel_stub
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-UPSTREAM_MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/
+EXTRA_LD_FLAGS = -lm
 
-CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_CXXFLAGS += -norunpath
+REINPLACE_MATCH = (\|-xarch=)
+REINPLACE_WITH = |-norunpath$$1
+REINPLACE_FILES += ltmain.sh
 
-PATCHFILES = ImathMath.patch
-PATCHFILES += ltmain.sh.patch
-
-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))
-
 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
-
 include gar/category.mk
-
-#
-# Test to see if rebuilding libtool would fix 64-bit problem...
-#
-#pre-configure-modulated:
-#	@echo " ==> Regenerating build tools..."
-#	@(cd $(WORKSRC) ; \
-#		aclocal                       && \
-#		autoconf                      && \
-#		libtoolize --automake --force && \
-#		aclocal                       && \
-#		automake -a )
-#	@$(MAKECOOKIE)
-
-post-install-isa-sparcv8:
-	@cp $(FILEDIR)/libHalf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2
-	@cp $(FILEDIR)/libIex.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2
-	@cp $(FILEDIR)/libImath.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi )
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi )
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi )
-
-post-install-isa-i386:
-	@cp $(FILEDIR)/libHalf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2
-	@cp $(FILEDIR)/libIex.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2
-	@cp $(FILEDIR)/libImath.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi )
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi )
-	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi )

Modified: csw/mgar/pkg/ilmbase/trunk/checksums
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/checksums	2011-12-21 14:50:32 UTC (rev 16590)
+++ csw/mgar/pkg/ilmbase/trunk/checksums	2011-12-21 14:53:50 UTC (rev 16591)
@@ -1,9 +1 @@
-6873969f50e5d1c43ec93a90a65d85bd  ImathMath.patch
-f76f094e69a6079b0beb93d97e2a217e  ilmbase-1.0.1.tar.gz
-b7daafc6a6c92a3cf9dfb47e24fa630f  libHalf.so.2.0.2.i
-cdce2f2b1c7d00dc76124ecb5418b9a2  libHalf.so.2.0.2.s
-1b589f5b747846688c27f55de9b1ec7a  libIex.so.2.0.2.i
-ddf913c9000dc4580ad330b9dd938826  libIex.so.2.0.2.s
-756523f803ce1be3e125b6ce63e3183c  libImath.so.2.0.2.i
-ce47a211381deadfc38722f5abda54d7  libImath.so.2.0.2.s
-f1016498bff3cce0c722108f4603e6c5  ltmain.sh.patch
+26c133ee8ca48e1196fbfb3ffe292ab4  ilmbase-1.0.2.tar.gz

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.s
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.s
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.s
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch	2011-12-21 14:50:32 UTC (rev 16590)
+++ csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch	2011-12-21 14:53:50 UTC (rev 16591)
@@ -1,24 +0,0 @@
---- ilmbase-1.0.1.orig/ltmain.sh	2006-12-16 00:23:48.000000000 +0100
-+++ ilmbase-1.0.1/ltmain.sh	2010-01-04 03:01:58.123927193 +0100
-@@ -1553,9 +1553,10 @@
- 	esac
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
--        if test "$with_gcc" = "yes" ; then
-+# Fix for 64-bit CC
-+#        if test "$with_gcc" = "yes" ; then
-           compiler_flags="$compiler_flags $arg"
--        fi
-+#        fi
-         continue
-         ;;
- 
-@@ -4015,7 +4016,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

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