From a3c80fd63b00056d07adbcac8d574a379f9d395f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 3 Dec 2022 17:23:29 +0700 Subject: [PATCH] cabbage: patch for gcc-11 --- srcpkgs/cabbage/patches/fix-include.patch | 13 +++++++++++++ srcpkgs/cabbage/template | 19 ++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/cabbage/patches/fix-include.patch diff --git a/srcpkgs/cabbage/patches/fix-include.patch b/srcpkgs/cabbage/patches/fix-include.patch new file mode 100644 index 000000000000..07e0dd181815 --- /dev/null +++ b/srcpkgs/cabbage/patches/fix-include.patch @@ -0,0 +1,13 @@ +Index: cabbage-2.5.0/JUCE/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp +=================================================================== +--- cabbage-2.5.0.orig/JUCE/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp ++++ cabbage-2.5.0/JUCE/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp +@@ -24,6 +24,8 @@ + ============================================================================== + */ + ++#include ++ + namespace juce + { + diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template index 23931ba7d7f2..c4cdc7979658 100644 --- a/srcpkgs/cabbage/template +++ b/srcpkgs/cabbage/template @@ -6,7 +6,7 @@ revision=1 _jucever=5.4.7 _vstsdkver=3611_22_10_2018_build_34 create_wrksrc=yes -build_wrksrc="${pkgname}-${version}" +build_wrksrc="cabbage" hostmakedepends="pkg-config xorg-server-xvfb" makedepends="libfreeglut-devel libcurl-devel jack-devel libXcomposite-devel libXrandr-devel libXcursor-devel libX11-devel libXinerama-devel MesaLib-devel @@ -75,7 +75,9 @@ post_extract() { mkdir SDKs mv VST_SDK SDKs mv vst2.x SDKs/VST_SDK/VST3_SDK/pluginterfaces - cd "${wrksrc}/cabbage-${version}" + mv cabbage-${version} cabbage + mv JUCE-${_jucever} JUCE + cd "${wrksrc}/cabbage" # There are lots of hardcoded paths that need to be rewritten vsed -e 's@sourcecode/@@' -i CabbageLite.jucer @@ -83,7 +85,6 @@ post_extract() { for f in *jucer; do vsed -e "s@/usr/local/include/csound@/usr/include/csound@g" \ -e "s@/usr/local/lib@/usr/lib@g" \ - -e "s@../JUCE@../JUCE-${_jucever}@" \ -i "$f" done @@ -98,17 +99,17 @@ post_extract() { # Fix compilation on i686 vsed -e 's/__sigemptyset/sigemptyset/' \ - -i ../JUCE-${_jucever}/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c + -i ../JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c vsed -e "s/JUCER_ENABLE_GPL_MODE 0/JUCER_ENABLE_GPL_MODE 1/" \ - -i ../JUCE-${_jucever}/extras/Projucer/JuceLibraryCode/AppConfig.h + -i ../JUCE/extras/Projucer/JuceLibraryCode/AppConfig.h } do_build() { - cd "${wrksrc}/JUCE-${_jucever}/extras/Projucer/Builds/LinuxMakefile/" + cd "${wrksrc}/JUCE/extras/Projucer/Builds/LinuxMakefile/" make ${makejobs} TARGET_ARCH="${_tarch}" - cd "${wrksrc}/cabbage-${version}/Builds/LinuxMakefile" + cd "${wrksrc}/cabbage/Builds/LinuxMakefile" Projucer --resave ../../CabbageIDE.jucer mv Makefile MakeCabbageIDE @@ -128,13 +129,13 @@ do_build() { mv ./build/CabbagePlugin.so ./build/CabbagePluginSynth.so Projucer --resave ../../CabbageLite.jucer - cp -r ../../../JUCE-${_jucever}/modules/juce_audio_plugin_client/ ../../JuceLibraryCode/modules/ + cp -r ../../../JUCE/modules/juce_audio_plugin_client/ ../../JuceLibraryCode/modules/ mv Makefile MakeCabbageLite make -f MakeCabbageLite ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}" } do_install() { - cd "${wrksrc}/cabbage-${version}/Builds/LinuxMakefile" + cd "${wrksrc}/cabbage/Builds/LinuxMakefile" find ../../Examples -name '.DS_Store' -delete find ../../Examples -name '*_Log.txt' -delete