Fri Oct 4 20:58:44 2013 UTC ()
Update to 1.4.1:

New 1.4.1 version:
    - Added new elements/classes DiscardPadding, CodecDelay and
      SeekPreRoll
    - The licensing information has been cleared up/unified.
    - The Makefile now contain options for specifying the destination
      base directory during installation ("DESTDIR") and for
      specifying which library types to build ("link").
    - The libraries are built without the "-ansi" and
      "-fno-gnu-keywords" flags on Linux
    - Code cleanup


(wiz)
diff -r1.29 -r1.30 pkgsrc/multimedia/libmatroska/Makefile
diff -r1.21 -r1.22 pkgsrc/multimedia/libmatroska/distinfo
diff -r1.13 -r1.14 pkgsrc/multimedia/libmatroska/patches/patch-ac
cvs diff -r1.29 -r1.30 pkgsrc/multimedia/libmatroska/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/Makefile 2013/04/12 13:36:56 1.29
+++ pkgsrc/multimedia/libmatroska/Makefile 2013/10/04 20:58:44 1.30
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.29 2013/04/12 13:36:56 drochner Exp $ 1# $NetBSD: Makefile,v 1.30 2013/10/04 20:58:44 wiz Exp $
2 2
3DISTNAME= libmatroska-1.4.0 3DISTNAME= libmatroska-1.4.1
4CATEGORIES= multimedia devel 4CATEGORIES= multimedia devel
5MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ 5MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= salo@NetBSD.org 8MAINTAINER= salo@NetBSD.org
9HOMEPAGE= http://www.matroska.org/ 9HOMEPAGE= http://www.matroska.org/
10COMMENT= Extensible open standard Audio/Video container format 10COMMENT= Extensible open standard Audio/Video container format
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15USE_LANGUAGES= c++ 15USE_LANGUAGES= c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/libmatroska/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/distinfo 2013/04/12 13:36:56 1.21
+++ pkgsrc/multimedia/libmatroska/distinfo 2013/10/04 20:58:44 1.22
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.21 2013/04/12 13:36:56 drochner Exp $ 1$NetBSD: distinfo,v 1.22 2013/10/04 20:58:44 wiz Exp $
2 2
3SHA1 (libmatroska-1.4.0.tar.bz2) = e2cd74cef7eb6d0223251e755a7af8d283d650e5 3SHA1 (libmatroska-1.4.1.tar.bz2) = e08c42531b68d21980bf991192378cf8cf79b40f
4RMD160 (libmatroska-1.4.0.tar.bz2) = b64136b2ffc1913dda3f3418ab4de3241556f3e1 4RMD160 (libmatroska-1.4.1.tar.bz2) = 5074e5b3005ab6c12261bd0cfa2ce51bd271de78
5Size (libmatroska-1.4.0.tar.bz2) = 78705 bytes 5Size (libmatroska-1.4.1.tar.bz2) = 78387 bytes
6SHA1 (patch-ac) = aa13a5616a09f09942a357cb3f0b82a15ca58f5d 6SHA1 (patch-ac) = 090d21b94deab12fc469fe52314cde7214562625
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac 2013/04/12 13:36:56 1.13
+++ pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac 2013/10/04 20:58:44 1.14
@@ -1,87 +1,65 @@ @@ -1,87 +1,65 @@
1$NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $ 1$NetBSD: patch-ac,v 1.14 2013/10/04 20:58:44 wiz Exp $
2 2
3--- make/linux/Makefile.orig 2013-03-21 12:11:24.000000000 +0000 3--- make/linux/Makefile.orig 2013-10-04 20:56:20.000000000 +0000
4+++ make/linux/Makefile 4+++ make/linux/Makefile
5@@ -16,16 +16,16 @@ prefix=/boot/home/config 5@@ -16,16 +16,16 @@ prefix=/boot/home/config
6 else 6 else
7 prefix=/usr/local 7 prefix=/usr/local
8 endif 8 endif
9-libdir=$(prefix)/lib 9-libdir=$(prefix)/lib
10-includedir=$(prefix)/include/matroska 10-includedir=$(prefix)/include/matroska
11+libdir=$(PREFIX)/lib 11+libdir=$(PREFIX)/lib
12+includedir=$(PREFIX)/include/matroska 12+includedir=$(PREFIX)/include/matroska
13  13
14 # Programs 14 # Programs
15 CROSS = 15 CROSS =
16-CXX = $(CROSS)g++ 16-CXX = $(CROSS)g++
17+#CXX = $(CROSS)g++ 17+#CXX = $(CROSS)g++
18 LD = $(CXX) 18 LD = $(CXX)
19-AR = $(CROSS)ar 19-AR = $(CROSS)ar
20-RANLIB = $(CROSS)ranlib 20-RANLIB = $(CROSS)ranlib
21-INSTALL = install 21-INSTALL = install
22+#AR = $(CROSS)ar 22+#AR = $(CROSS)ar
23+#RANLIB = $(CROSS)ranlib 23+#RANLIB = $(CROSS)ranlib
24+INSTALL = $(BSD_INSTALL) 24+INSTALL = $(BSD_INSTALL)
25 INSTALL_OPTS = -m 644 25 INSTALL_OPTS = -m 644
26 INSTALL_OPTS_LIB = -m 644 26 INSTALL_OPTS_LIB = -m 644
27 INSTALL_DIR_OPTS = -m 755 27 INSTALL_DIR_OPTS = -m 755
28@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV) 28@@ -63,7 +63,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
29  29
30 # Names 30 # Names
31 LIBRARY=libmatroska.a 31 LIBRARY=libmatroska.a
32-LIBRARY_SO=libmatroska.so 32-LIBRARY_SO=libmatroska.so
33+LIBRARY_SO=libmatroska.la 33+LIBRARY_SO=libmatroska.la
34 LIBRARY_SO_VER=libmatroska.so.6 34 LIBRARY_SO_VER=libmatroska.so.6
35  35
36 # source-files 36 # source-files
37@@ -92,16 +92,14 @@ lib: 37@@ -97,16 +97,14 @@ lib:
38 $(CXX) -c $(COMPILEFLAGS) -o $@ $< 38 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
39  39
40 %.lo: %$(EXTENSION) 40 %.lo: %$(EXTENSION)
41- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< 41- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
42+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $< 42+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
43  43
44 $(LIBRARY): $(objects) 44 $(LIBRARY): $(objects)
45 $(AR) rcvu $@ $(objects) 45 $(AR) rcvu $@ $(objects)
46 $(RANLIB) $@ 46 $(RANLIB) $@
47  47
48 $(LIBRARY_SO): $(objects_so) 48 $(LIBRARY_SO): $(objects_so)
49- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml 49- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
50- rm -f $(LIBRARY_SO) 50- rm -f $(LIBRARY_SO)
51- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) 51- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
52+ $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0 52+ $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
53  53
54 clean: cleantest 54 clean: cleantest
55 rm -f $(objects) $(objects_so) 55 rm -f $(objects) $(objects_so)
56@@ -153,23 +151,22 @@ install: install_staticlib install_share 56@@ -169,8 +167,7 @@ install_staticlib: $(LIBRARY)
57 endif 
58  
59 install_headers: 
60- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) 
61+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) 
62 for i in $(INCLUDE_DIR)/*.h; do \ 
63- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ 
64+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ 
65 done 
66- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c 
67+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c 
68 for i in $(INCLUDE_DIR)/c/*.h; do \ 
69- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ 
70+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ 
71 done 
72  
73 install_staticlib: $(LIBRARY) 
74- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) 
75- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) 
76+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) 
77+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) 
78  57
79 install_sharedlib: $(LIBRARY_SO) 58 install_sharedlib: $(LIBRARY_SO)
80- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) 59 $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
81- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) 60- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
82- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) 61- ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
83+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) 62+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
84+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir) 
85  63
86 ifneq ($(wildcard .depend),) 64 ifneq ($(wildcard .depend),)
87 include .depend 65 include .depend