Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 08:33:36 +02:00
Code Issues Releases Wiki Activity

Update Mac build for flac 1.3.1

Browse Source
This commit is contained in:
Leland Lucius
2015-05-01 04:24:58 -05:00
parent dd164dfb2f
commit 01c2dc75e5
4 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-src/audacity-patches.txt
View File

@@ -26,6 +26,8 @@ Version in Audacity SVN: 1.3.1
Patches: mac-asm-fixes.patch. Fixes build on OS X Intel 10.4 by creating and
object format for Mach-O. Needs to go upstream
add-maintainer-mode.patch. Disable autotools rebuilds
bypass-constraint-problem.patch. Gets around problem with older
gcc (4.0)...not need after we upgrade past Xcode 3.2.6.
Upstream version: 1.3.1
libid3tag

11
lib-src/libflac/bypass-constraint-problem.patch Normal file
View File

@@ -0,0 +1,11 @@
--- ../flac-1.3.1/src/libFLAC/cpu.c 2014-11-26 19:19:47.000000000 -0600
+++ src/libFLAC/cpu.c 2015-05-01 04:21:19.000000000 -0500
@@ -475,7 +475,7 @@
{
#if (defined _MSC_VER || defined __INTEL_COMPILER) && defined FLAC__AVX_SUPPORTED
return (FLAC__uint32)_xgetbv(0);
-#elif defined __GNUC__
+#elif defined __GNUC__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 0)
FLAC__uint32 lo, hi;
asm volatile (".byte 0x0f, 0x01, 0xd0" : "=a"(lo), "=d"(hi) : "c" (0));
return lo;

2
lib-src/libflac/src/libFLAC/cpu.c
View File

@@ -475,7 +475,7 @@ FLAC__uint32 FLAC__cpu_xgetbv_x86(void)
{
#if (defined _MSC_VER || defined __INTEL_COMPILER) && defined FLAC__AVX_SUPPORTED
return (FLAC__uint32)_xgetbv(0);
#elif defined __GNUC__
#elif defined __GNUC__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 0)
FLAC__uint32 lo, hi;
asm volatile (".byte 0x0f, 0x01, 0xd0" : "=a"(lo), "=d"(hi) : "c" (0));
return lo;