From 420eeee727d39d869d864caddb04a80dafda7160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2017 17:51:45 +0100 Subject: gentoo resync : 17.10.2017 --- media-sound/mac/Manifest | 1 - media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch | 181 ------------------------ 2 files changed, 182 deletions(-) delete mode 100644 media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch (limited to 'media-sound/mac') diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest index 3ca52ff7a9c1..e8e01fdb6fdb 100644 --- a/media-sound/mac/Manifest +++ b/media-sound/mac/Manifest @@ -1,4 +1,3 @@ -AUX mac-3.99.4.5.7-gcc6.patch 8122 SHA256 64448b736fad268efbb1d6bd266295b72bf4dc74d84e4065ad5033ee0ee02bc2 SHA512 aa6443ab164a5b1e560026874341cd321280298438910781ed45c35bb5bc745824e8a40286dd2e1e781965a83c043a7a64f4a98e7b4a58c4eb5903f0ab4bb1c6 WHIRLPOOL f4e9d76f57d60e6763b55c6a4f9bca5523319513e7e0600994baa31fdaf49500f59a817528298b2a2e433545b212592a215b9f63195d003e6957a4a29c5d9ae6 AUX mac-4.11.4.5.7-gcc6.patch 10119 SHA256 7c92fd2c9bdd5cfefe40124e642c1e23c72d2d3ecd181e3098cb232c6026702b SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63 WHIRLPOOL 9d632bf378ddce35ca11a671560e29eda5c068a961f7cdade30d47af0cad3607bafe05ac4bdeec82b811d94ff8788d001604cc209b663ff4aba32cb639802d67 AUX mac-4.11.4.5.7-output.patch 1498 SHA256 65ee185f66c821b69b3727070645a93dff2dada7d11a6feeee08088a5e54b85c SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490 WHIRLPOOL 536fd2c59cfe938c79a4bc5c53976d0edcf20f2b3003864c6cde3c1b5c06f9a5479c4dc2b8e3ea050e05d9cf7cd7dae8e0ebbf226cae3d4afe46a75fddb7eb33 DIST mac-3.99-u4-b5-s7.tar.gz 450981 SHA256 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 SHA512 fa7ca8cec0ba6c0fb78dda6e964b17e9331184fed656a2458d0e3ac12fc375a661adfd36c142ef63111f31c6b63e8c00fe40e7babe84f0cefe5433940be628e0 WHIRLPOOL f4df5bccad06b7313348e9be734e926c1d511a2e3ca40162bc2c6a8cffb38c1455543fd7dc0a2352efa91945ae5546364085bd05888e906eb9e1c49fde7f743d diff --git a/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch b/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch deleted file mode 100644 index e22d1c1f539b..000000000000 --- a/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch +++ /dev/null @@ -1,181 +0,0 @@ -From: Peter Levine ---- mac-3.99-u4-b5-s7/src/Shared/NoWindows.h.old 2016-09-18 21:37:56.049105791 -0400 -+++ mac-3.99-u4-b5-s7/src/Shared/NoWindows.h 2016-09-18 21:55:29.666295506 -0400 -@@ -39,8 +39,8 @@ - typedef const wchar_t * LPCWSTR; - - #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES); --#define max(a,b) (((a) > (b)) ? (a) : (b)) --#define min(a,b) (((a) < (b)) ? (a) : (b)) -+#define max_macro(a,b) (((a) > (b)) ? (a) : (b)) -+#define min_macro(a,b) (((a) < (b)) ? (a) : (b)) - - #define __stdcall - #define CALLBACK ---- mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp.old 2016-09-18 21:43:44.270495095 -0400 -+++ mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp 2016-09-18 21:44:47.960148731 -0400 -@@ -45,7 +45,7 @@ - - if (pBuffer != NULL && nBytes > 0) - { -- int nHeadBytes = min(m_nEndCap - m_nHead, nBytes); -+ int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes); - int nFrontBytes = nBytes - nHeadBytes; - - memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes); -@@ -72,7 +72,7 @@ - - int CCircleBuffer::RemoveHead(int nBytes) - { -- nBytes = min(MaxGet(), nBytes); -+ nBytes = min_macro(MaxGet(), nBytes); - m_nHead += nBytes; - if (m_nHead >= m_nEndCap) - m_nHead -= m_nEndCap; -@@ -81,7 +81,7 @@ - - int CCircleBuffer::RemoveTail(int nBytes) - { -- nBytes = min(MaxGet(), nBytes); -+ nBytes = min_macro(MaxGet(), nBytes); - m_nTail -= nBytes; - if (m_nTail < 0) - m_nTail += m_nEndCap; ---- mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp.old 2016-09-18 21:48:40.916547811 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp 2016-09-18 21:51:43.670733601 -0400 -@@ -117,7 +117,7 @@ - return ERROR_UNDEFINED; - - // calculate how many bytes to copy and add that much to the buffer -- int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone); -+ int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone); - memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess); - - // unlock the buffer (fail if not successful) -@@ -162,7 +162,7 @@ - - while ((m_nBufferTail - m_nBufferHead) >= nThreshold) - { -- int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); -+ int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); - - if (nFrameBytes == 0) - break; ---- mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp.old 2016-09-18 21:46:56.962072960 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp 2016-09-18 22:01:14.402044817 -0400 -@@ -35,8 +35,8 @@ - m_bErrorDecodingCurrentFrame = FALSE; - - // set the "real" start and finish blocks -- m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); -- m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); -+ m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); -+ m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); - m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS)); - } - -@@ -85,7 +85,7 @@ - - // cap - int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock; -- const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish); -+ const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish); - - // get the data - unsigned char * pOutputBuffer = (unsigned char *) pBuffer; -@@ -99,7 +99,7 @@ - - // analyze how much to remove from the buffer - const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks; -- nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks); -+ nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks); - - // remove as much as possible - if (nBlocksThisPass > 0) -@@ -182,7 +182,7 @@ - - int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME); - int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks; -- int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft); -+ int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft); - - // start the frame if we need to - if (nFrameOffsetBlocks == 0) ---- mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp.old 2016-09-18 21:47:16.972925909 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp 2016-09-18 21:52:39.022779503 -0400 -@@ -193,7 +193,7 @@ - nBytesRead = 1; - while ((nBytesLeft > 0) && (nBytesRead > 0)) - { -- int nBytesToRead = min(16384, nBytesLeft); -+ int nBytesToRead = min_macro(16384, nBytesLeft); - if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS) - return ERROR_IO_READ; - ---- mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp.old 2016-09-18 21:55:53.331533348 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp 2016-09-18 21:58:21.508345586 -0400 -@@ -16,7 +16,7 @@ - memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16)); - - // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated) -- m_nFieldValueBytes = max(nFieldBytes, 0); -+ m_nFieldValueBytes = max_macro(nFieldBytes, 0); - m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE); - memset(m_spFieldValue, 0, m_nFieldValueBytes + 2); - if (m_nFieldValueBytes > 0) ---- mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp.old 2016-09-18 21:53:24.090030009 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp 2016-09-18 22:00:13.500083252 -0400 -@@ -113,7 +113,7 @@ - m_nCurrentBitIndex = (m_nCurrentBitIndex & 31); - - // zero the rest of the memory (may not need the +1 because of frame byte alignment) -- memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); -+ memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); - } - - // return a success -@@ -247,7 +247,7 @@ - BitArrayState.k++; - - // figure the pivot value -- int nPivotValue = max(nOriginalKSum / 32, 1); -+ int nPivotValue = max_macro(nOriginalKSum / 32, 1); - int nOverflow = nEncode / nPivotValue; - int nBase = nEncode - (nOverflow * nPivotValue); - ---- mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp.old 2016-09-18 21:56:44.606337012 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp 2016-09-18 21:59:55.854310134 -0400 -@@ -35,7 +35,7 @@ - m_nCurrentStep = nCurrentStep; - - // figure the percentage done -- float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1)); -+ float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1)); - int nPercentageDone = (int) (fPercentageDone * 1000 * 100); - if (nPercentageDone > 100000) nPercentageDone = 100000; - ---- mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp.old 2016-09-18 21:56:29.974394222 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp 2016-09-18 21:59:28.214726465 -0400 -@@ -177,9 +177,9 @@ - - if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; } - if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; } -- if (max(LPeak, RPeak) > *pPeakLevel) -+ if (max_macro(LPeak, RPeak) > *pPeakLevel) - { -- *pPeakLevel = max(LPeak, RPeak); -+ *pPeakLevel = max_macro(LPeak, RPeak); - } - - // check for pseudo-stereo files ---- mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp.old 2016-09-18 21:56:16.548445898 -0400 -+++ mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp 2016-09-18 21:58:56.148161050 -0400 -@@ -110,7 +110,7 @@ - if (m_nVersion >= 3990) - { - // figure the pivot value -- int nPivotValue = max(BitArrayState.nKSum / 32, 1); -+ int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1); - - // get the overflow - int nOverflow = 0; -- cgit v1.2.3