- update to mkvtoolnix-2.0.2

ok jolan@
This commit is contained in:
ajacoutot 2007-03-21 12:02:45 +00:00
parent b3ddcc7d34
commit 4727f6e9ac
5 changed files with 23 additions and 43 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/03/19 12:23:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2007/03/21 12:02:45 ajacoutot Exp $
COMMENT= "set of tools to create, alter and inspect Matroska files"
DISTNAME= mkvtoolnix-2.0.0
DISTNAME= mkvtoolnix-2.0.2
CATEGORIES= multimedia x11
EXTRACT_SUFX= .tar.bz2
@ -26,7 +26,7 @@ LIB_DEPENDS= FLAC.>=7::audio/flac \
pcre.>=1,pcrecpp.>=2::devel/pcre \
bz2.>=10::archivers/bzip2 \
lzo.>=1::archivers/lzo \
matroska::multimedia/libmatroska \
matroska:libmatroska->=0.8.1:multimedia/libmatroska \
vorbis.>=5::audio/libvorbis \
magic.>=1::devel/libmagic \
expat.>=6::textproc/expat

View File

@ -1,5 +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
MD5 (mkvtoolnix-2.0.2.tar.bz2) = 48b478caef80117b6cd3cd9b06e9f104
RMD160 (mkvtoolnix-2.0.2.tar.bz2) = 01ea703dfe6e15f9cf121fa0752d059b01a79c15
SHA1 (mkvtoolnix-2.0.2.tar.bz2) = 6a4b1e62786fb6e5f426fe3a6ddc667034868212
SHA256 (mkvtoolnix-2.0.2.tar.bz2) = 1fce872d1c3ee29ee583dae7c2fb4052343099533bfdd26f1b18f3c6cb2e9473
SIZE (mkvtoolnix-2.0.2.tar.bz2) = 756652

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-configure,v 1.2 2007/03/21 12:02:45 ajacoutot Exp $
--- configure.orig Wed Feb 21 11:45:39 2007
+++ configure Mon Mar 19 14:49:43 2007
@@ -4864,7 +4864,7 @@ fi
OPTIMIZATION_CFLAGS=""
else
DEBUG_CFLAGS=""

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_common_dts_common_cpp,v 1.1 2007/03/21 12:02:45 ajacoutot Exp $
--- src/common/dts_common.cpp.orig Mon Mar 19 14:50:17 2007
+++ src/common/dts_common.cpp Mon Mar 19 14:50:32 2007
@@ -16,6 +16,7 @@
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include "bit_cursor.h"
#include "common.h"

View File

@ -1,31 +0,0 @@
$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;