Wed Jul 28 09:05:39 2010 UTC ()
keep a copy of the previous mkvtoolnix version -- the current one
develops mysterious C++ problems with older g++ (seen in bulk build,
reported by mrg)


(drochner)
diff -r1.165 -r1.166 pkgsrc/multimedia/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix-old/DESCR
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix-old/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix-old/PLIST
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix-old/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mkvtoolnix-old/patches/patch-aa
cvs diff -r1.165 -r1.166 pkgsrc/multimedia/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/Makefile 2010/06/16 14:14:42 1.165
+++ pkgsrc/multimedia/Makefile 2010/07/28 09:05:38 1.166
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.165 2010/06/16 14:14:42 drochner Exp $ 1# $NetBSD: Makefile,v 1.166 2010/07/28 09:05:38 drochner Exp $
2# 2#
3 3
4COMMENT= Multimedia utilities 4COMMENT= Multimedia utilities
5 5
6SUBDIR+= RealPlayerGold 6SUBDIR+= RealPlayerGold
7SUBDIR+= acidrip 7SUBDIR+= acidrip
8SUBDIR+= adobe-flash-plugin 8SUBDIR+= adobe-flash-plugin
9SUBDIR+= alevt 9SUBDIR+= alevt
10SUBDIR+= avidemux 10SUBDIR+= avidemux
11SUBDIR+= bsdav 11SUBDIR+= bsdav
12SUBDIR+= ccxstream 12SUBDIR+= ccxstream
13SUBDIR+= cfourcc 13SUBDIR+= cfourcc
14SUBDIR+= clutter-gst 14SUBDIR+= clutter-gst
@@ -79,26 +79,27 @@ SUBDIR+= libmpeg2 @@ -79,26 +79,27 @@ SUBDIR+= libmpeg2
79SUBDIR+= libmpeg3 79SUBDIR+= libmpeg3
80SUBDIR+= libnms 80SUBDIR+= libnms
81SUBDIR+= libogg 81SUBDIR+= libogg
82SUBDIR+= libtheora 82SUBDIR+= libtheora
83SUBDIR+= libtheora-docs 83SUBDIR+= libtheora-docs
84SUBDIR+= lsdvd 84SUBDIR+= lsdvd
85SUBDIR+= mediainfo 85SUBDIR+= mediainfo
86SUBDIR+= mediatomb 86SUBDIR+= mediatomb
87SUBDIR+= mencoder 87SUBDIR+= mencoder
88SUBDIR+= ming 88SUBDIR+= ming
89SUBDIR+= mjpegtools 89SUBDIR+= mjpegtools
90SUBDIR+= mkv2mp4 90SUBDIR+= mkv2mp4
91SUBDIR+= mkvtoolnix 91SUBDIR+= mkvtoolnix
 92SUBDIR+= mkvtoolnix-old
92SUBDIR+= mpeg-lib 93SUBDIR+= mpeg-lib
93SUBDIR+= mpeg4ip 94SUBDIR+= mpeg4ip
94SUBDIR+= mpeg_encode 95SUBDIR+= mpeg_encode
95SUBDIR+= mpeg_play 96SUBDIR+= mpeg_play
96SUBDIR+= mplayer 97SUBDIR+= mplayer
97SUBDIR+= mplayer-plugin 98SUBDIR+= mplayer-plugin
98SUBDIR+= mplayer-share 99SUBDIR+= mplayer-share
99SUBDIR+= ns-flash 100SUBDIR+= ns-flash
100SUBDIR+= ogle 101SUBDIR+= ogle
101SUBDIR+= ogle_gui 102SUBDIR+= ogle_gui
102SUBDIR+= ogmtools 103SUBDIR+= ogmtools
103SUBDIR+= openquicktime 104SUBDIR+= openquicktime
104SUBDIR+= p5-GStreamer 105SUBDIR+= p5-GStreamer
File Added: pkgsrc/multimedia/mkvtoolnix-old/Attic/DESCR
MKVtoolnix is a set of tools to create, alter and inspect Matroska files.

With these tools one can get information about (mkvinfo) Matroska files,
extract tracks/data from (mkvextract) Matroska files and create (mkvmerge)
Matroska files from other media files.

This is a mature version known to compile correctly with g++-4.1.
File Added: pkgsrc/multimedia/mkvtoolnix-old/Attic/Makefile
# $NetBSD: Makefile,v 1.1 2010/07/28 09:05:38 drochner Exp $

DISTNAME=	mkvtoolnix-2.9.8
PKGREVISION=	3
CATEGORIES=	multimedia
MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
COMMENT=	Matroska tools, old version for build with g++-4.1
LICENSE=	gnu-gpl-v2

PKG_DESTDIR_SUPPORT=	user-destdir

GNU_CONFIGURE=	yes
USE_TOOLS+=	gmake
USE_LANGUAGES=	c c++

CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
CONFIGURE_ARGS+=	--with-boost_regex=boost_regex

PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
PKG_SUPPORTED_OPTIONS=	mkvtoolnix-gui
PKG_SUGGESTED_OPTIONS=

.include "../../mk/bsd.options.mk"

PLIST_VARS+=	gui

.if !empty(PKG_OPTIONS:Mmkvtoolnix-gui)
PLIST.gui=	yes
CONFIGURE_ARGS+=	--enable-gui
CONFIGURE_ARGS+=	--enable-wxwidgets
.   include "../../x11/wxGTK28/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-gui
CONFIGURE_ARGS+=	--disable-wxwidgets
.endif

.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/liblzo/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libebml/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../multimedia/libmatroska/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../sysutils/file/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"

.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/multimedia/mkvtoolnix-old/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2010/07/28 09:05:38 drochner Exp $
bin/mkvextract
bin/mkvinfo
bin/mkvmerge
${PLIST.gui}bin/mmg
man/man1/mkvextract.1
man/man1/mkvinfo.1
man/man1/mkvmerge.1
${PLIST.gui}man/man1/mmg.1
share/mkvtoolnix/images/addingremovingattachments.gif
share/mkvtoolnix/images/addremovefiles.gif
share/mkvtoolnix/images/attachmentoptions.gif
share/mkvtoolnix/images/audiotrackoptions.gif
share/mkvtoolnix/images/chaptereditor.gif
share/mkvtoolnix/images/generaltrackoptions.gif
share/mkvtoolnix/images/jobmanager.gif
share/mkvtoolnix/images/movietitle.gif
share/mkvtoolnix/images/muxingwindow.gif
share/mkvtoolnix/images/selectmkvmergeexecutable.gif
share/mkvtoolnix/images/splitting.gif
share/mkvtoolnix/images/textsubtitlestrackoptions.gif
share/mkvtoolnix/images/trackselection.gif
share/mkvtoolnix/images/videotrackoptions.gif
share/mkvtoolnix/mkvmerge-gui.hhc
share/mkvtoolnix/mkvmerge-gui.hhk
share/mkvtoolnix/mkvmerge-gui.hhp
share/mkvtoolnix/mkvmerge-gui.html
share/locale/de/LC_MESSAGES/mkvtoolnix.mo
share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
File Added: pkgsrc/multimedia/mkvtoolnix-old/Attic/distinfo
$NetBSD: distinfo,v 1.1 2010/07/28 09:05:38 drochner Exp $

SHA1 (mkvtoolnix-2.9.8.tar.bz2) = be2b4b427befaad3d842b3ad3d55fb97b93b0468
RMD160 (mkvtoolnix-2.9.8.tar.bz2) = d0cb8629ad35b29708a0c7777dfe9a4d623a8e10
Size (mkvtoolnix-2.9.8.tar.bz2) = 1093036 bytes
SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
File Added: pkgsrc/multimedia/mkvtoolnix-old/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2010/07/28 09:05:38 drochner Exp $

--- src/common/os.h.orig	2009-07-01 16:40:03.000000000 +0000
+++ src/common/os.h
@@ -15,6 +15,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 // For PRId64 and PRIu64:
 #define __STDC_FORMAT_MACROS