From 270d4d6c994a432f9a61f549df82d0c4d82582f9 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 19 Mar 2007 12:23:42 +0000 Subject: [PATCH] Import mkvtoolnix-2.0.0 MKVToolnix: cross-platform tools for Matroska. 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. Available flavors: no_x11 - do not build the wxGTK2 frontend ok jolan@ simon@ --- multimedia/mkvtoolnix/Makefile | 60 +++++++++++++++++++ multimedia/mkvtoolnix/distinfo | 5 ++ multimedia/mkvtoolnix/patches/patch-configure | 12 ++++ .../mkvtoolnix/patches/patch-src_mmg_mmg_cpp | 31 ++++++++++ multimedia/mkvtoolnix/pkg/DESCR | 7 +++ multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11 | 3 + multimedia/mkvtoolnix/pkg/PLIST | 30 ++++++++++ 7 files changed, 148 insertions(+) create mode 100644 multimedia/mkvtoolnix/Makefile create mode 100644 multimedia/mkvtoolnix/distinfo create mode 100644 multimedia/mkvtoolnix/patches/patch-configure create mode 100644 multimedia/mkvtoolnix/patches/patch-src_mmg_mmg_cpp create mode 100644 multimedia/mkvtoolnix/pkg/DESCR create mode 100644 multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11 create mode 100644 multimedia/mkvtoolnix/pkg/PLIST diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile new file mode 100644 index 00000000000..9fee5eb64d0 --- /dev/null +++ b/multimedia/mkvtoolnix/Makefile @@ -0,0 +1,60 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $ + +COMMENT= "set of tools to create, alter and inspect Matroska files" + +DISTNAME= mkvtoolnix-2.0.0 +CATEGORIES= multimedia x11 + +EXTRACT_SUFX= .tar.bz2 + +HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/ + +MAINTAINER= Antoine Jacoutot + +# GPLv2 +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${HOMEPAGE}/sources/ + +WANTLIB= c ebml m ogg stdc++ z + +MODULES= converters/libiconv +LIB_DEPENDS= FLAC.>=7::audio/flac \ + pcre.>=1,pcrecpp.>=2::devel/pcre \ + bz2.>=10::archivers/bzip2 \ + lzo.>=1::archivers/lzo \ + matroska::multimedia/libmatroska \ + vorbis.>=5::audio/libvorbis \ + magic.>=1::devel/libmagic \ + expat.>=6::textproc/expat + +MAKE_FLAGS+= V=1 + +NO_REGRESS= Yes +USE_GMAKE= Yes +CONFIGURE_STYLE=gnu + +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_has_nl_langinfo=no + +CONFIGURE_ARGS= --enable-lzo \ + --enable-bz2 \ + --with-flac + +FLAVORS= no_x11 +FLAVOR?= + +.if ${FLAVOR:L:Mno_x11} +CONFIGURE_ARGS+=--disable-gui +.else +USE_X11= Yes +WANTLIB+= pthread +LIB_DEPENDS+= wx_base,wx_base_net,wx_base_odbc,wx_base_xml,wx_gtk2_adv,wx_gtk2_core,wx_gtk2_dbgrid,wx_gtk2_html,wx_gtk2_qa,wx_gtk2_xrc:wxWidgets-gtk2->=2.6.3:x11/wxWidgets +CONFIGURE_ARGS+=--enable-gui +.endif + +.include diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo new file mode 100644 index 00000000000..0c312ae1d26 --- /dev/null +++ b/multimedia/mkvtoolnix/distinfo @@ -0,0 +1,5 @@ +MD5 (mkvtoolnix-2.0.0.tar.bz2) = d8a1d1f014f2ee5e69da04a46305f9dd +RMD160 (mkvtoolnix-2.0.0.tar.bz2) = 400a355646a04cd1ba0c30f2ca1536893e6bf508 +SHA1 (mkvtoolnix-2.0.0.tar.bz2) = 42f12c238e399eca8327d1059ed344c46492ca8c +SHA256 (mkvtoolnix-2.0.0.tar.bz2) = 73c1c60f08ac7e1409952eeff6e52a69ec76b11220dbb161dfdc1d34a66c3136 +SIZE (mkvtoolnix-2.0.0.tar.bz2) = 739166 diff --git a/multimedia/mkvtoolnix/patches/patch-configure b/multimedia/mkvtoolnix/patches/patch-configure new file mode 100644 index 00000000000..e108ad8ba4c --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $ +--- configure.orig Sat Jan 13 19:10:16 2007 ++++ configure Wed Jan 31 11:58:25 2007 +@@ -4626,7 +4626,7 @@ fi + OPTIMIZATION_CFLAGS="" + else + DEBUG_CFLAGS="" +- OPTIMIZATION_CFLAGS="-O3" ++ OPTIMIZATION_CFLAGS="" + fi + # Check whether --enable-profiling was given. + if test "${enable_profiling+set}" = set; then diff --git a/multimedia/mkvtoolnix/patches/patch-src_mmg_mmg_cpp b/multimedia/mkvtoolnix/patches/patch-src_mmg_mmg_cpp new file mode 100644 index 00000000000..d93c271b925 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-src_mmg_mmg_cpp @@ -0,0 +1,31 @@ +$OpenBSD: patch-src_mmg_mmg_cpp,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $ +--- src/mmg/mmg.cpp.orig Fri Jan 12 17:02:16 2007 ++++ src/mmg/mmg.cpp Wed Jan 31 12:02:31 2007 +@@ -1343,7 +1343,7 @@ mmg_dialog::update_command_line() { + mmg_file_t *f; + mmg_attachment_t *a; + wxString sid, old_cmdline, arg, aids, sids, dids, track_order; +- wxString append_mapping, format; ++ wxString append_mapping; + + old_cmdline = cmdline; + cmdline = wxT("\"") + mkvmerge_path + wxT("\" -o \"") + +@@ -1362,7 +1362,6 @@ mmg_dialog::update_command_line() { + clargs.Add(settings_page->cob_priority->GetValue()); + } + +- format = wxT(LLD); + for (fidx = 0; fidx < files.size(); fidx++) { + f = &files[fidx]; + tracks_selected_here = false; +@@ -1378,9 +1377,7 @@ mmg_dialog::update_command_line() { + continue; + + tracks_selected_here = true; +- // Avoid compiler warnings about mismatching format and arguments +- // because mingw does not know about the %I64d syntax. +- sid.Printf(format, t->id); ++ sid = wxLongLong(t->id).ToString(); + + if (t->type == wxT('a')) { + no_audio = false; diff --git a/multimedia/mkvtoolnix/pkg/DESCR b/multimedia/mkvtoolnix/pkg/DESCR new file mode 100644 index 00000000000..f809c28e604 --- /dev/null +++ b/multimedia/mkvtoolnix/pkg/DESCR @@ -0,0 +1,7 @@ +MKVToolnix: cross-platform tools for Matroska. +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. + +Available flavors: + no_x11 - do not build the wxGTK2 frontend diff --git a/multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11 b/multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11 new file mode 100644 index 00000000000..3d8c279de20 --- /dev/null +++ b/multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11 @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $ +bin/mmg +@man man/man1/mmg.1 diff --git a/multimedia/mkvtoolnix/pkg/PLIST b/multimedia/mkvtoolnix/pkg/PLIST new file mode 100644 index 00000000000..79cc78a3866 --- /dev/null +++ b/multimedia/mkvtoolnix/pkg/PLIST @@ -0,0 +1,30 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $ +bin/base64tool +bin/mkvextract +bin/mkvinfo +bin/mkvmerge +@man man/man1/base64tool.1 +@man man/man1/mkvextract.1 +@man man/man1/mkvinfo.1 +@man man/man1/mkvmerge.1 +share/mkvtoolnix/ +share/mkvtoolnix/images/ +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 +!%%no_x11%%