Received: by mail.netbsd.org (Postfix, from userid 605) id BBC1C84DF9; Tue, 16 Apr 2019 07:21:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 38C9A84DE7 for ; Tue, 16 Apr 2019 07:21:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id C04Oq6AfIZDk for ; Tue, 16 Apr 2019 07:21:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7ACDB84CD4 for ; Tue, 16 Apr 2019 07:21:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 75B3EFB16; Tue, 16 Apr 2019 07:21:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15553993092110" MIME-Version: 1.0 Date: Tue, 16 Apr 2019 07:21:49 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia/mkvtoolnix To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20190416072149.75B3EFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15553993092110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Tue Apr 16 07:21:49 UTC 2019 Modified Files: pkgsrc/multimedia/mkvtoolnix: Makefile distinfo pkgsrc/multimedia/mkvtoolnix/patches: patch-Rakefile Log Message: mkvtoolnix: updated to 33.1.0 Version 33.1.0 "Primrose" Bug fixes * MKVToolNix GUI: multiplexer: Windows: using UNC paths (e.g. \\server\Videos) when the option "automatically set the destination file name" was set in the preferences, the GUI would create a destination file name with forward slashes (e.g. //server/Videos/outputfile.mkv), a syntax not supported by mkvmerge. * build system: the programs were accidentally built without stack protection (-fstack-protector-strong) on recent versions of gcc and clang. Version 33.0.0 "A Little Bit of Madness" Bug fixes * mkvinfo: when using the --size option, mkvinfo will now report the correctly if an element has an unknown size. * MKVToolNix GUI: info tool: clusters with an unknown size will now be read and displayed correctly. * MKVToolNix GUI: multiplexer: Windows: trying to open Blu-ray index or playlist files failed when the path to the files contained symbolic links (e.g. when mounting a drive in a sub-folder via Windows' disk management utility). * MKVToolNix GUI: multiplexer: if a destination file names ends with a number in parenthesis (e.g. a year such as "(2017)"), that number will not be stripped anymore during the process of ensuring the destination file name is unique. Only those suffixes added automatically in prior attempts to make the file name unique will be removed. * MKVToolNix GUI: multiplexer: Windows: the GUI will let the user change the drive letter part of the destination file name freely again and only verify its validity right before starting to mux/adding to the job queue. Before it tried to force that into something valid, often resulting in unintentional paths (such as "C:\users\…\DC\files\…"). To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 pkgsrc/multimedia/mkvtoolnix/Makefile cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/mkvtoolnix/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15553993092110 Content-Disposition: inline Content-Length: 4749 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/mkvtoolnix/Makefile diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.128 pkgsrc/multimedia/mkvtoolnix/Makefile:1.129 --- pkgsrc/multimedia/mkvtoolnix/Makefile:1.128 Wed Apr 3 00:32:55 2019 +++ pkgsrc/multimedia/mkvtoolnix/Makefile Tue Apr 16 07:21:49 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.128 2019/04/03 00:32:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.129 2019/04/16 07:21:49 adam Exp $ -DISTNAME= mkvtoolnix-32.0.0 -PKGREVISION= 1 +DISTNAME= mkvtoolnix-33.1.0 CATEGORIES= multimedia MASTER_SITES= https://mkvtoolnix.download/sources/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/multimedia/mkvtoolnix/distinfo diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.64 pkgsrc/multimedia/mkvtoolnix/distinfo:1.65 --- pkgsrc/multimedia/mkvtoolnix/distinfo:1.64 Wed Mar 13 17:36:26 2019 +++ pkgsrc/multimedia/mkvtoolnix/distinfo Tue Apr 16 07:21:49 2019 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.64 2019/03/13 17:36:26 adam Exp $ +$NetBSD: distinfo,v 1.65 2019/04/16 07:21:49 adam Exp $ -SHA1 (mkvtoolnix-32.0.0.tar.xz) = 17334cb0d4c7b5e93667dd956ed1c0eefc30b75c -RMD160 (mkvtoolnix-32.0.0.tar.xz) = 4c8302cf3d00389bf1f7470ddae13a874a3f95c2 -SHA512 (mkvtoolnix-32.0.0.tar.xz) = a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a -Size (mkvtoolnix-32.0.0.tar.xz) = 7282928 bytes -SHA1 (patch-Rakefile) = 7dd13c59dd891d4736e47e8fa83c245ccf97223c +SHA1 (mkvtoolnix-33.1.0.tar.xz) = 14ad66fb74050593c221a7a9d5ad048b1c48fab0 +RMD160 (mkvtoolnix-33.1.0.tar.xz) = fbe2b6f55e69b081f0dd27bf860f0580a457e57d +SHA512 (mkvtoolnix-33.1.0.tar.xz) = 40023a1d2c1c27fd5f490ec017852304442bee2c2ae2d62cf042c3fba56652ed7489a2b0ad9d5dd0fa57eb0af99a49a936666d85836f57cb9417868356874a83 +Size (mkvtoolnix-33.1.0.tar.xz) = 7286068 bytes +SHA1 (patch-Rakefile) = b9404cfd3121e962a60bad86668c1160511a8b0f SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109 Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.3 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.4 --- pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.3 Wed Mar 13 17:36:26 2019 +++ pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile Tue Apr 16 07:21:49 2019 @@ -1,15 +1,22 @@ -$NetBSD: patch-Rakefile,v 1.3 2019/03/13 17:36:26 adam Exp $ +$NetBSD: patch-Rakefile,v 1.4 2019/04/16 07:21:49 adam Exp $ Leave pkgsrc to handle security features. ---- Rakefile.orig 2019-03-12 21:12:17.000000000 +0000 +--- Rakefile.orig 2019-04-14 22:05:01.000000000 +0000 +++ Rakefile -@@ -151,8 +151,6 @@ def setup_globals - cxxflags += " -Wno-inconsistent-missing-override -Wno-potentially-evaluated-expression" if is_clang? - cxxflags += " -Wmisleading-indentation -Wduplicated-cond" if check_compiler_version("gcc", "6.0.0") - cxxflags += " -Wshadow-compatible-local -Wduplicated-branches" if check_compiler_version("gcc", "7.0.0") -- cxxflags += " -fstack-protector" if is_gcc? && !check_compiler_version("gcc", "4.9.0") -- cxxflags += " -fstack-protector-strong" if check_compiler_version("gcc", "4.9.0") && check_compiler_version("clang", "3.5.0") +@@ -130,7 +130,6 @@ def setup_globals + cflags_common += " #{c(:WNO_INCONSISTENT_MISSING_OVERRIDE)} #{c(:WNO_POTENTIALLY_EVALUATED_EXPRESSION)}" + cflags_common += " #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64" + cflags_common += " -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\"" +- cflags_common += stack_protector + cflags_common += " -fsanitize=undefined" if c?(:UBSAN) + cflags_common += " -fsanitize=address -fno-omit-frame-pointer" if c?(:ADDRSAN) + cflags_common += " -Ilib/libebml -Ilib/libmatroska" if c?(:EBML_MATROSKA_INTERNAL) +@@ -158,7 +157,6 @@ def setup_globals cxxflags += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}" ldflags = "" +- ldflags += stack_protector + ldflags += " -fuse-ld=lld" if is_clang? && !c(:LLVM_LLD).empty? + ldflags += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL) + ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL) --_----------=_15553993092110--