Update to 1.4.2:

2015-01-04  Moritz Bunkus  <moritz@bunkus.org>

        * Released v1.4.2.

2014-12-21  Moritz Bunkus  <moritz@bunkus.org>

        * build system: switched the build system from hand-crafted
        Makefiles to an autoconf/automake-based system. A pkg-config file
        will be installed as well; its name is »libmatroska«. Based on a
        similar patch for libEBML by Jan Engelhardt <jengelh@inai.de>.

2014-12-20  Moritz Bunkus  <moritz@bunkus.org>

        * KaxBlock::ReadData(): fixed several instances of unchecked
        memory access leading to invalid memory access/segmentation faults
        with invalid or broken data inside block groups/simple blocks.

2014-12-19  Moritz Bunkus  <moritz@bunkus.org>

        * KaxBlock::ReadInternalHead(): fixed a off-by-one buffer overflow
        if with EBML lacing and exactly one frame in the lace.

3 files changed, 10 insertions, 86 deletions

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index bac17583d00..b53cecd74be 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2014/10/09 14:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/01/04 23:24:45 wiz Exp $
 
-DISTNAME=	libmatroska-1.4.1
-PKGREVISION=	1
+DISTNAME=	libmatroska-1.4.2
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,21 +12,12 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=		c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
+PKGCONFIG_OVERRIDE=	libmatroska.pc.in
 
-NO_CONFIGURE=		yes
-MAKEFLAGS+=		prefix=${PREFIX}
-MAKE_ENV+=		CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
-BUILD_DIRS=		make/linux
-BUILD_TARGET=		sharedlib
-INSTALL_TARGET=		install_headers install_sharedlib
+GNU_CONFIGURE=		yes
 TEST_TARGET=		test
 
-# remove CRs: fixes patching on Darwin and stops pkglint from complaining
-pre-patch:
-	cd ${WRKSRC}/make/linux && \
-		${TR} -d '\r' < Makefile > Makefile.new && \
-		${MV} Makefile.new Makefile
-
+BUILDLINK_API_DEPENDS.libebml+=	libebml>=1.3.1
 .include "../../devel/libebml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 5c40190b2f9..c9ccba5fd1f 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.23 2013/10/06 14:13:10 wiz Exp $
+$NetBSD: distinfo,v 1.24 2015/01/04 23:24:45 wiz Exp $
 
-SHA1 (libmatroska-1.4.1.tar.bz2) = e08c42531b68d21980bf991192378cf8cf79b40f
-RMD160 (libmatroska-1.4.1.tar.bz2) = 5074e5b3005ab6c12261bd0cfa2ce51bd271de78
-Size (libmatroska-1.4.1.tar.bz2) = 78387 bytes
-SHA1 (patch-ac) = f796c083bed2e38a03281a55f213cfffd6733f3a
+SHA1 (libmatroska-1.4.2.tar.bz2) = 546a761a763b2d1d15dbbccaa5495eb63dd87223
+RMD160 (libmatroska-1.4.2.tar.bz2) = 5db92e3c4a32cc5772cabfc85e4d3ecbf8870bdf
+Size (libmatroska-1.4.2.tar.bz2) = 611057 bytes
diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac
deleted file mode 100644
index 169f099440d..00000000000
--- a/multimedia/libmatroska/patches/patch-ac
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ac,v 1.15 2013/10/06 14:13:10 wiz Exp $
-
---- make/linux/Makefile.orig	2013-10-06 13:52:12.000000000 +0000
-+++ make/linux/Makefile
-@@ -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
-@@ -63,7 +63,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
- 
- # Names
- LIBRARY=libmatroska.a
--LIBRARY_SO=libmatroska.so
-+LIBRARY_SO=libmatroska.la
- LIBRARY_SO_VER=libmatroska.so.6
- 
- # source-files
-@@ -97,16 +97,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)
-@@ -169,8 +167,7 @@ install_staticlib: $(LIBRARY)
- 
- install_sharedlib: $(LIBRARY_SO)
- 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
--	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
-+	libtool --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
- 
- ifneq ($(wildcard .depend),)
- include .depend