diff options
| -rw-r--r-- | multimedia/libmatroska/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/libmatroska/buildlink3.mk | 4 | ||||
| -rw-r--r-- | multimedia/libmatroska/distinfo | 5 | ||||
| -rw-r--r-- | multimedia/libmatroska/patches/patch-ab | 15 | ||||
| -rw-r--r-- | multimedia/libmatroska/patches/patch-ac | 13 |
5 files changed, 19 insertions, 24 deletions
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index 7f9b6d39175..5c46a79e2ed 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.5 2004/05/31 09:50:35 salo Exp $ +# $NetBSD: Makefile,v 1.6 2004/07/20 23:53:12 salo Exp $ # DISTNAME= libmatroska-0.7.0 +PKGREVISION= 1 CATEGORIES= multimedia devel MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ -MAINTAINER= tech-pkg@NetBSD.org +MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.matroska.org/ COMMENT= Extensible open standard Audio/Video container format @@ -19,6 +20,7 @@ NO_CONFIGURE= yes MAKEFLAGS+= prefix=${PREFIX:Q} MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q} BUILD_DIRS= ${WRKDIR}/${DISTNAME}/make/linux +TEST_TARGET= test ONLY_FOR_COMPILER= gcc diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk index d5bb9794f3d..a1f9fbf3c06 100644 --- a/multimedia/libmatroska/buildlink3.mk +++ b/multimedia/libmatroska/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/05/05 15:57:17 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/07/20 23:53:12 salo Exp $ # # This Makefile fragment is included by packages that use libmatroska. # @@ -16,7 +16,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatroska} BUILDLINK_PACKAGES+= libmatroska .if !empty(LIBMATROSKA_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libmatroska+= libmatroska>=0.7.0 +BUILDLINK_DEPENDS.libmatroska+= libmatroska>=0.7.0nb1 BUILDLINK_PKGSRCDIR.libmatroska?= ../../multimedia/libmatroska .endif # LIBMATROSKA_BUILDLINK3_MK diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo index 97e577ddac5..4ea0bf9566d 100644 --- a/multimedia/libmatroska/distinfo +++ b/multimedia/libmatroska/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.4 2004/05/31 09:50:35 salo Exp $ +$NetBSD: distinfo,v 1.5 2004/07/20 23:53:12 salo Exp $ SHA1 (libmatroska-0.7.0.tar.gz) = 51997ad2834a08a86e2e163c037aa841aa1cb0bb Size (libmatroska-0.7.0.tar.gz) = 100316 bytes SHA1 (patch-aa) = 1b39f10c5d50091d7875d5e60c3e9b09d187a7a1 -SHA1 (patch-ab) = 41178badc83063d898939ac6a334bf6af73d0f42 -SHA1 (patch-ac) = 5887db675a216e97c7ac47b485a0bf033571479a +SHA1 (patch-ac) = 57cc8044b8ea8b4f1fc639734f18f6b91e978dc7 diff --git a/multimedia/libmatroska/patches/patch-ab b/multimedia/libmatroska/patches/patch-ab deleted file mode 100644 index 023ea18c220..00000000000 --- a/multimedia/libmatroska/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/04/07 12:52:16 salo Exp $ - -MPlayer depends on this. - ---- matroska/KaxConfig.h.orig 2004-01-18 00:40:47.000000000 +0300 -+++ matroska/KaxConfig.h -@@ -78,7 +78,7 @@ - #endif - - #if !defined(MATROSKA_VERSION) --#define MATROSKA_VERSION 1 -+#define MATROSKA_VERSION 2 - #endif // MATROSKA_VERSION - - diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac index e232b4c3396..7e921dfb3c1 100644 --- a/multimedia/libmatroska/patches/patch-ac +++ b/multimedia/libmatroska/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2004/05/31 09:50:35 salo Exp $ +$NetBSD: patch-ac,v 1.3 2004/07/20 23:53:12 salo Exp $ --- make/linux/Makefile.orig 2004-01-05 12:28:43.000000000 +0100 -+++ make/linux/Makefile 2004-05-31 01:20:58.000000000 +0200 ++++ make/linux/Makefile 2004-07-21 00:21:56.000000000 +0200 @@ -15,13 +15,13 @@ includedir=$(prefix)/include/matroska @@ -32,3 +32,12 @@ $NetBSD: patch-ac,v 1.2 2004/05/31 09:50:35 salo Exp $ SRC_DIR=$(CWD)/../../src/ INCLUDE_DIR=$(CWD)/../../matroska +@@ -66,7 +66,7 @@ + + DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE} + +-all: $(LIBRARY) test ++all: $(LIBRARY) + + lib library: $(LIBRARY) + |