haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

mac: bump to 5.14 (#4596)

Browse Source
This commit is contained in:
Robert Kausch
2020-01-22 15:39:34 +01:00
committed by Schrijvers Luc
parent dd5591b5a5
commit 7e0d2f89bd
2 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-sound/mac/mac-5.11.recipe → media-sound/mac/mac-5.14.recipe
View File

@@ -3,13 +3,12 @@ DESCRIPTION="Monkey's Audio is a lossless audio format. This package provides \
the mac command line utility for compressing and decompressing Monkey's Audio \ the mac command line utility for compressing and decompressing Monkey's Audio \
files." files."
HOMEPAGE="https://www.monkeysaudio.com/" HOMEPAGE="https://www.monkeysaudio.com/"
COPYRIGHT="2000-2019 Matthew T. Ashland" COPYRIGHT="2000-2020 Matthew T. Ashland"
LICENSE="Monkey's Audio SDK and Source Code License Agreement" LICENSE="Monkey's Audio SDK and Source Code License Agreement"
REVISION="2" REVISION="1"
SOURCE_URI="https://www.monkeysaudio.com/files/MAC_SDK_${portVersion/./}.zip" SOURCE_URI="https://www.monkeysaudio.com/files/MAC_SDK_${portVersion/./}.zip"
CHECKSUM_SHA256="4ec04c57be9f8519a02cc3a90ec5977ac202d865843b19ffa557093d91970e9d" CHECKSUM_SHA256="d5229dcb76d310ed89f323df40dad4fee21c920517242142775cc00709f94d4e"
SOURCE_DIR="" SOURCE_DIR=""
PATCHES="mac-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
@@ -21,7 +20,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin commandBinDir=$prefix/bin
fi fi
libVersion="5" libVersion="6"
PROVIDES=" PROVIDES="
mac$secondaryArchSuffix = $portVersion mac$secondaryArchSuffix = $portVersion

47
media-sound/mac/patches/mac-5.11.patchset
View File

@@ -1,47 +0,0 @@
From 47b385e0397e0f45e9e998df6521ff39cf701287 Mon Sep 17 00:00:00 2001
From: Robert Kausch <robert.kausch@freac.org>
Date: Sun, 28 Apr 2019 22:50:39 +0000
Subject: Fix file access
diff --git a/Source/Shared/StdLibFileIO.cpp b/Source/Shared/StdLibFileIO.cpp
index 105c3a7..83787e6 100644
--- a/Source/Shared/StdLibFileIO.cpp
+++ b/Source/Shared/StdLibFileIO.cpp
@@ -218,9 +218,7 @@ int64 CStdLibFileIO::GetPosition()
{
#ifdef PLATFORM_ANDROID
return ftell(m_pFile);
-#elif defined(PLATFORM_LINUX)
- return ftello64(m_pFile);
-#elif PLATFORM_APPLE
+#elif !defined(PLATFORM_WINDOWS)
return ftello(m_pFile);
#else
return _ftelli64(m_pFile);
--
2.24.1
From 96be7df8791de9346c659395b94f65fb388cded8 Mon Sep 17 00:00:00 2001
From: Robert Kausch <robert.kausch@freac.org>
Date: Thu, 2 Jan 2020 12:36:43 +0000
Subject: Fix include paths.
diff --git a/Source/Projects/NonWindows/Makefile b/Source/Projects/NonWindows/Makefile
index b97d7fa..70947dc 100644
--- a/Source/Projects/NonWindows/Makefile
+++ b/Source/Projects/NonWindows/Makefile
@@ -3,7 +3,7 @@ UNAME = $(shell uname)
VERSION = 5
-CXXOPTS = -O2 -I Shared -I Source/Shared -I Source/MACLib -c
+CXXOPTS = -O2 -I Source/Shared -I Source/MACLib -c
LDOPTS = -lstdc++
DLLLDOPTS = -shared
--
2.24.1