Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +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
Show Stats 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 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 object format for Mach-O. Needs to go upstream
add-maintainer-mode.patch. Disable autotools rebuilds 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 Upstream version: 1.3.1
libid3tag 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 #if (defined _MSC_VER || defined __INTEL_COMPILER) && defined FLAC__AVX_SUPPORTED
return (FLAC__uint32)_xgetbv(0); return (FLAC__uint32)_xgetbv(0);
#elif defined __GNUC__ #elif defined __GNUC__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 0)
FLAC__uint32 lo, hi; FLAC__uint32 lo, hi;
asm volatile (".byte 0x0f, 0x01, 0xd0" : "=a"(lo), "=d"(hi) : "c" (0)); asm volatile (".byte 0x0f, 0x01, 0xd0" : "=a"(lo), "=d"(hi) : "c" (0));
return lo; return lo;

36
mac/Audacity.xcodeproj/project.pbxproj
View File

@ -456,6 +456,15 @@
281110001AD4FDD8009FAC14 /* suil_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28110FFF1AD4FDD8009FAC14 /* suil_config.h */; }; 281110001AD4FDD8009FAC14 /* suil_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28110FFF1AD4FDD8009FAC14 /* suil_config.h */; };
2816372E0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2816372C0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp */; }; 2816372E0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2816372C0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp */; };
28285C801A27A81600BC2205 /* AudioUnitCocoaHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28285C7F1A27A81600BC2205 /* AudioUnitCocoaHelper.mm */; }; 28285C801A27A81600BC2205 /* AudioUnitCocoaHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28285C7F1A27A81600BC2205 /* AudioUnitCocoaHelper.mm */; };
282D1A661AF377BC00E715C9 /* fixed_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A5D1AF377BC00E715C9 /* fixed_intrin_sse2.c */; };
282D1A671AF377BC00E715C9 /* fixed_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A5E1AF377BC00E715C9 /* fixed_intrin_ssse3.c */; };
282D1A681AF377BC00E715C9 /* lpc_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A5F1AF377BC00E715C9 /* lpc_intrin_avx2.c */; };
282D1A691AF377BC00E715C9 /* lpc_intrin_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A601AF377BC00E715C9 /* lpc_intrin_sse.c */; };
282D1A6A1AF377BC00E715C9 /* lpc_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A611AF377BC00E715C9 /* lpc_intrin_sse2.c */; };
282D1A6B1AF377BC00E715C9 /* lpc_intrin_sse41.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A621AF377BC00E715C9 /* lpc_intrin_sse41.c */; };
282D1A6C1AF377BC00E715C9 /* stream_encoder_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A631AF377BC00E715C9 /* stream_encoder_intrin_avx2.c */; };
282D1A6D1AF377BC00E715C9 /* stream_encoder_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A641AF377BC00E715C9 /* stream_encoder_intrin_sse2.c */; };
282D1A6E1AF377BC00E715C9 /* stream_encoder_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = 282D1A651AF377BC00E715C9 /* stream_encoder_intrin_ssse3.c */; };
282D474C0B9E8D900034BC49 /* Snap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 282D474A0B9E8D900034BC49 /* Snap.cpp */; }; 282D474C0B9E8D900034BC49 /* Snap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 282D474A0B9E8D900034BC49 /* Snap.cpp */; };
283135EC0DFB9D110076D551 /* ImportFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283135EA0DFB9D110076D551 /* ImportFFmpeg.cpp */; }; 283135EC0DFB9D110076D551 /* ImportFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283135EA0DFB9D110076D551 /* ImportFFmpeg.cpp */; };
283135FF0DFBA2E80076D551 /* FFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283135FD0DFBA2E80076D551 /* FFmpeg.cpp */; }; 283135FF0DFBA2E80076D551 /* FFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283135FD0DFBA2E80076D551 /* FFmpeg.cpp */; };
@ -2131,6 +2140,15 @@
2816372C0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = LinkingHtmlWindow.cpp; sourceTree = "<group>"; tabWidth = 3; }; 2816372C0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = LinkingHtmlWindow.cpp; sourceTree = "<group>"; tabWidth = 3; };
2816372D0BAE3B6C0079C746 /* LinkingHtmlWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = LinkingHtmlWindow.h; sourceTree = "<group>"; tabWidth = 3; }; 2816372D0BAE3B6C0079C746 /* LinkingHtmlWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = LinkingHtmlWindow.h; sourceTree = "<group>"; tabWidth = 3; };
28285C7F1A27A81600BC2205 /* AudioUnitCocoaHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioUnitCocoaHelper.mm; sourceTree = "<group>"; }; 28285C7F1A27A81600BC2205 /* AudioUnitCocoaHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioUnitCocoaHelper.mm; sourceTree = "<group>"; };
282D1A5D1AF377BC00E715C9 /* fixed_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fixed_intrin_sse2.c; sourceTree = "<group>"; };
282D1A5E1AF377BC00E715C9 /* fixed_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fixed_intrin_ssse3.c; sourceTree = "<group>"; };
282D1A5F1AF377BC00E715C9 /* lpc_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_avx2.c; sourceTree = "<group>"; };
282D1A601AF377BC00E715C9 /* lpc_intrin_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse.c; sourceTree = "<group>"; };
282D1A611AF377BC00E715C9 /* lpc_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse2.c; sourceTree = "<group>"; };
282D1A621AF377BC00E715C9 /* lpc_intrin_sse41.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse41.c; sourceTree = "<group>"; };
282D1A631AF377BC00E715C9 /* stream_encoder_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_avx2.c; sourceTree = "<group>"; };
282D1A641AF377BC00E715C9 /* stream_encoder_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_sse2.c; sourceTree = "<group>"; };
282D1A651AF377BC00E715C9 /* stream_encoder_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_ssse3.c; sourceTree = "<group>"; };
282D474A0B9E8D900034BC49 /* Snap.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Snap.cpp; sourceTree = "<group>"; tabWidth = 3; }; 282D474A0B9E8D900034BC49 /* Snap.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = Snap.cpp; sourceTree = "<group>"; tabWidth = 3; };
282D474B0B9E8D900034BC49 /* Snap.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Snap.h; sourceTree = "<group>"; tabWidth = 3; }; 282D474B0B9E8D900034BC49 /* Snap.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Snap.h; sourceTree = "<group>"; tabWidth = 3; };
283135EA0DFB9D110076D551 /* ImportFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = ImportFFmpeg.cpp; sourceTree = "<group>"; tabWidth = 3; }; 283135EA0DFB9D110076D551 /* ImportFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = ImportFFmpeg.cpp; sourceTree = "<group>"; tabWidth = 3; };
@ -3736,9 +3754,15 @@
176EEABF09A2EF1100188F3B /* cpu.c */, 176EEABF09A2EF1100188F3B /* cpu.c */,
176EEAC209A2EF1100188F3B /* crc.c */, 176EEAC209A2EF1100188F3B /* crc.c */,
176EEACB09A2EF1100188F3B /* fixed.c */, 176EEACB09A2EF1100188F3B /* fixed.c */,
282D1A5D1AF377BC00E715C9 /* fixed_intrin_sse2.c */,
282D1A5E1AF377BC00E715C9 /* fixed_intrin_ssse3.c */,
176EEACE09A2EF1100188F3B /* float.c */, 176EEACE09A2EF1100188F3B /* float.c */,
176EEAD109A2EF1100188F3B /* format.c */, 176EEAD109A2EF1100188F3B /* format.c */,
176EEB0009A2EF1100188F3B /* lpc.c */, 176EEB0009A2EF1100188F3B /* lpc.c */,
282D1A5F1AF377BC00E715C9 /* lpc_intrin_avx2.c */,
282D1A601AF377BC00E715C9 /* lpc_intrin_sse.c */,
282D1A611AF377BC00E715C9 /* lpc_intrin_sse2.c */,
282D1A621AF377BC00E715C9 /* lpc_intrin_sse41.c */,
176EEB0809A2EF1100188F3B /* md5.c */, 176EEB0809A2EF1100188F3B /* md5.c */,
176EEB0B09A2EF1100188F3B /* memory.c */, 176EEB0B09A2EF1100188F3B /* memory.c */,
176EEB0E09A2EF1100188F3B /* metadata_iterators.c */, 176EEB0E09A2EF1100188F3B /* metadata_iterators.c */,
@ -3750,6 +3774,9 @@
176EEB2809A2EF1100188F3B /* stream_decoder.c */, 176EEB2809A2EF1100188F3B /* stream_decoder.c */,
176EEB2B09A2EF1100188F3B /* stream_encoder.c */, 176EEB2B09A2EF1100188F3B /* stream_encoder.c */,
176EEB2E09A2EF1100188F3B /* stream_encoder_framing.c */, 176EEB2E09A2EF1100188F3B /* stream_encoder_framing.c */,
282D1A631AF377BC00E715C9 /* stream_encoder_intrin_avx2.c */,
282D1A641AF377BC00E715C9 /* stream_encoder_intrin_sse2.c */,
282D1A651AF377BC00E715C9 /* stream_encoder_intrin_ssse3.c */,
); );
path = libFLAC; path = libFLAC;
sourceTree = "<group>"; sourceTree = "<group>";
@ -7321,6 +7348,15 @@
ED924BD2182EA20500319F81 /* ogg_encoder_aspect.c in Sources */, ED924BD2182EA20500319F81 /* ogg_encoder_aspect.c in Sources */,
ED924BD3182EA20500319F81 /* ogg_helper.c in Sources */, ED924BD3182EA20500319F81 /* ogg_helper.c in Sources */,
ED924BD4182EA20500319F81 /* ogg_mapping.c in Sources */, ED924BD4182EA20500319F81 /* ogg_mapping.c in Sources */,
282D1A661AF377BC00E715C9 /* fixed_intrin_sse2.c in Sources */,
282D1A671AF377BC00E715C9 /* fixed_intrin_ssse3.c in Sources */,
282D1A681AF377BC00E715C9 /* lpc_intrin_avx2.c in Sources */,
282D1A691AF377BC00E715C9 /* lpc_intrin_sse.c in Sources */,
282D1A6A1AF377BC00E715C9 /* lpc_intrin_sse2.c in Sources */,
282D1A6B1AF377BC00E715C9 /* lpc_intrin_sse41.c in Sources */,
282D1A6C1AF377BC00E715C9 /* stream_encoder_intrin_avx2.c in Sources */,
282D1A6D1AF377BC00E715C9 /* stream_encoder_intrin_sse2.c in Sources */,
282D1A6E1AF377BC00E715C9 /* stream_encoder_intrin_ssse3.c in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };