DISTRHO
/
DISTRHO-Ports
mirror of https://github.com/DISTRHO/DISTRHO-Ports
1
0
Fork 0
Code Releases 5 Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
541 Commits
6 Branches
234MB
Tree: 9dc5ca5cb5
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '9dc5ca5cb5'
${ noResults }
DISTRHO-Ports/libs/juce-current/patches/06_old-compiler-compatibili...

308 lines
16KB
Raw Blame History 

  1. diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h

  2. index acd165ff0..bdc0bf58f 100644

  3. --- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h

  4. +++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h

  5. @@ -20,6 +20,11 @@

  6.    ==============================================================================

  7.  */

  8.  

  9. +#ifndef __clang__

  10. +// GCC4 compatibility

  11. +namespace std { using ::max_align_t; }

  12. +#endif

  13. +

  14.  namespace juce

  15.  {

  16.  

  17. diff --git a/modules/juce_audio_basics/native/juce_mac_CoreAudioLayouts.h b/modules/juce_audio_basics/native/juce_mac_CoreAudioLayouts.h

  18. index ac5ce32da..f0cd938ae 100644

  19. --- a/modules/juce_audio_basics/native/juce_mac_CoreAudioLayouts.h

  20. +++ b/modules/juce_audio_basics/native/juce_mac_CoreAudioLayouts.h

  21. @@ -236,8 +236,10 @@ private:

  22.                  { kAudioChannelLayoutTag_AAC_6_0, { centre, left, right, leftSurround, rightSurround, centreSurround } },

  23.                  { kAudioChannelLayoutTag_AAC_6_1, { centre, left, right, leftSurround, rightSurround, centreSurround, LFE } },

  24.                  { kAudioChannelLayoutTag_AAC_7_0, { centre, left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear } },

  25. +#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  26.                  { kAudioChannelLayoutTag_AAC_7_1_B, { centre, left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, LFE } },

  27.                  { kAudioChannelLayoutTag_AAC_7_1_C, { centre, left, right, leftSurround, rightSurround, LFE, topFrontLeft, topFrontRight } },

  28. +#endif

  29.                  { kAudioChannelLayoutTag_AAC_Octagonal, { centre, left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, centreSurround } },

  30.                  { kAudioChannelLayoutTag_TMH_10_2_std, { left, right, centre, topFrontCentre, leftSurroundSide, rightSurroundSide, leftSurround, rightSurround, topFrontLeft, topFrontRight, wideLeft, wideRight, topRearCentre, centreSurround, LFE, LFE2 } },

  31.                  { kAudioChannelLayoutTag_AC3_1_0_1, { centre, LFE } },

  32. diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm

  33. index 9aa4a338e..7cad3e7c1 100644

  34. --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm

  35. +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm

  36. @@ -59,6 +59,10 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")

  37.  namespace juce

  38.  {

  39.  

  40. +#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_8

  41. +static const uint32 kAudioUnitType_MIDIProcessor = 'aumi';

  42. +#endif

  43. +

  44.  // Change this to disable logging of various activities

  45.  #ifndef AU_LOGGING

  46.   #define AU_LOGGING 1

  47. @@ -276,7 +280,7 @@ namespace AudioUnitFormatHelpers

  48.                      NSBundle* bundle = [[NSBundle alloc] initWithPath: (NSString*) fileOrIdentifier.toCFString()];

  49.  

  50.                      NSArray* audioComponents = [bundle objectForInfoDictionaryKey: @"AudioComponents"];

  51. -                    NSDictionary* dict = audioComponents[0];

  52. +                    NSDictionary* dict = [audioComponents objectAtIndex: 0];

  53.  

  54.                      desc.componentManufacturer = stringToOSType (nsStringToJuce ((NSString*) [dict valueForKey: @"manufacturer"]));

  55.                      desc.componentType         = stringToOSType (nsStringToJuce ((NSString*) [dict valueForKey: @"type"]));

  56. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h

  57. index 39eac8211..f556f12b3 100644

  58. --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h

  59. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h

  60. @@ -1184,7 +1184,7 @@ public:

  61.          String xMeterID, yMeterID;

  62.      };

  63.  

  64. -    virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const      { return {}; }

  65. +    virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const      { return CurveData(); }

  66.  

  67.      //==============================================================================

  68.      /** Not for public use - this is called before deleting an editor component. */

  69. diff --git a/modules/juce_core/native/juce_osx_ObjCHelpers.h b/modules/juce_core/native/juce_osx_ObjCHelpers.h

  70. index a9a7c8eb7..aa068eaa0 100644

  71. --- a/modules/juce_core/native/juce_osx_ObjCHelpers.h

  72. +++ b/modules/juce_core/native/juce_osx_ObjCHelpers.h

  73. @@ -71,7 +71,7 @@ inline NSArray* varArrayToNSArray (const var& varToParse);

  74.  

  75.  inline NSDictionary* varObjectToNSDictionary (const var& varToParse)

  76.  {

  77. -    auto dictionary = [NSMutableDictionary dictionary];

  78. +    NSDictionary* dictionary = [NSMutableDictionary dictionary];

  79.  

  80.      if (varToParse.isObject())

  81.      {

  82. @@ -118,7 +118,7 @@ inline NSArray* varArrayToNSArray (const var& varToParse)

  83.  

  84.      const auto* varArray = varToParse.getArray();

  85.  

  86. -    auto array = [NSMutableArray arrayWithCapacity: (NSUInteger) varArray->size()];

  87. +    NSArray* array = [NSMutableArray arrayWithCapacity: (NSUInteger) varArray->size()];

  88.  

  89.      for (const auto& aVar : *varArray)

  90.      {

  91. @@ -152,7 +152,8 @@ inline var nsDictionaryToVar (NSDictionary* dictionary)

  92.      DynamicObject::Ptr dynamicObject (new DynamicObject());

  93.  

  94.      for (NSString* key in dictionary)

  95. -        dynamicObject->setProperty (nsStringToJuce (key), nsObjectToVar (dictionary[key]));

  96. +        dynamicObject->setProperty (nsStringToJuce (key),

  97. +                                    nsObjectToVar ([dictionary objectForKey: key]));

  98.  

  99.      return var (dynamicObject.get());

  100.  }

  101. diff --git a/modules/juce_core/system/juce_CompilerSupport.h b/modules/juce_core/system/juce_CompilerSupport.h

  102. index 4d96d7cb0..d76d92d49 100644

  103. --- a/modules/juce_core/system/juce_CompilerSupport.h

  104. +++ b/modules/juce_core/system/juce_CompilerSupport.h

  105. @@ -92,7 +92,7 @@

  106.  

  107.  //==============================================================================

  108.  // C++ library

  109. -#if (defined (__GLIBCXX__) && __GLIBCXX__ < 20130322) || (defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 3700))

  110. +#if (defined (__GLIBCXX__) && __GLIBCXX__ < 20130322)

  111.   #error "JUCE requires a C++ library containing std::atomic"

  112.  #endif

  113.  

  114. diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h

  115. index 43000cab6..0a1798ba2 100644

  116. --- a/modules/juce_core/system/juce_PlatformDefs.h

  117. +++ b/modules/juce_core/system/juce_PlatformDefs.h

  118. @@ -99,11 +99,7 @@ namespace juce

  119.      deliberately and want to ignore the warning.

  120.  */

  121.  #if JUCE_CLANG

  122. - #if __has_cpp_attribute(clang::fallthrough)

  123. -  #define JUCE_FALLTHROUGH [[clang::fallthrough]];

  124. - #else

  125. -  #define JUCE_FALLTHROUGH

  126. - #endif

  127. + #define JUCE_FALLTHROUGH [[clang::fallthrough]];

  128.  #elif JUCE_GCC

  129.   #if __GNUC__ >= 7

  130.    #define JUCE_FALLTHROUGH [[gnu::fallthrough]];

  131. diff --git a/modules/juce_core/system/juce_TargetPlatform.h b/modules/juce_core/system/juce_TargetPlatform.h

  132. index 5b4d293bb..6b41688b2 100644

  133. --- a/modules/juce_core/system/juce_TargetPlatform.h

  134. +++ b/modules/juce_core/system/juce_TargetPlatform.h

  135. @@ -145,8 +145,8 @@

  136.    #endif

  137.  

  138.    #if JUCE_MAC

  139. -    #if ! defined (MAC_OS_X_VERSION_10_11)

  140. -      #error "The 10.11 SDK (Xcode 7.3.1+) is required to build JUCE apps. You can create apps that run on macOS 10.7+ by changing the deployment target."

  141. +    #if ! defined (MAC_OS_X_VERSION_10_8)

  142. +      #error "The 10.8 SDK is required to build JUCE apps. You can create apps that run on macOS 10.7+ by changing the deployment target."

  143.      #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7

  144.        #error "Building for OSX 10.6 is no longer supported!"

  145.      #endif

  146. diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm

  147. index de6ffecfc..2a85d25f5 100644

  148. --- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm

  149. +++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm

  150. @@ -26,6 +26,10 @@

  151.  namespace juce

  152.  {

  153.  

  154. +#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_8

  155. + #define __nullable

  156. +#endif

  157. +

  158.  //==============================================================================

  159.  // This class has been renamed from CoreGraphicsImage to avoid a symbol

  160.  // collision in Pro Tools 2019.12 and possibly 2020 depending on the Pro Tools

  161. diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm

  162. index ff0a23a9f..88142091d 100644

  163. --- a/modules/juce_graphics/native/juce_mac_Fonts.mm

  164. +++ b/modules/juce_graphics/native/juce_mac_Fonts.mm

  165. @@ -359,20 +359,20 @@ namespace CoreTextTypeLayout

  166.  

  167.          auto verticalJustification = text.getJustification().getOnlyVerticalFlags();

  168.  

  169. -        auto ctFrameArea = [area, minCTFrameHeight, verticalJustification]

  170. +        const Rectangle<float> ctFrameArea = [area, minCTFrameHeight, verticalJustification]

  171.          {

  172.              if (minCTFrameHeight < area.getHeight())

  173. -                return area;

  174. +                return Rectangle<float> (area);

  175.  

  176.              if (verticalJustification == Justification::verticallyCentred)

  177.                  return area.withSizeKeepingCentre (area.getWidth(), minCTFrameHeight);

  178.  

  179. -            auto frameArea = area.withHeight (minCTFrameHeight);

  180. +            const Rectangle<float> frameArea = area.withHeight (minCTFrameHeight);

  181.  

  182.              if (verticalJustification == Justification::bottom)

  183.                  return frameArea.withBottomY (area.getBottom());

  184.  

  185. -            return frameArea;

  186. +            return Rectangle<float> (frameArea);

  187.          }();

  188.  

  189.          auto frame = createCTFrame (framesetter, CGRectMake ((CGFloat) ctFrameArea.getX(), flipHeight - (CGFloat) ctFrameArea.getBottom(),

  190. diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

  191. index 26ca40630..bd5e69ab0 100644

  192. --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

  193. +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

  194. @@ -1583,17 +1583,21 @@ private:

  195.              case NSEventTypeSystemDefined:

  196.              case NSEventTypeApplicationDefined:

  197.              case NSEventTypePeriodic:

  198. +           #if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  199.              case NSEventTypeGesture:

  200. +           #endif

  201.              case NSEventTypeMagnify:

  202.              case NSEventTypeSwipe:

  203.              case NSEventTypeRotate:

  204.              case NSEventTypeBeginGesture:

  205.              case NSEventTypeEndGesture:

  206.              case NSEventTypeQuickLook:

  207. -           #if JUCE_64BIT

  208. +          #if JUCE_64BIT

  209.              case NSEventTypeSmartMagnify:

  210. +           #if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  211.              case NSEventTypePressure:

  212.             #endif

  213. +          #endif

  214.            #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12

  215.             #if JUCE_64BIT

  216.              case NSEventTypeDirectTouch:

  217. diff --git a/modules/juce_gui_basics/native/juce_mac_Windowing.mm b/modules/juce_gui_basics/native/juce_mac_Windowing.mm

  218. index 918f0b4a6..63e15d07b 100644

  219. --- a/modules/juce_gui_basics/native/juce_mac_Windowing.mm

  220. +++ b/modules/juce_gui_basics/native/juce_mac_Windowing.mm

  221. @@ -309,7 +309,7 @@ bool DragAndDropContainer::performExternalDragDropOfFiles (const StringArray& fi

  222.                  for (auto& filename : files)

  223.                  {

  224.                      auto* nsFilename = juceStringToNS (filename);

  225. -                    auto fileURL = [NSURL fileURLWithPath: nsFilename];

  226. +                    NSURL* fileURL = [NSURL fileURLWithPath: nsFilename];

  227.                      auto dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter: fileURL];

  228.  

  229.                      auto eventPos = [event locationInWindow];

  230. diff --git a/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp b/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp

  231. index b8e6e0c7e..6ad01c68a 100644

  232. --- a/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp

  233. +++ b/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp

  234. @@ -3329,7 +3329,7 @@ void XWindowSystem::handleButtonPressEvent (LinuxComponentPeer* peer, const XBut

  235.      peer->toFront (true);

  236.      peer->handleMouseEvent (MouseInputSource::InputSourceType::mouse, getLogicalMousePos (buttonPressEvent, peer->getPlatformScaleFactor()),

  237.                              ModifierKeys::currentModifiers, MouseInputSource::invalidPressure,

  238. -                            MouseInputSource::invalidOrientation, getEventTime (buttonPressEvent), {});

  239. +                            MouseInputSource::invalidOrientation, getEventTime (buttonPressEvent));

  240.  }

  241.  

  242.  void XWindowSystem::handleButtonPressEvent (LinuxComponentPeer* peer, const XButtonPressedEvent& buttonPressEvent) const

  243. diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/modules/juce_gui_basics/windows/juce_ComponentPeer.h

  244. index 691e5679b..ed4f3c199 100644

  245. --- a/modules/juce_gui_basics/windows/juce_ComponentPeer.h

  246. +++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.h

  247. @@ -321,7 +321,7 @@ public:

  248.  

  249.      //==============================================================================

  250.      void handleMouseEvent (MouseInputSource::InputSourceType type, Point<float> positionWithinPeer, ModifierKeys newMods, float pressure,

  251. -                           float orientation, int64 time, PenDetails pen = {}, int touchIndex = 0);

  252. +                           float orientation, int64 time, PenDetails pen = PenDetails(), int touchIndex = 0);

  253.  

  254.      void handleMouseWheel (MouseInputSource::InputSourceType type, Point<float> positionWithinPeer,

  255.                             int64 time, const MouseWheelDetails&, int touchIndex = 0);

  256. diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp

  257. index 9cf367411..d42555e13 100644

  258. --- a/modules/juce_gui_extra/juce_gui_extra.cpp

  259. +++ b/modules/juce_gui_extra/juce_gui_extra.cpp

  260. @@ -136,7 +136,9 @@

  261.  #include "misc/juce_PushNotifications.cpp"

  262.  #include "misc/juce_RecentlyOpenedFilesList.cpp"

  263.  #include "misc/juce_SplashScreen.cpp"

  264. +#if !JUCE_MAC || MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  265.  #include "misc/juce_SystemTrayIconComponent.cpp"

  266. +#endif

  267.  #include "misc/juce_LiveConstantEditor.cpp"

  268.  #include "misc/juce_AnimatedAppComponent.cpp"

  269.  

  270. @@ -146,7 +148,9 @@

  271.   #if JUCE_MAC

  272.    #include "native/juce_mac_NSViewComponent.mm"

  273.    #include "native/juce_mac_AppleRemote.mm"

  274. -  #include "native/juce_mac_SystemTrayIcon.cpp"

  275. +  #if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  276. +   #include "native/juce_mac_SystemTrayIcon.cpp"

  277. +  #endif

  278.   #endif

  279.  

  280.   #if JUCE_IOS

  281. diff --git a/modules/juce_gui_extra/juce_gui_extra.h b/modules/juce_gui_extra/juce_gui_extra.h

  282. index bcec491c9..062bde636 100644

  283. --- a/modules/juce_gui_extra/juce_gui_extra.h

  284. +++ b/modules/juce_gui_extra/juce_gui_extra.h

  285. @@ -115,7 +115,9 @@

  286.  #include "misc/juce_PushNotifications.h"

  287.  #include "misc/juce_RecentlyOpenedFilesList.h"

  288.  #include "misc/juce_SplashScreen.h"

  289. +#if !JUCE_MAC || MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8

  290.  #include "misc/juce_SystemTrayIconComponent.h"

  291. +#endif

  292.  #include "misc/juce_WebBrowserComponent.h"

  293.  #include "misc/juce_LiveConstantEditor.h"

  294.  #include "misc/juce_AnimatedAppComponent.h"

  295. diff --git a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp

  296. index 9786c0875..34695b5e1 100644

  297. --- a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp

  298. +++ b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp

  299. @@ -157,7 +157,7 @@ void RecentlyOpenedFilesList::forgetRecentFileNatively (const File& file)

  300.          // from the recent list, so we clear them all and add them back excluding

  301.          // the specified file

  302.  

  303. -        auto sharedDocController = [NSDocumentController sharedDocumentController];

  304. +        NSDocumentController* sharedDocController = [NSDocumentController sharedDocumentController];

  305.          auto recentDocumentURLs  = [sharedDocController recentDocumentURLs];

  306.  

  307.          [sharedDocController clearRecentDocuments: nil];