CVS commit: pkgsrc/multimedia/mkvtoolnix

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb 12 23:46:23 UTC 2019

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile distinfo
        pkgsrc/multimedia/mkvtoolnix/patches: patch-Rakefile

Log Message:
mkvtoolnix: fix buildling on macOS; remove DRAKE_FLAGS because current rake automatically chosses number of jobs


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r1.1 -r1.2 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.

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.125 pkgsrc/multimedia/mkvtoolnix/Makefile:1.126
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.125 Mon Feb 11 08:18:07 2019
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Tue Feb 12 23:46:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2019/02/11 08:18:07 adam Exp $
+# $NetBSD: Makefile,v 1.126 2019/02/12 23:46:23 adam Exp $
 
 DISTNAME=      mkvtoolnix-31.0.0
 CATEGORIES=    multimedia
@@ -35,14 +35,8 @@ LDFLAGS.SunOS+=              -lintl
 
 INSTALL_ENV+=  SHELL=${SH:Q}
 
-.if !empty(MAKE_JOBS)
-DRAKE_ARGS=    -v -j${MAKE_JOBS}
-.else
-DRAKE_ARGS=    # empty
-.endif
-
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} ${DRAKE_ARGS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE}
 
 do-install:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${RAKE} install

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.62 pkgsrc/multimedia/mkvtoolnix/distinfo:1.63
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.62  Mon Feb 11 08:18:07 2019
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Tue Feb 12 23:46:23 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.62 2019/02/11 08:18:07 adam Exp $
+$NetBSD: distinfo,v 1.63 2019/02/12 23:46:23 adam Exp $
 
 SHA1 (mkvtoolnix-31.0.0.tar.xz) = 0a7dd9b4e90e222450dc3cc83560f1d77e54deac
 RMD160 (mkvtoolnix-31.0.0.tar.xz) = 32cef0bce6f968b45f7fa200eab5899557ea7581
 SHA512 (mkvtoolnix-31.0.0.tar.xz) = 085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
 Size (mkvtoolnix-31.0.0.tar.xz) = 7282492 bytes
-SHA1 (patch-Rakefile) = bac8a1e581725e329079ab0acccd83795d707594
+SHA1 (patch-Rakefile) = 85e44c7649dc27207d127a2957d3a9aeed49ec7e
 SHA1 (patch-build-config.in) = a9072de691ee3e011b472280dd276a67f1799fac
 SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile
diff -u pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.1 pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.2
--- pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile:1.1     Sun Dec  2 17:13:41 2018
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-Rakefile Tue Feb 12 23:46:23 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-Rakefile,v 1.1 2018/12/02 17:13:41 adam Exp $
+$NetBSD: patch-Rakefile,v 1.2 2019/02/12 23:46:23 adam Exp $
 
-Fix linking on macOS.
+Fix buildling on macOS.
 
---- Rakefile.orig      2018-12-02 17:00:02.000000000 +0000
+--- Rakefile.orig      2019-02-12 23:14:10.000000000 +0000
 +++ Rakefile
-@@ -1111,6 +1111,7 @@ if $build_mkvtoolnix_gui
-     libraries($common_libs, :qt).
-     libraries("-mwindows", :powrprof, :if => $building_for[:windows]).
-     libraries("-framework IOKit", :if => $building_for[:macos]).
-+    libraries("-framework CoreFoundation", :if => $building_for[:macos]).
-     libraries($custom_libs).
-     create
- end
+@@ -145,7 +145,6 @@ def setup_globals
+   cxxflags                 = "#{cflags_common} #{c(:STD_CXX)}"
+   cxxflags                += " -Woverloaded-virtual" if c(:COMPILER_TYPE) != "gcc" # too many false positives in EbmlElement.h on g++ 8
+   cxxflags                += " -Wnon-virtual-dtor -Wextra -Wno-missing-field-initializers #{c(:WSHADOW_COMPATIBLE_LOCAL)} #{c(:WNO_MAYBE_UNINITIALIZED)}"
+-  cxxflags                += " -fvisibility=hidden -fvisibility-inlines-hidden" if $building_for[:macos]
+   cxxflags                += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}"
+ 
+   ldflags                  = ""