diff -Nru strigi-0.7.8/debian/changelog strigi-0.7.8/debian/changelog --- strigi-0.7.8/debian/changelog 2016-05-01 14:55:35.000000000 +0000 +++ strigi-0.7.8/debian/changelog 2016-08-02 09:36:26.000000000 +0000 @@ -1,8 +1,9 @@ -strigi (0.7.8-2.1build1) yakkety; urgency=medium +strigi (0.7.8-2.2) unstable; urgency=medium - * Rebuild for ffmpeg 3.0. + * Non-maintainer upload. + * "Fix" GCC version check up to GCC 9. Closes: #812271. - -- Colin Watson Sun, 01 May 2016 15:55:35 +0100 + -- Matthias Klose Tue, 02 Aug 2016 11:36:26 +0200 strigi (0.7.8-2.1) unstable; urgency=medium diff -Nru strigi-0.7.8/debian/patches/gcc-version.diff strigi-0.7.8/debian/patches/gcc-version.diff --- strigi-0.7.8/debian/patches/gcc-version.diff 1970-01-01 00:00:00.000000000 +0000 +++ strigi-0.7.8/debian/patches/gcc-version.diff 2016-08-02 09:36:26.000000000 +0000 @@ -0,0 +1,26 @@ +Index: b/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake +=================================================================== +--- a/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake ++++ b/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake +@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi + # 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 "[3-9]\\.[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: b/libstreams/cmake/MacroCheckGccVisibility.cmake +=================================================================== +--- a/libstreams/cmake/MacroCheckGccVisibility.cmake ++++ b/libstreams/cmake/MacroCheckGccVisibility.cmake +@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi + # 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 "[3-9]\\.[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}") diff -Nru strigi-0.7.8/debian/patches/series strigi-0.7.8/debian/patches/series --- strigi-0.7.8/debian/patches/series 2016-03-08 22:23:16.000000000 +0000 +++ strigi-0.7.8/debian/patches/series 2016-08-02 09:35:56.000000000 +0000 @@ -1,3 +1,4 @@ deepgrep_mayhem_fix.diff libav10.patch ffmpeg_2.9.patch +gcc-version.diff