[csw-devel] SF.net SVN: gar:[13326] csw/mgar/pkg/libmatroska/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Feb 15 16:04:11 CET 2011


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

Log Message:
-----------
libmatroska: Update to 1.1.0 and split package

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

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

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

Modified: csw/mgar/pkg/libmatroska/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/Makefile	2011-02-15 14:27:47 UTC (rev 13325)
+++ csw/mgar/pkg/libmatroska/trunk/Makefile	2011-02-15 15:04:11 UTC (rev 13326)
@@ -1,21 +1,62 @@
 NAME = libmatroska
-VERSION = 0.8.1
+VERSION = 1.1.0
 CATEGORIES = lib
 
 DESCRIPTION = A C++ libary to parse Matroska files (.mkv and .mka)
 define BLURB
 endef
 
-MASTER_SITES = http://dl.matroska.org/downloads/libmatroska/libmatroska-0.8.1.tar.bz2
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = libmatroska-shared-library.diff
+MASTER_SITES = http://dl.matroska.org/downloads/libmatroska/
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
 
+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/
 
-RUNTIME_DEP_PKGS = CSWlibebml
+PACKAGES += CSWlibmatroska
+CATALOGNAME_CSWlibmatroska = libmatroska
+SPKG_DESC_CSWlibmatroska = Transitional package as contents moved to CSWlibmatroska3
+RUNTIME_DEP_PKGS_CSWlibmatroska += CSWlibmatroska3
+CHECKPKG_OVERRIDES_CSWlibmatroska += surplus-dependency|CSWlibmatroska3
+PKGFILES_CSWlibmatroska = NOFILES
+ARCHALL_CSWlibmatroska = 1
+
+PACKAGES += CSWlibmatroska-dev
+CATALOGNAME_CSWlibmatroska-dev = libmatroska_dev
+SPKG_DESC_CSWlibmatroska-dev = Development files for libmatroska
+RUNTIME_DEP_PKGS_CSWlibmatroska-dev = CSWlibmatroska3
+
+PACKAGES += CSWlibmatroska3
+CATALOGNAME_CSWlibmatroska3 = libmatroska3
+SPKG_DESC_CSWlibmatroska3 = Library for Extensible Binary Meta Language providing libmatroska.so.3
+PKGFILES_CSWlibmatroska3 = $(call baseisadirs,$(libdir),libmatroska\.so\.3(\.\d+)*)
+
+# These will go away after libebml has been released. We must release
+# matroska and ebml at the same time as I missed out setting a SONAME in libebml
+# which is references as simple .so by matroska ATM
+CHECKPKG_OVERRIDES_CSWlibmatroska3 += unidentified-dependency|CSWlibebml3
+CHECKPKG_OVERRIDES_CSWlibmatroska3 += soname-not-found|libebml.so.3|is|needed|by|opt/csw/lib/libmatroska.so.3
+CHECKPKG_OVERRIDES_CSWlibmatroska3 += soname-not-found|libebml.so.3|is|needed|by|opt/csw/lib/amd64/libmatroska.so.3
+CHECKPKG_OVERRIDES_CSWlibmatroska3 += surplus-dependency|CSWlibebml3
+
+LICENSE = LICENSE.LGPL
+
+BUILD64 = 1
+NOISALIST = 1
+
+CONFIGURE_SCRIPTS = 
+
+# Needed for shared library
+EXTRA_CFLAGS = -xcode=pic32
+EXTRA_CXXFLAGS = -xcode=pic32
+
+EXTRA_LINKER_FLAGS = -norunpath
+
+
+RUNTIME_DEP_PKGS = CSWlibebml3
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
 BUILD64 = 1

Modified: csw/mgar/pkg/libmatroska/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/checksums	2011-02-15 14:27:47 UTC (rev 13325)
+++ csw/mgar/pkg/libmatroska/trunk/checksums	2011-02-15 15:04:11 UTC (rev 13326)
@@ -1,2 +1 @@
-20cf624ace0c58a54c7752eebfbc0b19  libmatroska-0.8.1.tar.bz2
-154440024a5596dc63e4ec24ded01f24  libmatroska-shared-library.diff
+21e5ee3e2573f0ae99db195348bdfb98  libmatroska-1.1.0.tar.bz2

Added: csw/mgar/pkg/libmatroska/trunk/files/0001-Adjust-for-Solaris-shared-library.patch
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/files/0001-Adjust-for-Solaris-shared-library.patch	                        (rev 0)
+++ csw/mgar/pkg/libmatroska/trunk/files/0001-Adjust-for-Solaris-shared-library.patch	2011-02-15 15:04:11 UTC (rev 13326)
@@ -0,0 +1,25 @@
+From 9fb15795d72adaee45cb3e09fc2533c45769672c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 15 Feb 2011 15:42:11 +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 7685094..e58e378 100644
+--- a/make/linux/Makefile
++++ b/make/linux/Makefile
+@@ -99,7 +99,7 @@ $(LIBRARY): $(objects)
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++	$(CXX) -G $(LDFLAGS) -h $(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+ 	rm -f $(LIBRARY_SO)
+ 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ 
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff	2011-02-15 14:27:47 UTC (rev 13325)
+++ csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff	2011-02-15 15:04:11 UTC (rev 13326)
@@ -1,12 +0,0 @@
-diff -Naur libmatroska-0.8.1.orig/make/linux/Makefile libmatroska-0.8.1.patched/make/linux/Makefile
---- libmatroska-0.8.1.orig/make/linux/Makefile	2006-06-02 16:32:52.000000000 +0200
-+++ libmatroska-0.8.1.patched/make/linux/Makefile	2009-10-08 14:19:53.080322384 +0200
-@@ -102,7 +102,7 @@
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
-+	$(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
- 	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.


More information about the devel mailing list