From 717ebc72b8b18c96166d9b98385bc380e5b34e27 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 25 Feb 2019 21:48:39 -0300 Subject: [PATCH] mac: remove --- common/shlibs | 1 - srcpkgs/mac-devel | 1 - srcpkgs/mac/INSTALL.msg | 1 + srcpkgs/mac/patches/macros.patch | 180 ------------------------------- srcpkgs/mac/template | 28 +---- 5 files changed, 6 insertions(+), 205 deletions(-) delete mode 120000 srcpkgs/mac-devel create mode 100644 srcpkgs/mac/INSTALL.msg delete mode 100644 srcpkgs/mac/patches/macros.patch diff --git a/common/shlibs b/common/shlibs index 3d6e7c9175b..c1c3c1db9e2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2606,7 +2606,6 @@ libudis86.so.0 udis86-1.7.2_4 libsass.so.1 libsass-3.5.0_1 libjbig.so.0 jbigkit-libs-2.1_2 libjbig85.so.0 jbigkit-libs-2.1_2 -libmac.so.2 mac-3.99_1 libskk.so.0 libskk-1.0.2_1 libKF5WaylandServer.so.5 kwayland-5.26.0_1 libKF5WaylandClient.so.5 kwayland-5.26.0_1 diff --git a/srcpkgs/mac-devel b/srcpkgs/mac-devel deleted file mode 120000 index 28757cf4aa3..00000000000 --- a/srcpkgs/mac-devel +++ /dev/null @@ -1 +0,0 @@ -mac \ No newline at end of file diff --git a/srcpkgs/mac/INSTALL.msg b/srcpkgs/mac/INSTALL.msg new file mode 100644 index 00000000000..3a2832963cf --- /dev/null +++ b/srcpkgs/mac/INSTALL.msg @@ -0,0 +1 @@ +mac is no longer provided by Void Linux, and will be fully removed from the repos on 2019/05/25 diff --git a/srcpkgs/mac/patches/macros.patch b/srcpkgs/mac/patches/macros.patch deleted file mode 100644 index 7d7af84864e..00000000000 --- a/srcpkgs/mac/patches/macros.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- ./src/Shared/NoWindows.h -+++ ./src/Shared/NoWindows.h -@@ -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(a,b) (((a) > (b)) ? (a) : (b)) -+#define _min(a,b) (((a) < (b)) ? (a) : (b)) - - #define __stdcall - #define CALLBACK ---- ./src/Shared/CircleBuffer.cpp -+++ ./src/Shared/CircleBuffer.cpp -@@ -45,7 +46,7 @@ - - if (pBuffer != NULL && nBytes > 0) - { -- int nHeadBytes = min(m_nEndCap - m_nHead, nBytes); -+ int nHeadBytes = _min(m_nEndCap - m_nHead, nBytes); - int nFrontBytes = nBytes - nHeadBytes; - - memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes); -@@ -72,7 +73,7 @@ - - int CCircleBuffer::RemoveHead(int nBytes) - { -- nBytes = min(MaxGet(), nBytes); -+ nBytes = _min(MaxGet(), nBytes); - m_nHead += nBytes; - if (m_nHead >= m_nEndCap) - m_nHead -= m_nEndCap; -@@ -81,7 +82,7 @@ - - int CCircleBuffer::RemoveTail(int nBytes) - { -- nBytes = min(MaxGet(), nBytes); -+ nBytes = _min(MaxGet(), nBytes); - m_nTail -= nBytes; - if (m_nTail < 0) - m_nTail += m_nEndCap; ---- ./src/MACLib/APESimple.cpp -+++ ./src/MACLib/APESimple.cpp -@@ -193,7 +194,7 @@ - nBytesRead = 1; - while ((nBytesLeft > 0) && (nBytesRead > 0)) - { -- int nBytesToRead = min(16384, nBytesLeft); -+ int nBytesToRead = _min(16384, nBytesLeft); - if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS) - return ERROR_IO_READ; - ---- ./src/MACLib/APEDecompress.cpp -+++ ./src/MACLib/APEDecompress.cpp -@@ -35,8 +36,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(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); -+ m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : _min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); - m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS)); - } - -@@ -85,7 +86,7 @@ - - // cap - int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock; -- const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish); -+ const int nBlocksToRetrieve = _min(nBlocks, nBlocksUntilFinish); - - // get the data - unsigned char * pOutputBuffer = (unsigned char *) pBuffer; -@@ -99,7 +100,7 @@ - - // analyze how much to remove from the buffer - const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks; -- nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks); -+ nBlocksThisPass = _min(nBlocksLeft, nFrameBufferBlocks); - - // remove as much as possible - if (nBlocksThisPass > 0) -@@ -182,7 +183,7 @@ - - int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME); - int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks; -- int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft); -+ int nBlocksThisPass = _min(nFrameBlocksLeft, nBlocksLeft); - - // start the frame if we need to - if (nFrameOffsetBlocks == 0) ---- ./src/MACLib/BitArray.cpp -+++ ./src/MACLib/BitArray.cpp -@@ -113,7 +114,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(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(nOriginalKSum / 32, 1); - int nOverflow = nEncode / nPivotValue; - int nBase = nEncode - (nOverflow * nPivotValue); - ---- ./src/MACLib/APECompress.cpp -+++ ./src/MACLib/APECompress.cpp -@@ -117,7 +118,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(nBytesAvailable, nBytes - nBytesDone); - memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess); - - // unlock the buffer (fail if not successful) -@@ -162,7 +163,7 @@ - - while ((m_nBufferTail - m_nBufferHead) >= nThreshold) - { -- int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); -+ int nFrameBytes = _min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); - - if (nFrameBytes == 0) - break; ---- src/MACLib/Prepare.cpp -+++ src/MACLib/Prepare.cpp -@@ -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(LPeak, RPeak) > *pPeakLevel) - { -- *pPeakLevel = max(LPeak, RPeak); -+ *pPeakLevel = _max(LPeak, RPeak); - } - - // check for pseudo-stereo files ---- src/MACLib/UnBitArray.cpp -+++ src/MACLib/UnBitArray.cpp -@@ -110,7 +110,7 @@ - if (m_nVersion >= 3990) - { - // figure the pivot value -- int nPivotValue = max(BitArrayState.nKSum / 32, 1); -+ int nPivotValue = _max(BitArrayState.nKSum / 32, 1); - - // get the overflow - int nOverflow = 0; ---- src/MACLib/APETag.cpp -+++ src/MACLib/APETag.cpp -@@ -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(nFieldBytes, 0); - m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE); - memset(m_spFieldValue, 0, m_nFieldValueBytes + 2); - if (m_nFieldValueBytes > 0) ---- src/MACLib/MACProgressHelper.cpp -+++ src/MACLib/MACProgressHelper.cpp -@@ -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(m_nTotalSteps, 1)); - int nPercentageDone = (int) (fPercentageDone * 1000 * 100); - if (nPercentageDone > 100000) nPercentageDone = 100000; - diff --git a/srcpkgs/mac/template b/srcpkgs/mac/template index 32d12c2bf4f..f5d70235f68 100644 --- a/srcpkgs/mac/template +++ b/srcpkgs/mac/template @@ -1,27 +1,9 @@ # Template file for 'mac' pkgname=mac version=3.99u4b5s7 -revision=2 -_version=$(echo $version | sed 's/\([a-z]\)/-\1/g') -short_desc="APE (Monkey's Audio) codec and decompressor" +revision=3 +noarch=yes +build_style=meta +short_desc="APE (Monkey's Audio) codec and decompressor (removed package)" +license="metapackage" homepage="http://www.etree.org/shnutils/shntool/" -license="custom" -maintainer="Georg S. " -build_style=gnu-configure -wrksrc=${pkgname}-${_version} -distfiles="http://www.etree.org/shnutils/shntool/support/formats/ape/unix/${_version}/${pkgname}-${_version}.tar.gz" -checksum=9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 - -mac-devel_package() { - depends="${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so - } -} - -post_install() { - vlicense src/License.htm -}