diff --git a/sdk/juce/JUCE-3.1.1.patch b/sdk/juce/JUCE-3.1.1.patch new file mode 100644 index 0000000..292f7d6 --- /dev/null +++ b/sdk/juce/JUCE-3.1.1.patch @@ -0,0 +1,23 @@ +diff -ruN temp/JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h ./JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h +--- temp/JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h 2014-12-16 18:21:34.000000000 +0100 ++++ ./JUCE-3.1.1/modules/juce_graphics/colour/juce_PixelFormats.h 2019-11-21 22:19:22.278775419 +0100 +@@ -86,19 +86,6 @@ + forcedinline uint8 getGreen() const noexcept { return components.g; } + forcedinline uint8 getBlue() const noexcept { return components.b; } + +- #if JUCE_GCC && ! JUCE_CLANG +- // NB these are here as a workaround because GCC refuses to bind to packed values. +- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; } +- forcedinline uint8& getRed() noexcept { return comps [indexR]; } +- forcedinline uint8& getGreen() noexcept { return comps [indexG]; } +- forcedinline uint8& getBlue() noexcept { return comps [indexB]; } +- #else +- forcedinline uint8& getAlpha() noexcept { return components.a; } +- forcedinline uint8& getRed() noexcept { return components.r; } +- forcedinline uint8& getGreen() noexcept { return components.g; } +- forcedinline uint8& getBlue() noexcept { return components.b; } +- #endif +- + /** Blends another pixel onto this one. + + This takes into account the opacity of the pixel being overlaid, and blends diff --git a/sdk/juce/pkg.mk b/sdk/juce/pkg.mk index c9da25b..3f311cd 100644 --- a/sdk/juce/pkg.mk +++ b/sdk/juce/pkg.mk @@ -8,8 +8,9 @@ prepare: ${PKG_ROOT} patch: ${PKG_VER}.patch ${PKG_VER}.patch: + @rm -rf temp @unzip ${PKG_VER}.zip -d temp >/dev/null - @diff -r ${PKG_VER} temp/${PKG_VER} > ${PKG_VER}.patch + @diff -ruN temp/${PKG_VER}/ ${PKG_ROOT} > ${PKG_VER}.patch; [ $$? -eq 1 ] @rm -rf temp @echo "Created" ${PKG_VER}.patch @@ -29,6 +30,9 @@ ${BUILD_DIR}/libjuce.a: ${OBJS} ${PKG_ROOT}: unzip ${PKG_VER}.zip + if [ -e ${PKG_VER}.patch ]; then \ + patch -p0 < ${PKG_VER}.patch;\ + fi clean: rm -rf ${BUILD_DIR}/*