[csw-devel] SF.net SVN: gar:[13325] csw/mgar/pkg/libebml/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13325
          http://gar.svn.sourceforge.net/gar/?rev=13325&view=rev
Author:   dmichelsen
Date:     2011-02-15 14:27:47 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------
libebml: Update to 1.2.0 and split packages

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

Added Paths:
-----------
    csw/mgar/pkg/libebml/trunk/files/0001-Adjust-for-Solaris-shared-library.patch

Removed Paths:
-------------
    csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff

Modified: csw/mgar/pkg/libebml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libebml/trunk/Makefile	2011-02-15 12:41:50 UTC (rev 13324)
+++ csw/mgar/pkg/libebml/trunk/Makefile	2011-02-15 14:27:47 UTC (rev 13325)
@@ -1,5 +1,5 @@
 NAME = libebml
-VERSION = 0.7.8
+VERSION = 1.2.0
 CATEGORIES = lib
 
 DESCRIPTION = Library for Extensible Binary Meta Language
@@ -8,13 +8,34 @@
 
 MASTER_SITES = http://dl.matroska.org/downloads/libebml/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = libebml-shared-library.diff
 
+PATCHFILES += 0001-Adjust-for-Solaris-shared-library.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-SPKG_SOURCEURL = http://www.matroska.org/
+VENDOR_URL = http://www.matroska.org/
 
+PACKAGES += CSWlibebml
+CATALOGNAME_CSWlibebml = libebml
+SPKG_DESC_CSWlibebml = Transitional package as contents moved to CSWlibebml3
+RUNTIME_DEP_PKGS_CSWlibebml += CSWlibebml3
+CHECKPKG_OVERRIDES_CSWlibebml += surplus-dependency|CSWlibebml3
+PKGFILES_CSWlibebml = NOFILES
+ARCHALL_CSWlibebml = 1
+
+PACKAGES += CSWlibebml-dev
+CATALOGNAME_CSWlibebml-dev = libebml_dev
+SPKG_DESC_CSWlibebml-dev = Development files for libebml
+RUNTIME_DEP_PKGS_CSWlibebml-dev = CSWlibebml3
+
+PACKAGES += CSWlibebml3
+CATALOGNAME_CSWlibebml3 = libebml3
+SPKG_DESC_CSWlibebml3 = Library for Extensible Binary Meta Language providing libebml.so.3
+PKGFILES_CSWlibebml3 = $(call baseisadirs,$(libdir),libebml\.so\.3(\.\d+)*)
+
+LICENSE = LICENSE.LGPL
+
 BUILD64 = 1
 NOISALIST = 1
 
@@ -24,6 +45,8 @@
 EXTRA_CFLAGS = -xcode=pic32
 EXTRA_CXXFLAGS = -xcode=pic32
 
+EXTRA_LINKER_FLAGS = -norunpath
+
 WARNINGFLAGS =
 BUILD_OVERRIDE_DIRS = CC CXX LD CFLAGS WARNINGFLAGS
 BUILD_SCRIPTS = $(WORKSRC)/make/linux/Makefile

Modified: csw/mgar/pkg/libebml/trunk/checksums
===================================================================
--- csw/mgar/pkg/libebml/trunk/checksums	2011-02-15 12:41:50 UTC (rev 13324)
+++ csw/mgar/pkg/libebml/trunk/checksums	2011-02-15 14:27:47 UTC (rev 13325)
@@ -1,2 +1 @@
-6278109f52e4f9d2c8a8dfc0d668b587  libebml-0.7.8.tar.bz2
-da5e2aaafdcba2c1bc83dba1e8ce2721  libebml-shared-library.diff
+26fbaa556bb497c1134d33b84ab34443  libebml-1.2.0.tar.bz2

Added: csw/mgar/pkg/libebml/trunk/files/0001-Adjust-for-Solaris-shared-library.patch
===================================================================
--- csw/mgar/pkg/libebml/trunk/files/0001-Adjust-for-Solaris-shared-library.patch	                        (rev 0)
+++ csw/mgar/pkg/libebml/trunk/files/0001-Adjust-for-Solaris-shared-library.patch	2011-02-15 14:27:47 UTC (rev 13325)
@@ -0,0 +1,25 @@
+From af6f42624cedec3056e50aa7a8841e216023d267 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 15 Feb 2011 14:14:28 +0100
+Subject: [PATCH] Adjust for Solaris shared library
+
+---
+ make/linux/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/make/linux/Makefile b/make/linux/Makefile
+index 8f86b59..989bd13 100644
+--- a/make/linux/Makefile
++++ b/make/linux/Makefile
+@@ -91,7 +91,7 @@ $(LIBRARY): $(objects)
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
++	$(CXX) -G $(LDFLAGS) -h $(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+ 	rm -f $(LIBRARY_SO)
+ 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ 
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff
===================================================================
--- csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff	2011-02-15 12:41:50 UTC (rev 13324)
+++ csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff	2011-02-15 14:27:47 UTC (rev 13325)
@@ -1,12 +0,0 @@
-diff -Naur libebml-0.7.8.orig/make/linux/Makefile libebml-0.7.8.patched/make/linux/Makefile
---- libebml-0.7.8.orig/make/linux/Makefile	2006-06-02 16:32:15.000000000 +0200
-+++ libebml-0.7.8.patched/make/linux/Makefile	2009-10-08 10:49:26.151491509 +0200
-@@ -94,7 +94,7 @@
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
-+	$(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so)
- 	rm -f $(LIBRARY_SO)
- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
- 


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