- update mkvtoolnix to 3.0.0

- regen PLIST
- update patch

ok ajacoutot@
This commit is contained in:
benoit 2009-12-23 12:11:29 +00:00
parent 3940040a18
commit 694d91fbf2
6 changed files with 61 additions and 22 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.18 2009/07/24 14:37:23 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2009/12/23 12:11:29 benoit Exp $
COMMENT = create, alter and inspect Matroska files
DISTNAME = mkvtoolnix-2.9.5
PKGNAME = ${DISTNAME}p0
DISTNAME = mkvtoolnix-3.0.0
CATEGORIES = multimedia x11
HOMEPAGE = http://www.bunkus.org/videotools/mkvtoolnix/
@ -23,6 +22,7 @@ MASTER_SITES = ${HOMEPAGE}/sources/
EXTRACT_SUFX = .tar.bz2
MODULES = converters/libiconv
LIB_DEPENDS = FLAC.>=7::audio/flac \
bz2.>=10::archivers/bzip2 \
lzo2::archivers/lzo2 \
@ -37,6 +37,7 @@ USE_GMAKE = Yes
USE_X11 = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-lzo \
--enable-bz2 \
--disable-qt \
@ -44,7 +45,7 @@ CONFIGURE_ARGS = --enable-lzo \
--with-boost-regex=boost_regex-mt
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib \
-lm -lstdc++ -pthread" \
-lm -lstdc++ -pthread -liconv" \
ac_cv_has_nl_langinfo=no
FLAVORS = no_x11

View File

@ -1,5 +1,5 @@
MD5 (mkvtoolnix-2.9.5.tar.bz2) = E/Y5BIvYKSFLJHJwPEleTA==
RMD160 (mkvtoolnix-2.9.5.tar.bz2) = tngUqt4fba7XgLuqAznZwV8Neqw=
SHA1 (mkvtoolnix-2.9.5.tar.bz2) = vm7zR/r3crnFez0/3h3r32PsZrA=
SHA256 (mkvtoolnix-2.9.5.tar.bz2) = k5VC8UBc3F+jgjDbnMUP4BVaCJC0DVnuYbaCV+DSG3A=
SIZE (mkvtoolnix-2.9.5.tar.bz2) = 1042202
MD5 (mkvtoolnix-3.0.0.tar.bz2) = LpNz7dWlUjMT2PW+o+6Pjg==
RMD160 (mkvtoolnix-3.0.0.tar.bz2) = kFK8yzX7RuV1fxSpVM2SU8/wQT8=
SHA1 (mkvtoolnix-3.0.0.tar.bz2) = abSVFkDisOX8snOURE/6wkwAG1Q=
SHA256 (mkvtoolnix-3.0.0.tar.bz2) = ZFDehdY8ZXIwNjq4LOH1QjQnpqAHPn/Ri/9PSPO4tag=
SIZE (mkvtoolnix-3.0.0.tar.bz2) = 1117727

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2009/03/05 12:03:58 ajacoutot Exp $
--- configure.orig Sat Feb 28 15:26:10 2009
+++ configure Thu Mar 5 12:48:13 2009
@@ -5005,7 +5005,7 @@ fi
$OpenBSD: patch-configure,v 1.8 2009/12/23 12:11:31 benoit Exp $
--- configure.orig Thu Aug 13 12:36:13 2009
+++ configure Tue Sep 29 14:43:48 2009
@@ -5142,7 +5142,7 @@
OPTIMIZATION_CFLAGS=""
else
DEBUG_CFLAGS=""
@ -10,3 +10,12 @@ $OpenBSD: patch-configure,v 1.7 2009/03/05 12:03:58 ajacoutot Exp $
fi
# Check whether --enable-profiling was given.
if test "${enable_profiling+set}" = set; then
@@ -10343,7 +10343,7 @@
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
$as_echo "$ac_cv_lib_intl_gettext" >&6; }
if test "x$ac_cv_lib_intl_gettext" = x""yes; then
- LIBINTL_LIBS="-lintl";
+ LIBINTL_LIBS="-lintl -liconv";
gettext_found=yes
else
gettext_found=no

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_common_random_cpp,v 1.2 2009/06/09 20:30:18 benoit Exp $
--- src/common/random.cpp.orig Sun Jun 7 11:04:28 2009
+++ src/common/random.cpp Mon Jun 8 23:06:54 2009
@@ -101,7 +101,7 @@ random_c::generate_bytes(void *destination,
$OpenBSD: patch-src_common_random_cpp,v 1.3 2009/12/23 12:11:32 benoit Exp $
--- src/common/random.cpp.orig Thu Aug 13 12:32:50 2009
+++ src/common/random.cpp Thu Sep 10 12:08:56 2009
@@ -98,7 +98,7 @@
try {
if (!m_tried_dev_urandom) {
m_tried_dev_urandom = true;
- m_dev_urandom = mm_file_io_cptr(new mm_file_io_c("/dev/urandom", MODE_READ));
+ m_dev_urandom = mm_file_io_cptr(new mm_file_io_c("/dev/arandom", MODE_READ));
- m_dev_urandom = mm_file_io_cptr(new mm_file_io_c("/dev/urandom", MODE_READ));
+ m_dev_urandom = mm_file_io_cptr(new mm_file_io_c("/dev/arandom", MODE_READ));
}
if ((NULL != m_dev_urandom.get()) &&
(m_dev_urandom->read(destination, num_bytes) == num_bytes))
if (m_dev_urandom.is_set() && (m_dev_urandom->read(destination, num_bytes) == num_bytes))
return;

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_mmg_options_mmg_cpp,v 1.1 2009/12/23 12:11:32 benoit Exp $
--- src/mmg/options/mmg.cpp.orig Thu Aug 13 12:32:50 2009
+++ src/mmg/options/mmg.cpp Tue Sep 29 13:34:18 2009
@@ -32,6 +32,10 @@
#include "common/wx.h"
#include "mmg/mmg_dialog.h"
#include "mmg/mmg.h"
+#include "mmg/options/chapters.h"
+#include "mmg/options/dialog.h"
+#include "mmg/options/languages.h"
+#include "mmg/options/mkvmerge.h"
#include "mmg/options/mmg.h"
struct locale_sorter_t {

View File

@ -1,10 +1,25 @@
@comment $OpenBSD: PLIST,v 1.3 2008/10/12 12:22:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2009/12/23 12:11:33 benoit Exp $
@bin bin/mkvextract
@bin bin/mkvinfo
@bin bin/mkvmerge
@bin bin/mkvpropedit
@man man/man1/mkvextract.1
@man man/man1/mkvinfo.1
@man man/man1/mkvmerge.1
@man man/man1/mkvpropedit.1
share/locale/
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/mkvtoolnix.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
share/mkvtoolnix/
share/mkvtoolnix/images/
share/mkvtoolnix/images/addingremovingattachments.gif