Received: by mail.netbsd.org (Postfix, from userid 605) id 77B4C84DBB; Thu, 8 Feb 2018 07:29:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E860B84D5F for ; Thu, 8 Feb 2018 07:28:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id CNZVw65YZN1A for ; Thu, 8 Feb 2018 07:28:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C7D8C84D31 for ; Thu, 8 Feb 2018 07:28:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BCD40FB40; Thu, 8 Feb 2018 07:28:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1518074938120080" MIME-Version: 1.0 Date: Thu, 8 Feb 2018 07:28:58 +0000 From: "matthew green" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: mrg@netbsd.org X-Mailer: log_accum Message-Id: <20180208072858.BCD40FB40@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. --_----------=_1518074938120080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mrg Date: Thu Feb 8 07:28:58 UTC 2018 Modified Files: pkgsrc/audio/audacity: distinfo pkgsrc/multimedia/smpeg2: distinfo pkgsrc/sysutils/strigi: distinfo pkgsrc/sysutils/strigi/patches: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake pkgsrc/textproc/libclucene: distinfo Added Files: pkgsrc/audio/audacity/patches: patch-src_effects_lv2_LV2Effect.cpp patch-src_effects_nyquist_Nyquist.cpp pkgsrc/multimedia/smpeg2/patches: patch-audio_hufftable.cpp pkgsrc/sysutils/strigi/patches: patch-libstreams_cmake_MacroCheckGccVisibility.cmake pkgsrc/textproc/libclucene/patches: patch-src_shared_cmake_MacroCheckGccVisibility.cmake Log Message: port these packages to GCC 6: - audacity: GCC 6 wants std namespace, found via . - smpeg2: don't initialise unsigned with "0-1". - libclucene/strigi: match GCC 6 (and 7, and 8, and 9.) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/audacity/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp \ pkgsrc/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/smpeg2/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/smpeg2/patches/patch-audio_hufftable.cpp cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/strigi/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/libclucene/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1518074938120080 Content-Disposition: inline Content-Length: 11982 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/audacity/distinfo diff -u pkgsrc/audio/audacity/distinfo:1.33 pkgsrc/audio/audacity/distinfo:1.34 --- pkgsrc/audio/audacity/distinfo:1.33 Sat Jul 16 01:32:51 2016 +++ pkgsrc/audio/audacity/distinfo Thu Feb 8 07:28:57 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2016/07/16 01:32:51 markd Exp $ +$NetBSD: distinfo,v 1.34 2018/02/08 07:28:57 mrg Exp $ SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6 RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c @@ -19,5 +19,7 @@ SHA1 (patch-lib-src_sbsms_src-extra_Make SHA1 (patch-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb +SHA1 (patch-src_effects_lv2_LV2Effect.cpp) = 88972bb870f9aa1018337a6e2e4042827f3c6e7f +SHA1 (patch-src_effects_nyquist_Nyquist.cpp) = 1a931e9287960a43f862bbfa2c6fc8ee535a4bec SHA1 (patch-src_effects_vamp_LoadVamp.cpp) = 5e57289e99d8ac5323b869138d13b67b5ad8a3d6 SHA1 (patch-src_import_ImportFLAC.cpp) = 9064b5f24cfd837d9a5d5bb74450bcfd0096b099 Index: pkgsrc/multimedia/smpeg2/distinfo diff -u pkgsrc/multimedia/smpeg2/distinfo:1.2 pkgsrc/multimedia/smpeg2/distinfo:1.3 --- pkgsrc/multimedia/smpeg2/distinfo:1.2 Tue Nov 3 23:54:32 2015 +++ pkgsrc/multimedia/smpeg2/distinfo Thu Feb 8 07:28:58 2018 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 23:54:32 agc Exp $ +$NetBSD: distinfo,v 1.3 2018/02/08 07:28:58 mrg Exp $ SHA1 (smpeg2-2.0.0.tar.gz) = d0455466f61a8e55f83f4d7fd82f1c305bce6832 RMD160 (smpeg2-2.0.0.tar.gz) = 6c175111e38055d62064c6b6453d8c5e64945c09 SHA512 (smpeg2-2.0.0.tar.gz) = 80a779d01e7aa76778ef6ceea8041537db9e4b354df413214c4413c875cb98551891cef98fa0f057cc6a3222e4983da9ae65b86bdad2f87f9e2a6751837e2baf Size (smpeg2-2.0.0.tar.gz) = 482322 bytes +SHA1 (patch-audio_hufftable.cpp) = 20b8cf5f0491a7e50af14f526fc4d0b901b25499 Index: pkgsrc/sysutils/strigi/distinfo diff -u pkgsrc/sysutils/strigi/distinfo:1.11 pkgsrc/sysutils/strigi/distinfo:1.12 --- pkgsrc/sysutils/strigi/distinfo:1.11 Sat Jul 16 04:47:45 2016 +++ pkgsrc/sysutils/strigi/distinfo Thu Feb 8 07:28:58 2018 @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.11 2016/07/16 04:47:45 markd Exp $ +$NetBSD: distinfo,v 1.12 2018/02/08 07:28:58 mrg Exp $ SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882 RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8 SHA512 (strigi-0.7.8.tar.bz2) = 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 Size (strigi-0.7.8.tar.bz2) = 810574 bytes -SHA1 (patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake) = f1d0cc475c3ef74a82d3cc4c178955a19bb385e3 +SHA1 (patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake) = e3489b44e6676ec9a551867a955588500d78ae53 SHA1 (patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp) = a5882febfd31a391f4efaa37a8786e1f7ddd0a7a SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a +SHA1 (patch-libstreams_cmake_MacroCheckGccVisibility.cmake) = f5c214d9800b7caa3b2e7e3e1bb20e5aafd3c884 SHA1 (patch-strigidaemon_bin_daemon_xesam_xesamsearch.h) = 70d251880f08f279f53a3ed31281452c6d25811d Index: pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake diff -u pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake:1.1 pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake:1.2 --- pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake:1.1 Sat Jul 16 04:47:45 2016 +++ pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake Thu Feb 8 07:28:58 2018 @@ -1,6 +1,6 @@ -$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.1 2016/07/16 04:47:45 markd Exp $ +$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.2 2018/02/08 07:28:58 mrg Exp $ -Support gcc6 +Support gcc6/7/8/9 --- libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 21:34:52.000000000 +0000 +++ libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake @@ -9,7 +9,7 @@ Support gcc6 exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: if (NOT _gcc_version) string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") Index: pkgsrc/textproc/libclucene/distinfo diff -u pkgsrc/textproc/libclucene/distinfo:1.9 pkgsrc/textproc/libclucene/distinfo:1.10 --- pkgsrc/textproc/libclucene/distinfo:1.9 Fri Jan 26 15:27:04 2018 +++ pkgsrc/textproc/libclucene/distinfo Thu Feb 8 07:28:58 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2018/01/26 15:27:04 jperkin Exp $ +$NetBSD: distinfo,v 1.10 2018/02/08 07:28:58 mrg Exp $ SHA1 (clucene-core-2.3.3.4.tar.gz) = 76d6788e747e78abb5abf8eaad78d3342da5f2a4 RMD160 (clucene-core-2.3.3.4.tar.gz) = 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b @@ -12,3 +12,4 @@ SHA1 (patch-src_core_CLucene_queryParser SHA1 (patch-src_core_CLucene_queryParser_QueryParserTokenManager.h) = 6934ad5e1052850b2aed50d91260bd46801e6274 SHA1 (patch-src_shared_CLucene_LuceneThreads.h) = a08f4ccc70150510650ba82c64b1dff8495b1f10 SHA1 (patch-src_shared_CLucene_config_repl__tchar.h) = 465537d5ee226d9831df2da8d87f3dbc5e364d5f +SHA1 (patch-src_shared_cmake_MacroCheckGccVisibility.cmake) = 90aaa4649ed167afb3a556dbf251f2205e1c348a Added files: Index: pkgsrc/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp diff -u /dev/null pkgsrc/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp:1.1 --- /dev/null Thu Feb 8 07:28:58 2018 +++ pkgsrc/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp Thu Feb 8 07:28:58 2018 @@ -0,0 +1,23 @@ +$NetBSD: patch-src_effects_lv2_LV2Effect.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +GCC 6 wants std namespace, found via . + +--- src/effects/lv2/LV2Effect.cpp.orig 2016-01-13 14:31:24.000000000 +0000 ++++ src/effects/lv2/LV2Effect.cpp 2018-02-07 10:20:15.597051982 +0000 +@@ -562,13 +562,13 @@ + lilv_scale_points_free(points); + + // Collect the value and range info +- ctrl.mHasLo = !isnan(minimumVals[i]); +- ctrl.mHasHi = !isnan(maximumVals[i]); ++ ctrl.mHasLo = !std::isnan(minimumVals[i]); ++ ctrl.mHasHi = !std::isnan(maximumVals[i]); + ctrl.mMin = ctrl.mHasLo ? minimumVals[i] : 0.0; + ctrl.mMax = ctrl.mHasHi ? maximumVals[i] : 1.0; + ctrl.mLo = ctrl.mMin; + ctrl.mHi = ctrl.mMax; +- ctrl.mDef = !isnan(defaultValues[i]) ? ++ ctrl.mDef = !std::isnan(defaultValues[i]) ? + defaultValues[i] : + ctrl.mHasLo ? + ctrl.mLo : Index: pkgsrc/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp diff -u /dev/null pkgsrc/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp:1.1 --- /dev/null Thu Feb 8 07:28:58 2018 +++ pkgsrc/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp Thu Feb 8 07:28:58 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_effects_nyquist_Nyquist.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +GCC 6 wants std namespace, found via . + +--- src/effects/nyquist/Nyquist.cpp.orig 2018-02-07 10:04:58.228319803 +0000 ++++ src/effects/nyquist/Nyquist.cpp 2018-02-07 10:14:46.346004080 +0000 +@@ -666,7 +666,7 @@ + // with very small values, bandwidth calculation may be inf. + // (Observed on Linux) + double bw = log(mF1 / mF0) / log(2.0); +- if (!isinf(bw)) { ++ if (!std::isinf(bw)) { + bandwidth.Printf(wxT("(float %s)"), Internat::ToString(bw).c_str()); + } + } Index: pkgsrc/multimedia/smpeg2/patches/patch-audio_hufftable.cpp diff -u /dev/null pkgsrc/multimedia/smpeg2/patches/patch-audio_hufftable.cpp:1.1 --- /dev/null Thu Feb 8 07:28:58 2018 +++ pkgsrc/multimedia/smpeg2/patches/patch-audio_hufftable.cpp Thu Feb 8 07:28:58 2018 @@ -0,0 +1,29 @@ +$NetBSD: patch-audio_hufftable.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +don't initialise unsigned with "0-1". + +--- audio/hufftable.cpp.orig 2013-06-01 15:19:04.000000000 +0000 ++++ audio/hufftable.cpp 2018-02-07 11:40:46.545617490 +0000 +@@ -550,11 +550,11 @@ + + const HUFFMANCODETABLE MPEGaudio::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +564,7 @@ + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, Index: pkgsrc/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake diff -u /dev/null pkgsrc/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake:1.1 --- /dev/null Thu Feb 8 07:28:58 2018 +++ pkgsrc/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake Thu Feb 8 07:28:58 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-libstreams_cmake_MacroCheckGccVisibility.cmake,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +support netbsd 6, 7, 8, and 9. + +--- libstreams/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 13:34:57.000000000 -0800 ++++ libstreams/cmake/MacroCheckGccVisibility.cmake 2018-02-07 22:38:19.000000000 -0800 +@@ -15,7 +15,7 @@ + # get the gcc version + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: + if (NOT _gcc_version) + string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") Index: pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake diff -u /dev/null pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake:1.1 --- /dev/null Thu Feb 8 07:28:58 2018 +++ pkgsrc/textproc/libclucene/patches/patch-src_shared_cmake_MacroCheckGccVisibility.cmake Thu Feb 8 07:28:58 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_shared_cmake_MacroCheckGccVisibility.cmake,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +also look for GCC 6, 7, 8 and 9. + +--- src/shared/cmake/MacroCheckGccVisibility.cmake.orig 2011-03-17 00:21:07.000000000 +0000 ++++ src/shared/cmake/MacroCheckGccVisibility.cmake 2018-02-08 06:10:02.136958010 +0000 +@@ -15,7 +15,7 @@ + # get the gcc version + exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + if (NOT _gcc_version) + + # clang reports: clang version 1.1 (trunk 95754) --_----------=_1518074938120080--