Hi, an attempt to update libmatroska (mkvtoolnix still in WIP).
j. cvs server: Diffing libmatroska Index: libmatroska/Makefile =================================================================== RCS file: /cvs/ports/multimedia/libmatroska/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- libmatroska/Makefile 16 Mar 2015 18:07:51 -0000 1.13 +++ libmatroska/Makefile 30 Mar 2015 16:30:57 -0000 @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2015/03/16 18:07:51 naddy Exp $ +# $OpenBSD: Makefile,v 1.12 2013/03/11 11:35:44 espie Exp $ COMMENT= extensible open standard audio/video container library -DISTNAME= libmatroska-1.3.0 +DISTNAME= libmatroska-1.4.2 CATEGORIES= multimedia MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ EXTRACT_SUFX= .tar.bz2 -REVISION= 0 SHARED_LIBS= matroska 3.0 @@ -17,25 +16,15 @@ MAINTAINER= Brad Smith <b...@comstyle.co # LGPLv2.1+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB= ebml>=2.1 m stdc++ +WANTLIB+= m stdc++ -LIB_DEPENDS= textproc/libebml>=1.2.2 - -MAKE_ENV+= LIBmatroska_VERSION=${LIBmatroska_VERSION} -MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LOCALBASE=${LOCALBASE} -FAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} +BUILD_DEPENDS= textproc/libebml>=1.3.1 USE_GMAKE= Yes +USE_LIBTOOL= Yes -TEST_TARGET= test - -WRKSRC= ${WRKDIST}/make/linux +CONFIGURE_STYLE=gnu -post-extract: - @perl -pi -e 's/\r\n/\n/;' ${WRKSRC}/Makefile - @piconv -t utf-8 ${WRKDIST}/test/mux/test6.cpp \ - >${WRKDIST}/test/mux/test6.cpp.tmp \ - && mv ${WRKDIST}/test/mux/test6.cpp.tmp \ - ${WRKDIST}/test/mux/test6.cpp +TEST_TARGET= test .include <bsd.port.mk> Index: libmatroska/distinfo =================================================================== RCS file: /cvs/ports/multimedia/libmatroska/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- libmatroska/distinfo 18 Jan 2015 03:14:35 -0000 1.7 +++ libmatroska/distinfo 30 Mar 2015 16:30:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (libmatroska-1.3.0.tar.bz2) = UjHslYVxNl5xmm/TwiAievbPDxTgvRvPdm3bwGjRjmk= -SIZE (libmatroska-1.3.0.tar.bz2) = 80542 +SHA256 (libmatroska-1.4.2.tar.bz2) = vqEDIPHx/RIbvX25/8d7JRjoJp8AkDVJxUJUeLv4OT8= +SIZE (libmatroska-1.4.2.tar.bz2) = 611057 cvs server: Diffing libmatroska/patches Index: libmatroska/patches/patch-make_linux_Makefile =================================================================== RCS file: libmatroska/patches/patch-make_linux_Makefile diff -N libmatroska/patches/patch-make_linux_Makefile --- libmatroska/patches/patch-make_linux_Makefile 4 Oct 2011 08:59:41 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,86 +0,0 @@ -$OpenBSD: patch-make_linux_Makefile,v 1.5 2011/10/04 08:59:41 giovanni Exp $ ---- make/linux/Makefile.orig Sun Oct 2 16:04:20 2011 -+++ make/linux/Makefile Sun Oct 2 16:05:23 2011 -@@ -33,8 +33,8 @@ INSTALL_DIR_OPTS = -m 755 - CWD=$(shell pwd) - - # Options --LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml --LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux -+LIBEBML_INCLUDE_DIR=$(LOCALBASE)/include -+LIBEBML_LIB_DIR=$(LOCALBASE)/lib - EXTENSION=.cpp - - ifeq (yes,$(DEBUG)) -@@ -53,8 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV) - - # Names - LIBRARY=libmatroska.a --LIBRARY_SO=libmatroska.so --LIBRARY_SO_VER=libmatroska.so.5 -+LIBRARY_SO_VER=libmatroska.so.${LIBmatroska_VERSION} - - # source-files - sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) -@@ -81,7 +80,7 @@ endif - - staticlib: $(LIBRARY) - --sharedlib: $(LIBRARY_SO) -+sharedlib: $(LIBRARY_SO_VER) - - lib: - @echo "Use the 'staticlib', 'sharedlib' or 'all' targets." -@@ -98,15 +97,12 @@ $(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) -+$(LIBRARY_SO_VER): $(objects_so) -+ $(CXX) -shared -fPIC -o $(LIBRARY_SO_VER) $(objects_so) $(LINKFLAGS) -lebml - - clean: cleantest - rm -f $(objects) $(objects_so) - rm -f $(LIBRARY) -- rm -f $(LIBRARY_SO) - rm -f $(LIBRARY_SO_VER) - rm -f CORE - -@@ -128,19 +124,19 @@ depend: - - test: test6 test9 - --test6: test6.o $(LIBRARY) $(LIBRARY_SO) -+test6: test6.o $(LIBRARY) $(LIBRARY_SO_VER) - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) - - test6.o: $(MUX_SRC_DIR)test6.cpp - $(CXX) -c $(COMPILEFLAGS) -o $@ $< - --test8: test8.o $(LIBRARY) $(LIBRARY_SO) -+test8: test8.o $(LIBRARY) $(LIBRARY_SO_VER) - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) - - test8.o: $(MUX_SRC_DIR)test8.cpp - $(CXX) -c $(COMPILEFLAGS) -o $@ $< - --test9: test9.o $(LIBRARY) $(LIBRARY_SO) -+test9: test9.o $(LIBRARY) $(LIBRARY_SO_VER) - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) - - test9.o: $(TAG_SRC_DIR)test9.cpp -@@ -166,10 +162,9 @@ install_staticlib: $(LIBRARY) - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) - --install_sharedlib: $(LIBRARY_SO) -+install_sharedlib: $(LIBRARY_SO_VER) - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) - - ifneq ($(wildcard .depend),) - include .depend cvs server: Diffing libmatroska/pkg Index: libmatroska/pkg/PLIST =================================================================== RCS file: /cvs/ports/multimedia/libmatroska/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- libmatroska/pkg/PLIST 16 Mar 2015 18:07:51 -0000 1.5 +++ libmatroska/pkg/PLIST 30 Mar 2015 16:30:57 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:51 naddy Exp $ +@comment $OpenBSD$ include/matroska/ include/matroska/FileKax.h include/matroska/KaxAttached.h @@ -31,4 +31,6 @@ include/matroska/c/ include/matroska/c/libmatroska.h include/matroska/c/libmatroska_t.h lib/libmatroska.a +lib/libmatroska.la @lib lib/libmatroska.so.${LIBmatroska_VERSION} +lib/pkgconfig/libmatroska.pc
