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

Update mkvtoolnix to 61.0.0

Browse Source
This commit is contained in:
rsadowski 2021-10-04 05:48:53 +00:00
parent 69d692397e
commit d332603633
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/mkvtoolnix/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.108 2021/09/18 07:50:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.109 2021/10/04 05:48:53 rsadowski Exp $
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-60.0.0
REVISION= 1
DISTNAME= mkvtoolnix-61.0.0
CATEGORIES= multimedia x11

4
multimedia/mkvtoolnix/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mkvtoolnix-60.0.0.tar.xz) = oSQ3eQRAWJch582LR2y4Mq3mrZ8XWVM+6P6RvZz6dMQ=
SIZE (mkvtoolnix-60.0.0.tar.xz) = 7657960
SHA256 (mkvtoolnix-61.0.0.tar.xz) = e43VTX1GSk+9vFMVvp8AC5BNDNO0cRkQBZzmbHd4k1s=
SIZE (mkvtoolnix-61.0.0.tar.xz) = 7662500

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

@ -1,11 +1,11 @@
$OpenBSD: patch-ac_qt5_m4,v 1.9 2021/09/07 05:58:12 rsadowski Exp $
$OpenBSD: patch-ac_qt5_m4,v 1.10 2021/10/04 05:48:53 rsadowski Exp $
Workaround for OpenBSD's pkg-config.
Index: ac/qt5.m4
--- ac/qt5.m4.orig
+++ ac/qt5.m4
@@ -78,21 +78,20 @@ check_qt5() {
@@ -78,17 +78,16 @@ check_qt5() {
fi
if test "x$with_qt_pkg_config" = xyes; then
@ -18,12 +18,16 @@ Index: ac/qt5.m4
- orig_with_qt_pkg_config_modules="$with_qt_pkg_config_modules,"
+ orig_with_qt_pkg_config_modules="$with_qt_pkg_config_modules"
- 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"
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core"
+ 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"
fi
if test x"$MINGW" = x1; then
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5WinExtras"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5WinExtras"
@@ -96,7 +95,7 @@ check_qt5() {
fi
PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],[ok=1],[ok=0])
@ -32,7 +36,16 @@ Index: ac/qt5.m4
if test $ok = 0; then
AC_MSG_CHECKING(for Qt 5)
@@ -111,7 +110,7 @@ check_qt5() {
@@ -107,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
- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5DBus"
AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
fi
fi
@@ -115,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`"