update to 1.0.0

changes:
-API extensions
-bugfixes

pkgsrc note: while the changelog doesn't tell details, there seems
to be an ABI incompatibility to the previous version. Bump the
bl3 dependency.

5 files changed, 96 insertions, 94 deletions

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 52b167f119e..ba4ef372b82 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/11/14 18:27:48 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2010/07/08 18:46:45 drochner Exp $
 #
 
-DISTNAME=	libmatroska-0.8.1
+DISTNAME=	libmatroska-1.0.0
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/libmatroska/PLIST b/multimedia/libmatroska/PLIST
index 63e5d2ef117..b4c81f899c3 100644
--- a/multimedia/libmatroska/PLIST
+++ b/multimedia/libmatroska/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:08:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/07/08 18:46:46 drochner Exp $
 include/matroska/FileKax.h
 include/matroska/KaxAttached.h
 include/matroska/KaxAttachments.h
@@ -12,6 +12,7 @@ include/matroska/KaxContentEncoding.h
 include/matroska/KaxContexts.h
 include/matroska/KaxCues.h
 include/matroska/KaxCuesData.h
+include/matroska/KaxDefines.h
 include/matroska/KaxInfo.h
 include/matroska/KaxInfoData.h
 include/matroska/KaxSeekHead.h
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
index ea581ac6e37..9b8a4e17319 100644
--- a/multimedia/libmatroska/buildlink3.mk
+++ b/multimedia/libmatroska/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/07/08 18:46:46 drochner Exp $
 #
 # This Makefile fragment is included by packages that use libmatroska.
 #
@@ -9,7 +9,7 @@ BUILDLINK_TREE+=	libmatroska
 LIBMATROSKA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmatroska+=	libmatroska>=0.8.0
-BUILDLINK_ABI_DEPENDS.libmatroska?=	libmatroska>=0.8.0nb1
+BUILDLINK_ABI_DEPENDS.libmatroska?=	libmatroska>=1.0.0
 BUILDLINK_PKGSRCDIR.libmatroska?=	../../multimedia/libmatroska
 
 .include "../../devel/libebml/buildlink3.mk"
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 18bff84bef7..b719ac940e8 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2007/11/14 18:27:48 drochner Exp $
+$NetBSD: distinfo,v 1.17 2010/07/08 18:46:46 drochner Exp $
 
-SHA1 (libmatroska-0.8.1.tar.bz2) = 8317c3a2a19f27a05c5dd289c3496c21a1d12456
-RMD160 (libmatroska-0.8.1.tar.bz2) = 195ca5fcf48653fea56e42ce4074d16447c680ac
-Size (libmatroska-0.8.1.tar.bz2) = 91381 bytes
-SHA1 (patch-ac) = 1fb682d09cb14bf1cfea1b396a3055bbf708383b
+SHA1 (libmatroska-1.0.0.tar.bz2) = 1f58217968a081bd550ec06f2d6beb81a7a3ac68
+RMD160 (libmatroska-1.0.0.tar.bz2) = fb6e3a775fa611cbfbab3f178a3170cb6544d51e
+Size (libmatroska-1.0.0.tar.bz2) = 83282 bytes
+SHA1 (patch-ac) = 31de08924cacfc7095456d236149769a3ab05ffd
diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac
index 2c7352c1512..74f0931fe1f 100644
--- a/multimedia/libmatroska/patches/patch-ac
+++ b/multimedia/libmatroska/patches/patch-ac
@@ -1,86 +1,87 @@
-$NetBSD: patch-ac,v 1.8 2007/11/14 18:27:48 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2010/07/08 18:46:46 drochner Exp $
 
---- make/linux/Makefile.orig	2006-06-02 16:32:52.000000000 +0200
+--- make/linux/Makefile.orig	2010-06-04 08:46:29.000000000 +0000
 +++ make/linux/Makefile
-@@ -16,15 +16,15 @@ prefix=/boot/home/config
- else
- prefix=/usr/local
- endif
--libdir=$(prefix)/lib
--includedir=$(prefix)/include/matroska
-+libdir=$(PREFIX)/lib
-+includedir=$(PREFIX)/include/matroska
- 
- # Programs
--CXX=g++
-+#CXX=g++
- LD=$(CXX)
--AR = ar rcvu
--RANLIB = ranlib
--INSTALL = install
-+AR += rcvu
-+#RANLIB = ranlib
-+INSTALL = $(BSD_INSTALL)
- INSTALL_OPTS = -m 644
- INSTALL_OPTS_LIB = -m 644
- INSTALL_DIR_OPTS = -m 755
-@@ -56,7 +56,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
- 
- # Names
- LIBRARY=libmatroska.a
--LIBRARY_SO=libmatroska.so
-+LIBRARY_SO=libmatroska.la
- LIBRARY_SO_VER=libmatroska.so.0
- 
- # source-files
-@@ -95,16 +95,14 @@ lib:
- 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- %.lo: %$(EXTENSION)
--	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+	$(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- $(LIBRARY): $(objects)
- 	$(AR) $@ $(objects)
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
--	rm -f $(LIBRARY_SO)
--	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-+	$(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
- 
- clean:	cleantest
- 	rm -f $(objects) $(objects_so)
-@@ -156,23 +154,22 @@ install: install_staticlib install_share
- endif
- 
- install_headers:
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
- 	for i in $(INCLUDE_DIR)/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
- 	done
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
- 	for i in $(INCLUDE_DIR)/c/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
- 	done
- 
- install_staticlib: $(LIBRARY)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
- 
- install_sharedlib: $(LIBRARY_SO)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
- 
- ifneq ($(wildcard .depend),)
- include .depend
+@@ -16,16 +16,16 @@ prefix=/boot/home/config

+ else

+ prefix=/usr/local

+ endif

+-libdir=$(prefix)/lib

+-includedir=$(prefix)/include/matroska

++libdir=$(PREFIX)/lib

++includedir=$(PREFIX)/include/matroska

+ 

+ # Programs

+ CROSS =

+-CXX = $(CROSS)g++

++#CXX = $(CROSS)g++

+ LD = $(CXX)

+-AR = $(CROSS)ar

+-RANLIB = $(CROSS)ranlib

+-INSTALL = install

++#AR = $(CROSS)ar

++#RANLIB = $(CROSS)ranlib

++INSTALL = $(BSD_INSTALL)

+ INSTALL_OPTS = -m 644

+ INSTALL_OPTS_LIB = -m 644

+ INSTALL_DIR_OPTS = -m 755

+@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)

+ 

+ # Names

+ LIBRARY=libmatroska.a

+-LIBRARY_SO=libmatroska.so

++LIBRARY_SO=libmatroska.la

+ LIBRARY_SO_VER=libmatroska.so.2

+ 

+ # source-files

+@@ -92,16 +92,14 @@ lib:

+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<

+ 

+ %.lo: %$(EXTENSION)

+-	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<

++	$(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<

+ 

+ $(LIBRARY): $(objects)

+ 	$(AR) rcvu $@ $(objects)

+ 	$(RANLIB) $@

+ 

+ $(LIBRARY_SO): $(objects_so)

+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml

+-	rm -f $(LIBRARY_SO)

+-	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)

++	$(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0

+ 

+ clean:	cleantest

+ 	rm -f $(objects) $(objects_so)

+@@ -153,23 +151,22 @@ install: install_staticlib install_share
+ endif

+ 

+ install_headers:

+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)

++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)

+ 	for i in $(INCLUDE_DIR)/*.h; do \

+-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \

++		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \

+ 	done

+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c

++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c

+ 	for i in $(INCLUDE_DIR)/c/*.h; do \

+-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \

++		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \

+ 	done

+ 

+ install_staticlib: $(LIBRARY)

+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

+-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)

++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)

+ 

+ install_sharedlib: $(LIBRARY_SO)

+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

+-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)

+-	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)

++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

++	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)

+ 

+ ifneq ($(wildcard .depend),)

+ include .depend