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

Update mkvtoolnix to 68.0.0

Browse Source
This commit is contained in:
rsadowski 2022-06-04 06:28:02 +00:00
parent 8b728e6fd4
commit 6c343ef536
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
multimedia/mkvtoolnix/Makefile
View File

@ -1,6 +1,6 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-67.0.0
DISTNAME= mkvtoolnix-68.0.0
CATEGORIES= multimedia x11
@ -11,10 +11,10 @@ MAINTAINER= Rafael Sadowski <rsadowski@openbsd.org>
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += FLAC Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
WANTLIB += Qt5Network Qt5Widgets c cmark dvdread ebml fmt gmp
WANTLIB += iconv intl m matroska ogg pugixml vorbis z
WANTLIB += ${COMPILER_LIBCXX} FLAC Qt5Concurrent Qt5Core Qt5DBus
WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5Svg Qt5Widgets c
WANTLIB += cmark dvdread ebml fmt gmp iconv intl m matroska ogg
WANTLIB += pugixml vorbis z
MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/
@ -50,7 +50,8 @@ LIB_DEPENDS= audio/flac \
textproc/cmark \
textproc/libebml>=1.4.0 \
textproc/pugixml \
x11/qt5/qtmultimedia
x11/qt5/qtmultimedia \
x11/qt5/qtsvg
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info \
@ -63,9 +64,6 @@ CONFIGURE_ARGS= --disable-optimization \
--disable-update-check \
--disable-qt6 \
--with-boost=${LOCALBASE} \
--with-boost-filesystem=boost_filesystem \
--with-boost-system=boost_system \
--with-boost-regex=boost_regex \
--with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook
MAKE_ENV+= V=1

4
multimedia/mkvtoolnix/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mkvtoolnix-67.0.0.tar.xz) = 22i+ke6KC2iNkkzADTusk0kwbVTCnORKVVcowau30+w=
SIZE (mkvtoolnix-67.0.0.tar.xz) = 7791720
SHA256 (mkvtoolnix-68.0.0.tar.xz) = nCnGHvNJaxhYXB43C8fhIffP4fjDW4UecxmmuDJf1m8=
SIZE (mkvtoolnix-68.0.0.tar.xz) = 10911424

4
multimedia/mkvtoolnix/patches/patch-Rakefile
View File

@ -4,7 +4,7 @@ Ensure that the default and working linker is used on all clang archs.
Index: Rakefile
--- Rakefile.orig
+++ Rakefile
@@ -167,7 +167,6 @@ def setup_globals
@@ -168,7 +168,6 @@ def setup_globals
ldflags = ""
ldflags += determine_stack_protector_flags
ldflags += " -pg" if c?(:USE_PROFILING)
@ -12,7 +12,7 @@ Index: Rakefile
ldflags += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL)
ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL)
ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"
@@ -1066,10 +1065,8 @@ $common_libs = [
@@ -1079,10 +1078,8 @@ $common_libs = [
:intl,
:iconv,
:fmt,

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

@ -3,11 +3,9 @@ Workaround for OpenBSD's pkg-config.
Index: ac/qt5.m4
--- ac/qt5.m4.orig
+++ ac/qt5.m4
@@ -77,17 +77,16 @@ check_qt5() {
fi
@@ -79,15 +79,15 @@ check_qt5() {
if test "x$with_qt_pkg_config" = xyes; then
- with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/ /,/g'`"
with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/ /,/g'`"
if test x"$with_qt_pkg_config_modules" != x ; then
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules"
@ -20,12 +18,12 @@ Index: ac/qt5.m4
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core"
if test x"$enable_gui" = xyes; then
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Gui Qt5Widgets Qt5Multimedia Qt5Network Qt5Concurrent"
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Gui,Qt5Widgets,Qt5Multimedia,Qt5Network,Qt5Concurrent,Qt5Svg"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Gui Qt5Widgets Qt5Multimedia Qt5Network Qt5Concurrent Qt5Svg"
fi
if test x"$MINGW" = x1; then
@@ -95,7 +94,7 @@ check_qt5() {
@@ -95,7 +95,7 @@ check_qt5() {
fi
PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],[ok=1],[ok=0])
@ -34,7 +32,7 @@ Index: ac/qt5.m4
if test $ok = 0; then
AC_MSG_CHECKING(for Qt 5)
@@ -106,7 +105,7 @@ check_qt5() {
@@ -106,7 +106,7 @@ check_qt5() {
if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
if test x"$dbus_found" = xyes; then
@ -43,7 +41,7 @@ Index: ac/qt5.m4
AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
fi
fi
@@ -114,7 +113,7 @@ check_qt5() {
@@ -114,7 +114,7 @@ check_qt5() {
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`"