cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update mkvtoolnix to 3.2.0

Browse Source 
- update patches

with tweaks and ok by ajacoutot@, thanks !
This commit is contained in:
benoit 2010-04-05 20:27:03 +00:00
parent f00a244ca9
commit 2899108e9e
6 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
multimedia/mkvtoolnix/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2009/12/23 12:11:29 benoit Exp $
# $OpenBSD: Makefile,v 1.20 2010/04/05 20:27:03 benoit Exp $
COMMENT = create, alter and inspect Matroska files
DISTNAME = mkvtoolnix-3.0.0
DISTNAME = mkvtoolnix-3.2.0
CATEGORIES = multimedia x11
HOMEPAGE = http://www.bunkus.org/videotools/mkvtoolnix/
@ -22,14 +22,14 @@ MASTER_SITES = ${HOMEPAGE}/sources/
EXTRACT_SUFX = .tar.bz2
MODULES = converters/libiconv
LIB_DEPENDS = FLAC.>=7::audio/flac \
bz2.>=10::archivers/bzip2 \
lzo2::archivers/lzo2 \
matroska:libmatroska->=0.8.1:multimedia/libmatroska \
vorbis.>=5::audio/libvorbis \
magic.>=1::devel/libmagic \
boost_regex-mt.>=1::devel/boost
boost_regex-mt.>=1.1,boost_filesystem-mt.>=1.1::devel/boost
MAKE_FLAGS += V=1
@ -37,12 +37,13 @@ USE_GMAKE = Yes
USE_X11 = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-lzo \
--enable-bz2 \
--disable-qt \
--with-flac \
--with-boost-regex=boost_regex-mt
--with-boost-libdir=${LOCALBASE}/lib \
--with-boost-regex=boost_regex-mt \
--with-boost-filesystem=boost_filesystem-mt
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib \
-lm -lstdc++ -pthread -liconv" \
@ -62,4 +63,22 @@ CONFIGURE_ARGS += --enable-gui \
NO_REGRESS = Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/man/ja.po
${INSTALL_DATA_DIR} ${PREFIX}/man/zh_CN.po
${INSTALL_DATA_DIR} ${PREFIX}/man/man1
.for i in mkvextract mkvinfo mkvmerge mkvpropedit
${INSTALL_PROGRAM} ${WRKBUILD}/src/$i ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/doc/man/$i.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/doc/man/ja/$i.1 ${PREFIX}/man/ja.po
${INSTALL_DATA} ${WRKSRC}/doc/man/zh_CN/$i.1 ${PREFIX}/man/zh_CN.po
.endfor
.for l in de ja zh_CN zh_TW
${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$l/LC_MESSAGES
${INSTALL_DATA} ${WRKSRC}/po/$l.mo ${PREFIX}/share/locale/$l/LC_MESSAGES/mkvtoolnix.mo
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/mkvtoolnix/images
${INSTALL_DATA} ${WRKSRC}/doc/guide/en/mkvmerge-gui.* ${PREFIX}/share/mkvtoolnix
${INSTALL_DATA} ${WRKSRC}/doc/guide/en/images/*.gif ${PREFIX}/share/mkvtoolnix/images
.include <bsd.port.mk>

10
multimedia/mkvtoolnix/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (mkvtoolnix-3.2.0.tar.bz2) = m/MSgMsHhwdx5p3gKH3HaQ==
RMD160 (mkvtoolnix-3.2.0.tar.bz2) = 1N2EPd+7dBM5CA27cpk47t8lBdg=
SHA1 (mkvtoolnix-3.2.0.tar.bz2) = 5dITdALvZzHuAZpHJSe3eTXTAbE=
SHA256 (mkvtoolnix-3.2.0.tar.bz2) = KyRwU/SMy48ro+Fl03Ucgvft5JSCJDg86bYvK3unRqo=
SIZE (mkvtoolnix-3.2.0.tar.bz2) = 1384155

16
multimedia/mkvtoolnix/patches/patch-configure
View File

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-configure,v 1.9 2010/04/05 20:27:09 benoit Exp $
--- configure.orig Tue Jan 19 12:08:03 2010
+++ configure Wed Jan 20 11:44:42 2010
@@ -5008,7 +5008,7 @@
OPTIMIZATION_CFLAGS=""
else
DEBUG_CFLAGS=""
@ -9,11 +9,11 @@ $OpenBSD: patch-configure,v 1.8 2009/12/23 12:11:31 benoit Exp $
+ OPTIMIZATION_CFLAGS=""
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
if test "${enable_profiling+set}" = set; then :
@@ -9003,7 +9003,7 @@
{ $as_echo "$as_me:${as_lineno-$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
if test "x$ac_cv_lib_intl_gettext" = x""yes; then :
- LIBINTL_LIBS="-lintl";
+ LIBINTL_LIBS="-lintl -liconv";
gettext_found=yes

6
multimedia/mkvtoolnix/patches/patch-src_common_common_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_common_common_cpp,v 1.1 2009/06/09 20:30:18 benoit Exp $
--- src/common/common.cpp.orig Mon Jun 8 17:29:19 2009
+++ src/common/common.cpp Mon Jun 8 17:31:55 2009
$OpenBSD: patch-src_common_common_cpp,v 1.2 2010/04/05 20:27:09 benoit Exp $
--- src/common/common.cpp.orig Fri Feb 12 16:43:41 2010
+++ src/common/common.cpp Sun Apr 4 20:34:51 2010
@@ -13,6 +13,8 @@
#include "common/os.h"

13
multimedia/mkvtoolnix/patches/patch-src_propedit_propedit_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_propedit_propedit_cpp,v 1.1 2010/04/05 20:27:09 benoit Exp $
--- src/propedit/propedit.cpp.orig Sun Apr 4 21:33:04 2010
+++ src/propedit/propedit.cpp Sun Apr 4 21:33:27 2010
@@ -10,6 +10,9 @@
#include "common/os.h"
+#include <unistd.h>
+#include <boost/limits.hpp>
+
#include <matroska/KaxInfo.h>
#include <matroska/KaxTracks.h>

13
multimedia/mkvtoolnix/pkg/PLIST
View File

@ -1,12 +1,22 @@
@comment $OpenBSD: PLIST,v 1.4 2009/12/23 12:11:33 benoit Exp $
@comment $OpenBSD: PLIST,v 1.5 2010/04/05 20:27:13 benoit Exp $
@bin bin/mkvextract
@bin bin/mkvinfo
@bin bin/mkvmerge
@bin bin/mkvpropedit
man/ja.po/
man/ja.po/mkvextract.1
man/ja.po/mkvinfo.1
man/ja.po/mkvmerge.1
man/ja.po/mkvpropedit.1
@man man/man1/mkvextract.1
@man man/man1/mkvinfo.1
@man man/man1/mkvmerge.1
@man man/man1/mkvpropedit.1
man/zh_CN.po/
man/zh_CN.po/mkvextract.1
man/zh_CN.po/mkvinfo.1
man/zh_CN.po/mkvmerge.1
man/zh_CN.po/mkvpropedit.1
share/locale/
share/locale/de/
share/locale/de/LC_MESSAGES/
@ -37,7 +47,6 @@ 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%%