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

Update mkvtoolnix from 9.7.1 to 25.0.0

Browse Source 
Take maintainership (ok from Brad)
This commit is contained in:
rsadowski 2018-08-18 06:47:58 +00:00
parent 6f4d60dba0
commit f4fe81212b
9 changed files with 205 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
multimedia/mkvtoolnix/Makefile
View File

@ -1,36 +1,41 @@
# $OpenBSD: Makefile,v 1.75 2018/07/01 18:33:37 espie Exp $
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-9.7.1
REVISION= 5
DISTNAME= mkvtoolnix-25.0.0
CATEGORIES= multimedia x11
MASTER_SITES= ${HOMEPAGE}sources/
EXTRACT_SUFX= .tar.xz
HOMEPAGE = https://www.bunkus.org/videotools/mkvtoolnix/
MAINTAINER= Brad Smith <brad@comstyle.com>
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= FLAC boost_filesystem-mt boost_regex-mt boost_system-mt \
c ebml iconv intl m magic matroska ogg pthread vorbis z \
${COMPILER_LIBCXX}
WANTLIB += ${COMPILER_LIBCXX} FLAC boost_filesystem-mt
WANTLIB += boost_regex-mt boost_system-mt c cmark ebml iconv intl
WANTLIB += m magic matroska ogg vorbis z
MODULES= lang/ruby
MODRUBY_RUNDEP= No
# C++11 / C++14
COMPILER = base-clang ports-gcc
BUILD_DEPENDS= devel/gettext-tools
BUILD_DEPENDS= devel/gettext-tools \
devel/gtest \
textproc/docbook \
textproc/docbook-xsl \
x11/qt5/qttools
LIB_DEPENDS= audio/flac \
audio/libogg \
audio/libvorbis \
devel/boost \
devel/cmark \
devel/gettext \
devel/libmagic \
multimedia/libmatroska>=1.4.5 \
@ -41,12 +46,14 @@ MAKE_ENV+= V=1
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS= --disable-optimization \
--disable-update-check \
--with-boost-date-time=boost_date_time-mt \
--with-boost-filesystem=boost_filesystem-mt \
--with-boost-libdir=${LOCALBASE}/lib \
--with-boost-regex=boost_regex-mt \
--with-boost-system=boost_system-mt \
--without-curl
--with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
@ -57,33 +64,34 @@ FLAVOR?=
CONFIGURE_ARGS+= --disable-gui
.else
MODULES+= x11/qt5
WANTLIB+= Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5Widgets
WANTLIB+= Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5Widgets Qt5Multimedia
LIB_DEPENDS += x11/qt5/qtmultimedia
RUN_DEPENDS+= devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
CPPFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib -L${MODQT5_LIBDIR}
CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt5/bin/lconvert"
.endif
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
# XXX does not build with our pugixml (it's too new)
CONFIGURE_ENV +=ac_cv_header_pugixml_hpp=no
# avoid hidden build dep on gtest
CONFIGURE_ENV +=ac_cv_lib_gtest_main_main=no
NO_TEST= Yes
pre-patch:
@cd ${WRKSRC}/src/mkvtoolnix-gui/jobs/program_runner/ && \
cp linux_program_runner.cpp unix_program_runner.cpp && \
cp linux_program_runner.h unix_program_runner.h
do-build:
@cd ${WRKSRC} && \
env -i ${MAKE_ENV} ${RUBY} ./drake -j${MAKE_JOBS} \
${MAKE_FLAGS}
env -i ${MAKE_ENV} ${RAKE} -j${MAKE_JOBS} ${MAKE_FLAGS}
do-install:
@cd ${WRKSRC} && \
env -i ${MAKE_ENV} ${RUBY} ./drake \
DESTDIR=${WRKINST} install
env -i ${MAKE_ENV} ${RAKE} DESTDIR=${WRKINST} install
do-test:
@cd ${WRKSRC} && \
env -i ${MAKE_ENV} ${RAKE} tests:run_unit
.include <bsd.port.mk>

4
multimedia/mkvtoolnix/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mkvtoolnix-9.7.1.tar.xz) = sriCHi103w92XJf5Pd0dv7Bi88Irlpz6BNG7XLY4qI4=
SIZE (mkvtoolnix-9.7.1.tar.xz) = 3824684
SHA256 (mkvtoolnix-25.0.0.tar.xz) = g0y3q92ISdo6aGQFXIIHzqRNFHaBR4MJGM0acjxAvDM=
SIZE (mkvtoolnix-25.0.0.tar.xz) = 4797476

27
multimedia/mkvtoolnix/patches/patch-ac_qt5_m4
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-ac_qt5_m4,v 1.5 2016/12/31 08:11:59 ajacoutot Exp $
$OpenBSD: patch-ac_qt5_m4,v 1.6 2018/08/18 06:47:58 rsadowski Exp $
Workaround for OpenBSD's pkg-config.
--- ac/qt5.m4.orig Tue Dec 27 17:01:56 2016
+++ ac/qt5.m4 Fri Dec 30 02:34:26 2016
@@ -127,25 +127,23 @@ if test x"$enable_qt" = "xyes" -a \
Index: ac/qt5.m4
--- ac/qt5.m4.orig
+++ ac/qt5.m4
@@ -151,20 +151,18 @@ if test x"$enable_qt" = "xyes" -a \
fi
if test $ok = 1 -a "x$with_qt_pkg_config" = xyes; then
@ -14,8 +15,8 @@ Workaround for OpenBSD's pkg-config.
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules"
fi
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core,Qt5Gui,Qt5Widgets,Qt5Network,Qt5Concurrent"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core Qt5Gui Qt5Widgets Qt5Network Qt5Concurrent"
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent"
if test x"$MINGW" = x1; then
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5WinExtras"
@ -24,13 +25,17 @@ Workaround for OpenBSD's pkg-config.
PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],,[ok=0])
- PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5PlatformSupport"])
-
+ PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5PlatformSupport"])
if test $ok = 0; then
AC_MSG_RESULT(no: not found by pkg-config)
fi
- with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
@@ -297,7 +295,7 @@ EOF
unset problem
fi
- AC_PATH_PROG(LCONVERT, lconvert)
+ AC_PATH_PROG(LCONVERT, lconvert,, $PATH)
else
echo '*** Not checking for Qt: disabled by user request'

14
multimedia/mkvtoolnix/patches/patch-src_common_os_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_common_os_h,v 1.1 2018/08/18 06:47:58 rsadowski Exp $
Index: src/common/os.h
--- src/common/os.h.orig
+++ src/common/os.h
@@ -26,7 +26,7 @@
#else
# define COMP_GCC
# define SYS_UNIX
-# if defined(__bsdi__) || defined(__FreeBSD__)
+# if defined(__bsdi__) || defined(__FreeBSD__) || defined(__OpenBSD__)
# define SYS_BSD
# elif defined(__sun) && defined(__SUNPRO_CC)
# undef COMP_GCC

23
multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_cpp,v 1.1 2018/08/18 06:47:58 rsadowski Exp $
Index: src/mkvtoolnix-gui/jobs/program_runner.cpp
--- src/mkvtoolnix-gui/jobs/program_runner.cpp.orig
+++ src/mkvtoolnix-gui/jobs/program_runner.cpp
@@ -15,6 +15,8 @@
#include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
#elif defined(SYS_APPLE)
#include "mkvtoolnix-gui/jobs/program_runner/macos_program_runner.h"
+#elif defined(SYS_BSD)
+#include "mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h"
#elif defined(SYS_WINDOWS)
#include "mkvtoolnix-gui/jobs/program_runner/windows_program_runner.h"
#endif // SYS_WINDOWS
@@ -158,6 +160,8 @@ ProgramRunner::create() {
runner.reset(new LinuxProgramRunner{});
#elif defined(SYS_APPLE)
runner.reset(new MacOSProgramRunner{});
+#elif defined(SYS_BSD)
+ runner.reset(new UnixProgramRunner{});
#elif defined(SYS_WINDOWS)
runner.reset(new WindowsProgramRunner{});
#endif // SYS_WINDOWS

81
multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp Normal file
View File

@ -0,0 +1,81 @@
$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp,v 1.1 2018/08/18 06:47:58 rsadowski Exp $
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp.orig
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
@@ -1,26 +1,26 @@
#include "common/common_pch.h"
-#if defined(SYS_LINUX)
+#if defined(SYS_LINUX) || defined(SYS_BSD)
#include <QDebug>
#include <QProcess>
#include "common/list_utils.h"
#include "common/qt.h"
-#include "mkvtoolnix-gui/jobs/program_runner/linux_program_runner.h"
+#include "mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h"
namespace mtx { namespace gui { namespace Jobs {
-LinuxProgramRunner::LinuxProgramRunner()
+UnixProgramRunner::UnixProgramRunner()
: ProgramRunner{}
{
}
-LinuxProgramRunner::~LinuxProgramRunner() {
+UnixProgramRunner::~UnixProgramRunner() {
}
bool
-LinuxProgramRunner::isRunProgramTypeSupported(Util::Settings::RunProgramType type) {
+UnixProgramRunner::isRunProgramTypeSupported(Util::Settings::RunProgramType type) {
if (ProgramRunner::isRunProgramTypeSupported(type))
return true;
@@ -28,35 +28,35 @@ LinuxProgramRunner::isRunProgramTypeSupported(Util::Se
}
void
-LinuxProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
- qDebug() << "LinuxProgramRunner::shutDownComputer: about to shut down the computer via systemctl";
+UnixProgramRunner::shutDownComputer(Util::Settings::RunProgramConfig &) {
+ qDebug() << "UnixProgramRunner::shutDownComputer: about to shut down the computer via systemctl";
auto result = QProcess::execute("systemctl poweroff");
if (result == 0)
return;
- qDebug() << "LinuxProgramRunner::shutDownComputer: 'systemctl poweroff' failed:" << result;
+ qDebug() << "UnixProgramRunner::shutDownComputer: 'systemctl poweroff' failed:" << result;
}
void
-LinuxProgramRunner::hibernateOrSleepComputer(bool hibernate) {
+UnixProgramRunner::hibernateOrSleepComputer(bool hibernate) {
auto action = Q(hibernate ? "hibernate" : "suspend");
- qDebug() << "LinuxProgramRunner::hibernateOrSleepComputer: about to" << action << "the computer via systemctl";
+ qDebug() << "UnixProgramRunner::hibernateOrSleepComputer: about to" << action << "the computer via systemctl";
auto result = QProcess::execute(Q("systemctl %1").arg(action));
if (result != 0)
- qDebug() << "LinuxProgramRunner::hibernateOrSleepComputer: 'systemctl" << action << "' failed:" << result;
+ qDebug() << "UnixProgramRunner::hibernateOrSleepComputer: 'systemctl" << action << "' failed:" << result;
}
void
-LinuxProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::hibernateComputer(Util::Settings::RunProgramConfig &) {
hibernateOrSleepComputer(true);
}
void
-LinuxProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
+UnixProgramRunner::sleepComputer(Util::Settings::RunProgramConfig &) {
hibernateOrSleepComputer(false);
}

30
multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h,v 1.1 2018/08/18 06:47:58 rsadowski Exp $
Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
--- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h.orig
+++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
@@ -2,7 +2,7 @@
#include "common/common_pch.h"
-#if defined(SYS_LINUX)
+#if defined(SYS_LINUX) || defined(SYS_BSD)
#include "mkvtoolnix-gui/jobs/program_runner.h"
@@ -10,12 +10,12 @@ namespace mtx { namespace gui {
namespace Jobs {
-class LinuxProgramRunner: public ProgramRunner {
+class UnixProgramRunner: public ProgramRunner {
Q_OBJECT;
public:
- explicit LinuxProgramRunner();
- virtual ~LinuxProgramRunner();
+ explicit UnixProgramRunner();
+ virtual ~UnixProgramRunner();
virtual bool isRunProgramTypeSupported(Util::Settings::RunProgramType type) override;

19
multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11
View File

@ -1,17 +1,6 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.11 2018/07/01 18:33:37 espie Exp $
@comment $OpenBSD: PFRAG.no-no_x11,v 1.12 2018/08/18 06:47:58 rsadowski Exp $
@bin bin/mkvtoolnix-gui
@man man/ca/man1/mkvtoolnix-gui.1
@man man/de/man1/mkvtoolnix-gui.1
@man man/es/man1/mkvtoolnix-gui.1
@man man/ja/man1/mkvtoolnix-gui.1
@man man/ko/man1/mkvtoolnix-gui.1
@man man/man1/mkvtoolnix-gui.1
@man man/nl/man1/mkvtoolnix-gui.1
@man man/pl/man1/mkvtoolnix-gui.1
@man man/uk/man1/mkvtoolnix-gui.1
@man man/zh_CN/man1/mkvtoolnix-gui.1
share/applications/mkvinfo.desktop
share/applications/mkvtoolnix-gui.desktop
share/icons/hicolor/128x128/apps/mkvextract.png
share/icons/hicolor/128x128/apps/mkvinfo.png
share/icons/hicolor/128x128/apps/mkvmerge.png
@ -52,6 +41,12 @@ share/icons/hicolor/96x96/apps/mkvinfo.png
share/icons/hicolor/96x96/apps/mkvmerge.png
share/icons/hicolor/96x96/apps/mkvpropedit.png
share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
share/applications/org.bunkus.mkvtoolnix-gui.desktop
share/mkvtoolnix/
share/mkvtoolnix/sounds/
share/mkvtoolnix/sounds/finished-1.ogg
share/mkvtoolnix/sounds/finished-2.ogg
share/mkvtoolnix/sounds/finished-3.ogg
share/mime/packages/mkvtoolnix.xml
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-mime-database

57
multimedia/mkvtoolnix/pkg/PLIST
View File

@ -1,66 +1,12 @@
@comment $OpenBSD: PLIST,v 1.15 2016/04/11 05:55:37 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.16 2018/08/18 06:47:58 rsadowski Exp $
@bin bin/mkvextract
@bin bin/mkvinfo
@bin bin/mkvmerge
@bin bin/mkvpropedit
man/ca/
man/ca/man1/
@man man/ca/man1/mkvextract.1
@man man/ca/man1/mkvinfo.1
@man man/ca/man1/mkvmerge.1
@man man/ca/man1/mkvpropedit.1
man/de/
man/de/man1/
@man man/de/man1/mkvextract.1
@man man/de/man1/mkvinfo.1
@man man/de/man1/mkvmerge.1
@man man/de/man1/mkvpropedit.1
man/es/
man/es/man1/
@man man/es/man1/mkvextract.1
@man man/es/man1/mkvinfo.1
@man man/es/man1/mkvmerge.1
@man man/es/man1/mkvpropedit.1
man/ja/
man/ja/man1/
@man man/ja/man1/mkvextract.1
@man man/ja/man1/mkvinfo.1
@man man/ja/man1/mkvmerge.1
@man man/ja/man1/mkvpropedit.1
man/ko/
man/ko/man1/
@man man/ko/man1/mkvextract.1
@man man/ko/man1/mkvinfo.1
@man man/ko/man1/mkvmerge.1
@man man/ko/man1/mkvpropedit.1
@man man/man1/mkvextract.1
@man man/man1/mkvinfo.1
@man man/man1/mkvmerge.1
@man man/man1/mkvpropedit.1
man/nl/
man/nl/man1/
@man man/nl/man1/mkvextract.1
@man man/nl/man1/mkvinfo.1
@man man/nl/man1/mkvmerge.1
@man man/nl/man1/mkvpropedit.1
man/pl/
man/pl/man1/
@man man/pl/man1/mkvextract.1
@man man/pl/man1/mkvinfo.1
@man man/pl/man1/mkvmerge.1
@man man/pl/man1/mkvpropedit.1
man/uk/
man/uk/man1/
@man man/uk/man1/mkvextract.1
@man man/uk/man1/mkvinfo.1
@man man/uk/man1/mkvmerge.1
@man man/uk/man1/mkvpropedit.1
man/zh_CN/
man/zh_CN/man1/
@man man/zh_CN/man1/mkvextract.1
@man man/zh_CN/man1/mkvinfo.1
@man man/zh_CN/man1/mkvmerge.1
@man man/zh_CN/man1/mkvpropedit.1
share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
share/locale/de/LC_MESSAGES/mkvtoolnix.mo
@ -75,6 +21,7 @@ share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
share/locale/pl/LC_MESSAGES/mkvtoolnix.mo
share/locale/pt/LC_MESSAGES/mkvtoolnix.mo
share/locale/pt_BR/LC_MESSAGES/mkvtoolnix.mo
share/locale/ro/LC_MESSAGES/mkvtoolnix.mo
share/locale/ru/LC_MESSAGES/mkvtoolnix.mo
share/locale/sr_RS/
share/locale/sr_RS/LC_MESSAGES/