diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mkvtoolnix/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/distinfo | 12 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/options.mk | 15 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/patches/patch-Rakefile | 10 |
4 files changed, 22 insertions, 24 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 58d796913c8..bc56b2fecc0 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.177 2021/06/13 18:47:47 adam Exp $ +# $NetBSD: Makefile,v 1.178 2021/07/14 07:39:05 adam Exp $ -DISTNAME= mkvtoolnix-58.0.0 +DISTNAME= mkvtoolnix-59.0.0 CATEGORIES= multimedia MASTER_SITES= https://mkvtoolnix.download/sources/ EXTRACT_SUFX= .tar.xz @@ -27,8 +27,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-optimization CONFIGURE_ARGS+= --disable-precompiled-headers CONFIGURE_ARGS+= --disable-update-check +CONFIGURE_ARGS+= --enable-qt5 CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib CONFIGURE_ARGS+= --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook +CONFIGURE_ARGS+= --with-qmake=${QTDIR}/bin/qmake REPLACE_LOCALEDIR_PATTERNS= build-config.in @@ -54,9 +56,9 @@ do-install: .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/gmp/buildlink3.mk" BUILDLINK_API_DEPENDS.libebml+= libebml>=1.4.2 .include "../../devel/libebml/buildlink3.mk" -.include "../../devel/pcre2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=1.6.3 .include "../../multimedia/libmatroska/buildlink3.mk" @@ -66,4 +68,5 @@ BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=1.6.3 .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/fmtlib/buildlink3.mk" .include "../../textproc/pugixml/buildlink3.mk" +.include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo index f9e5f8f16a4..689b044913d 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.91 2021/06/13 18:47:47 adam Exp $ +$NetBSD: distinfo,v 1.92 2021/07/14 07:39:05 adam Exp $ -SHA1 (mkvtoolnix-58.0.0.tar.xz) = 16e2d01b2dd9dcc1e75ebd9b17ac052a47266d4d -RMD160 (mkvtoolnix-58.0.0.tar.xz) = 3c513bf1851cfa9f439e2739a8027692ad2de6ea -SHA512 (mkvtoolnix-58.0.0.tar.xz) = 50f2600ce3c4ac697d0f48e1a36627daddaed2989d5c00adb3077e60b31d3548fe82c9acd4c587ef51e62f76cd285c59679f0946988094c56cac321b58bef178 -Size (mkvtoolnix-58.0.0.tar.xz) = 7651964 bytes -SHA1 (patch-Rakefile) = 94c0a9ae0443f652a87f91cec195fe0d7afb61ac +SHA1 (mkvtoolnix-59.0.0.tar.xz) = 0a3fe17d2e08ec84cf3943b85149a51d5bc29fba +RMD160 (mkvtoolnix-59.0.0.tar.xz) = 84523c39f4210cb451407928872e726d14818ea0 +SHA512 (mkvtoolnix-59.0.0.tar.xz) = f49a542fa6d6d9573eb1a2296aff11575c56fb56a32fbd6f1ccc74b3592f6350360d8f8264f1c194569866ad15b7517d6dc42b11da81a6827ba6fc629e7bba57 +Size (mkvtoolnix-59.0.0.tar.xz) = 7643532 bytes +SHA1 (patch-Rakefile) = 44aa3a62cd6ce2f36c82abe88e202a708dbf9d2c SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0 diff --git a/multimedia/mkvtoolnix/options.mk b/multimedia/mkvtoolnix/options.mk index 50e43df5538..81816908840 100644 --- a/multimedia/mkvtoolnix/options.mk +++ b/multimedia/mkvtoolnix/options.mk @@ -1,21 +1,16 @@ -# $NetBSD: options.mk,v 1.3 2017/09/17 12:00:41 adam Exp $ +# $NetBSD: options.mk,v 1.4 2021/07/14 07:39:05 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mkvtoolnix -PKG_SUPPORTED_OPTIONS= qt5 +PKG_SUPPORTED_OPTIONS= gui .include "../../mk/bsd.options.mk" PLIST_SRC= ${PLIST_SRC_DFLT} -.if !empty(PKG_OPTIONS:Mqt5) +.if !empty(PKG_OPTIONS:Mgui) PLIST_SRC+= PLIST.gui -CONFIGURE_ARGS+= --enable-qt -CONFIGURE_ARGS+= --with-moc=${QTDIR}/bin/moc -CONFIGURE_ARGS+= --with-qmake=${QTDIR}/bin/qmake -CONFIGURE_ARGS+= --with-rcc=${QTDIR}/bin/rcc -CONFIGURE_ARGS+= --with-uic=${QTDIR}/bin/uic +CONFIGURE_ARGS+= --enable-gui .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/qt5-qtmultimedia/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-qt +CONFIGURE_ARGS+= --disable-gui .endif diff --git a/multimedia/mkvtoolnix/patches/patch-Rakefile b/multimedia/mkvtoolnix/patches/patch-Rakefile index dca35b4030b..b16d31034dd 100644 --- a/multimedia/mkvtoolnix/patches/patch-Rakefile +++ b/multimedia/mkvtoolnix/patches/patch-Rakefile @@ -1,19 +1,19 @@ -$NetBSD: patch-Rakefile,v 1.5 2019/11/05 18:01:48 adam Exp $ +$NetBSD: patch-Rakefile,v 1.6 2021/07/14 07:39:05 adam Exp $ Leave pkgsrc to handle security features and optimization. ---- Rakefile.orig 2019-11-04 20:54:12.000000000 +0000 +--- Rakefile.orig 2021-07-10 10:32:55.000000000 +0000 +++ Rakefile -@@ -128,8 +128,6 @@ def setup_globals - cflags_common += " #{c(:WNO_INCONSISTENT_MISSING_OVERRIDE)} #{c(:WNO_POTENTIALLY_EVALUATED_EXPRESSION)}" +@@ -131,8 +131,6 @@ def setup_globals cflags_common += " #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64" + cflags_common += " -DQT_NO_KEYWORDS" cflags_common += " -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\"" - cflags_common += determine_stack_protector_flags - cflags_common += determine_optimization_cflags cflags_common += " -g3 -DDEBUG" if c?(:USE_DEBUG) cflags_common += " -pg" if c?(:USE_PROFILING) cflags_common += " -fsanitize=undefined" if c?(:USE_UBSAN) -@@ -160,7 +158,6 @@ def setup_globals +@@ -162,7 +160,6 @@ def setup_globals cxxflags += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}" ldflags = "" |