commit 0b88c7833db953463e9805e722d4300fd3279fb8 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Jul 1 07:35:07 2016 +0100 patch for gcc-6 mac-3.99-u4-b5-gcc6.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++++ mac.spec | 7 +++- 2 files changed, 93 insertions(+), 1 deletion(-) --- diff --git a/mac-3.99-u4-b5-gcc6.patch b/mac-3.99-u4-b5-gcc6.patch new file mode 100644 index 0000000..e797c87 --- /dev/null +++ b/mac-3.99-u4-b5-gcc6.patch @@ -0,0 +1,87 @@ +--- a/src/MACLib/APECompress.cpp ++++ b/src/MACLib/APECompress.cpp +@@ -3,6 +3,7 @@ + #include IO_HEADER_FILE + #include "APECompressCreate.h" + #include "WAVInputSource.h" ++#define min(a,b) ((a)<(b)?(a):(b)) + + CAPECompress::CAPECompress() + { + +--- a/src/MACLib/APEDecompress.cpp ++++ b/src/MACLib/APEDecompress.cpp +@@ -7,6 +7,7 @@ + #include "NewPredictor.h" + + #define DECODE_BLOCK_SIZE 4096 ++#define min(a,b) ((a)<(b)?(a):(b)) + + CAPEDecompress::CAPEDecompress(int * pErrorCode, CAPEInfo * pAPEInfo, int nStartBlock, int nFinishBlock) + { + +--- a/src/MACLib/APESimple.cpp ++++ b/src/MACLib/APESimple.cpp +@@ -14,6 +14,7 @@ + #define UNMAC_DECODER_OUTPUT_APE 2 + + #define BLOCKS_PER_DECODE 9216 ++#define min(a,b) ((a)<(b)?(a):(b)) + + int DecompressCore(const str_utf16 * pInputFilename, const str_utf16 * pOutputFilename, int nOutputMode, int nCompressionLevel, int * pPercentageDone, APE_PROGRESS_CALLBACK ProgressCallback, int * pKillFlag); + + +--- a/src/MACLib/BitArray.cpp ++++ b/src/MACLib/BitArray.cpp +@@ -20,6 +20,8 @@ + #define SHIFT_BITS (CODE_BITS - 9) + #define EXTRA_BITS ((CODE_BITS - 2) % 8 + 1) + #define BOTTOM_VALUE (TOP_VALUE >> 8) ++#define min(a,b) ((a)<(b)?(a):(b)) ++#define max(a,b) ((a)>(b)?(a):(b)) + + /************************************************************************************ + Lookup tables + +--- a/src/MACLib/APETag.cpp ++++ b/src/MACLib/APETag.cpp +@@ -4,6 +4,7 @@ + #include "CharacterHelper.h" + #include "IO.h" + #include IO_HEADER_FILE ++#define max(a,b) ((a)>(b)?(a):(b)) + + /***************************************************************************************** + CAPETagField + +--- a/src/MACLib/MACProgressHelper.cpp ++++ b/src/MACLib/MACProgressHelper.cpp +@@ -1,5 +1,6 @@ + #include "All.h" + #include "MACProgressHelper.h" ++#define max(a,b) ((a)>(b)?(a):(b)) + + CMACProgressHelper::CMACProgressHelper(int nTotalSteps, int * pPercentageDone, APE_PROGRESS_CALLBACK ProgressCallback, int * pKillFlag) + { + +--- a/src/MACLib/UnBitArray.cpp ++++ b/src/MACLib/UnBitArray.cpp +@@ -23,6 +23,7 @@ + #define BOTTOM_VALUE (TOP_VALUE >> 8) + + #define MODEL_ELEMENTS 64 ++#define max(a,b) ((a)>(b)?(a):(b)) + + /*********************************************************************************** + Construction + +--- a/src/MACLib/Prepare.cpp ++++ b/src/MACLib/Prepare.cpp +@@ -1,5 +1,6 @@ + #include "All.h" + #include "Prepare.h" ++#define max(a,b) ((a)>(b)?(a):(b)) + + const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368, + 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850, + diff --git a/mac.spec b/mac.spec index 5e95507..063a4fe 100644 --- a/mac.spec +++ b/mac.spec @@ -1,6 +1,6 @@ Name: mac Version: 3.99 -Release: 12.u4b5%{?dist} +Release: 13.u4b5%{?dist} Summary: Monkey's Audio Codec (MAC) utility Group: Applications/Multimedia @@ -11,6 +11,7 @@ Source1: mac-permission_to_redistribute.txt Patch0: mac-3.99-u4-b5-gcc44.patch Patch1: mac-3.99-u4-b5-analyse.patch Patch2: mac-3.99-u4-b5-gcc45.patch +Patch3: mac-3.99-u4-b5-gcc6.patch %ifarch i686 x86_64 BuildRequires: yasm @@ -59,6 +60,7 @@ developing applications that use %{name}. %patch0 -p1 -b .gcc44 %patch1 -p1 -b .an %patch2 -p1 -b .gcc45 +%patch3 -p1 -b .gcc6 #Copy permission to redistribute cp -p %{SOURCE1} . @@ -121,6 +123,9 @@ execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0 %changelog +* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.99-13.u4b5 +- patch for gcc-6 + * Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.99-12.u4b5 - Spec clean-up - Use execstrack instead of prelink on fedora 23 and later