CVS commit: pkgsrc/multimedia/mkvtoolnix

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Sep 17 12:00:41 UTC 2017

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile PLIST PLIST.gui distinfo
            options.mk

Log Message:
multimedia/mkvtoolnix: update to 15.0.0

Version 15.0.0 "Duel with the Devil":

Important notes
* mkvmerge, mkvpropedit, GUI's header and chapter editors: the programs will
  no longer add most missing Matroska elements that are mandatory but have a
  default value in the Matroska specification (e.g. the `TagLanguage` element
  with a value of `und` if it isn't present in its `SimpleTag` parent). Due to
  this change libEBML v1.3.5 is now required.

New features and enhancements
* MKVToolNix GUI: multiplex tool: added a new entry to the "source files"
  context menu labeled "Set destination file name from selected file's
  name". It will force the GUI to consider the selected file to be the
  reference for automatically setting the file name, no matter which file was
  originally added as the first file. It will also force setting the
  destination file name once if automatic destination file name generation is
  turned off in the preferences. Implements part of 2058.
* MKVToolNix GUI: multiplex tool: added an option in the preferences on
  "Multiplexer" → "Output" labeled "Only use the first source file that
  contains a video track". If enabled, only source files containing video
  tracks will be used for setting the destination file name. Other files that
  are added are ignore. Implements the rest of 2058.
* MKVToolNix GUI: header editor: added support for editing the video colour
  attributes. Implements the second half of 2038.
* MKVToolNix GUI: header editor: added support for the "video projection"
  track header attributes. Part of the implementation of 2064.
* MKVToolNix GUI: job queue: selected jobs can now be move up and down by
  pressing the `Ctrl+Up` and `Ctrl+Down` keys. Additionally, push buttons to
  move them up & down are shown if the corresponding option is enabled in the
  preferences. Implements 2060.
* mkvmerge: added support for the "video projection" track header
  attributes. Part of the implementation of 2064.
* mkvinfo: added support for the "video projection" track header
  attributes. Part of the implementation of 2064.
* mkvpropedit: added support for editing the video colour
  attributes. Implements one half of 2038.
* mkvpropedit: added support for the "video projection" track header
  attributes. Part of the implementation of 2064.

Bug fixes
* all: selecting the program's language (e.g. via the `--ui-language`
  command-line option or via the GUI's preferences) did not work on Linux &
  Unix if the `LANGUAGE` environment variable was set and didn't include the
  desired language. Fixes 2070.
* MKVToolNix GUI: removed the keyboard shortcuts for switching between the
  different tools (e.g. `Ctrl+Alt+1` for the multiplexer). They overlapped
  with basic functionality on keyboards that use an `AltGr` key, e.g. German
  ones, where `AltGr+7` emits `{`. As `AltGr+key` is implemented as
  `Ctrl+Alt+key` under the hood, this means that `AltGr+7` is really
  `Ctrl+Alt+7` which the GUI now took to mean "switch to the job queue"
  instead of "insert `{`". Fixes 2056.
* MKVToolNix GUI: header editor: after saving the file the GUI wasn't updating
  its internal file modification timestamp. That lead to the GUI wrongfully
  claiming that the file had been modified externally when the user wanted to
  save the file once more, requiring a reload of the file losing all
  modifications made since saving the first time.
* mkvmerge: DTS handling: some source files provide timestamps for audio
  tracks only once every `n` audio frames. In such situations mkvmerge was
  buffering too much data resulting in a single gap in the timestamps of one
  frame duration after frame number `n - 1` (the second audio timestamp read
  from the source file was used one output frame too early). Fixes 2071.
* mkvinfo: fixed a null pointer dereference if an `EbmlBinary` element's data
  pointer is a null pointer. Fixes 2072.

Build system changes
* configure: added option `--disable-update-check`. If given, the code
  checking online for available updates will be disabled. The update check is
  enabled and included in the GUI by default.
* libEBML v1.3.5 is now required.

Other changes
* mkvmerge: the option `--colour-matrix` has been renamed to
  `--colour-matrix-coefficients` in order to match the specification more
  closely. The old option name will continue to be recognized as well.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/mkvtoolnix/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/mkvtoolnix/PLIST.gui
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/mkvtoolnix/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.92 pkgsrc/multimedia/mkvtoolnix/Makefile:1.93
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.92  Sun Sep  3 08:53:11 2017
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Sun Sep 17 12:00:41 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2017/09/03 08:53:11 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2017/09/17 12:00:41 adam Exp $
 
-DISTNAME=      mkvtoolnix-9.5.0
-PKGREVISION=   7
+DISTNAME=      mkvtoolnix-15.0.0
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz
@@ -11,18 +10,23 @@ HOMEPAGE=   https://mkvtoolnix.download/
 COMMENT=       Set of tools to create, alter and inspect Matroska files
 LICENSE=       gnu-gpl-v2
 
+BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=        po4a-[0-9]*:../../textproc/po4a
 BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
-USE_LANGUAGES=         c c++
+USE_LANGUAGES=         c c++11
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake msgfmt
+USE_TOOLS+=            gmake msgfmt pkg-config
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --without-curl --disable-precompiled-headers
+CONFIGURE_ARGS+=       --disable-optimization
+CONFIGURE_ARGS+=       --disable-precompiled-headers
+CONFIGURE_ARGS+=       --disable-update-check
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
+CONFIGURE_ARGS+=       --with-boost-date-time=boost_date_time
 CONFIGURE_ARGS+=       --with-boost_regex=boost_regex
 CONFIGURE_ARGS+=       --with-boost-system=boost_system
 CONFIGURE_ARGS+=       --with-boost-filesystem=boost_filesystem
-CONFIGURE_ARGS+=       --disable-optimization
+CONFIGURE_ARGS+=       --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook
 
 REPLACE_LOCALEDIR_PATTERNS=    build-config.in
 
@@ -38,10 +42,10 @@ DRAKE_ARGS= # empty
 .endif
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/${RAKE_NAME} ${DRAKE_ARGS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} ${DRAKE_ARGS}
 
 do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${LOCALBASE}/bin/${RAKE_NAME} install
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${RAKE} install
 
 .include "options.mk"
 
@@ -51,12 +55,12 @@ do-install:
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.libebml+= libebml>=1.2.2
+BUILDLINK_ABI_DEPENDS.libebml+= libebml>=1.3.5
 .include "../../devel/libebml/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"

Index: pkgsrc/multimedia/mkvtoolnix/PLIST
diff -u pkgsrc/multimedia/mkvtoolnix/PLIST:1.7 pkgsrc/multimedia/mkvtoolnix/PLIST:1.8
--- pkgsrc/multimedia/mkvtoolnix/PLIST:1.7      Thu Sep  8 16:18:01 2016
+++ pkgsrc/multimedia/mkvtoolnix/PLIST  Sun Sep 17 12:00:41 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/09/08 16:18:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/09/17 12:00:41 adam Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
@@ -57,6 +57,7 @@ share/locale/nl/LC_MESSAGES/mkvtoolnix.m
 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/LC_MESSAGES/mkvtoolnix.mo
 share/locale/sr_RS@latin/LC_MESSAGES/mkvtoolnix.mo

Index: pkgsrc/multimedia/mkvtoolnix/PLIST.gui
diff -u pkgsrc/multimedia/mkvtoolnix/PLIST.gui:1.1 pkgsrc/multimedia/mkvtoolnix/PLIST.gui:1.2
--- pkgsrc/multimedia/mkvtoolnix/PLIST.gui:1.1  Thu Sep  8 16:18:01 2016
+++ pkgsrc/multimedia/mkvtoolnix/PLIST.gui      Sun Sep 17 12:00:41 2017
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.gui,v 1.1 2016/09/08 16:18:01 joerg Exp $
+@comment $NetBSD: PLIST.gui,v 1.2 2017/09/17 12:00:41 adam Exp $
+bin/mkvinfo-gui
 bin/mkvtoolnix-gui
 man/ca/man1/mkvtoolnix-gui.1
 man/de/man1/mkvtoolnix-gui.1
@@ -10,8 +11,8 @@ man/nl/man1/mkvtoolnix-gui.1
 man/pl/man1/mkvtoolnix-gui.1
 man/uk/man1/mkvtoolnix-gui.1
 man/zh_CN/man1/mkvtoolnix-gui.1
-share/applications/mkvinfo.desktop
-share/applications/mkvtoolnix-gui.desktop
+share/applications/org.bunkus.mkvinfo.desktop
+share/applications/org.bunkus.mkvtoolnix-gui.desktop
 share/icons/hicolor/128x128/apps/mkvextract.png
 share/icons/hicolor/128x128/apps/mkvinfo.png
 share/icons/hicolor/128x128/apps/mkvmerge.png
@@ -53,3 +54,6 @@ share/icons/hicolor/96x96/apps/mkvmerge.
 share/icons/hicolor/96x96/apps/mkvpropedit.png
 share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
 share/mime/packages/mkvtoolnix.xml
+share/mkvtoolnix/sounds/finished-1.ogg
+share/mkvtoolnix/sounds/finished-2.ogg
+share/mkvtoolnix/sounds/finished-3.ogg

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.40 pkgsrc/multimedia/mkvtoolnix/distinfo:1.41
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.40  Sun Nov 20 21:58:39 2016
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Sun Sep 17 12:00:41 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2016/11/20 21:58:39 joerg Exp $
+$NetBSD: distinfo,v 1.41 2017/09/17 12:00:41 adam Exp $
 
-SHA1 (mkvtoolnix-9.5.0.tar.xz) = 66050c813ee5a5ec7e2cbdff1e601a9087ddf5b8
-RMD160 (mkvtoolnix-9.5.0.tar.xz) = 0391f1800f50be8604d9fd1d1fd5636a00d6ccd5
-SHA512 (mkvtoolnix-9.5.0.tar.xz) = 8a7742a395556ac00878ecb775334bf88d833054415ffd2820283fa4b430770934d312665093b876777571410c4f23f2cc7b3a97768bbfa0476cc9b4159e8435
-Size (mkvtoolnix-9.5.0.tar.xz) = 3785316 bytes
+SHA1 (mkvtoolnix-15.0.0.tar.xz) = 4c5c0d1f0859c18bd9c3adde6ff2d94de7de536e
+RMD160 (mkvtoolnix-15.0.0.tar.xz) = e73e6f0c19b3ca46fbb795a7716404025d80cf89
+SHA512 (mkvtoolnix-15.0.0.tar.xz) = 5cef57dce4e6ca3d036142e42e302e8a315782ded11fb4c5982b406d389c8709bc7cf2a86d605b7c02797dc7b907dc3895db515e9d3e40976ab14198d9f400c6
+Size (mkvtoolnix-15.0.0.tar.xz) = 4552588 bytes

Index: pkgsrc/multimedia/mkvtoolnix/options.mk
diff -u pkgsrc/multimedia/mkvtoolnix/options.mk:1.2 pkgsrc/multimedia/mkvtoolnix/options.mk:1.3
--- pkgsrc/multimedia/mkvtoolnix/options.mk:1.2 Thu Sep  8 16:18:01 2016
+++ pkgsrc/multimedia/mkvtoolnix/options.mk     Sun Sep 17 12:00:41 2017
@@ -1,19 +1,21 @@
-# $NetBSD: options.mk,v 1.2 2016/09/08 16:18:01 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2017/09/17 12:00:41 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mkvtoolnix
-PKG_SUPPORTED_OPTIONS= gui
-PKG_SUGGESTED_OPTIONS= # empty
+PKG_SUPPORTED_OPTIONS= qt5
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_SRC=             ${PLIST_SRC_DFLT}
 
-.if !empty(PKG_OPTIONS:Mgui)
+.if !empty(PKG_OPTIONS:Mqt5)
 PLIST_SRC+=            PLIST.gui
-CONFIGURE_ARGS+=       --enable-qt MOC=${QTDIR}/bin/moc
-CONFIGURE_ARGS+=       UIC=${QTDIR}/bin/uic RCC=${QTDIR}/bin/rcc
-USE_TOOLS+=            pkg-config
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+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
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-qt
 .endif