From: Debian Multimedia Maintainers Date: Wed, 23 Oct 2019 07:44:36 +0000 (+0200) Subject: have Projucer link against the system libraries X-Git-Tag: archive/raspbian/6.1.5_ds0-1+rpi1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9d71a5aaec2558d6376f6f7216266ef03e58f0c;p=juce.git have Projucer link against the system libraries Origin: Debian Forwarded: no Last-Update: 2019-08-21 since the Debian package has removed 3rd-party libraries (jpeg, png, flag, ogg/vorbis), we must use against the system libraries. Last-Update: 2019-08-21 Gbp-Pq: Name debian_link_systemlibs.patch --- diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h index 49f22ea5..a76c3f25 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h @@ -652,6 +652,9 @@ private: StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); +#ifdef DEBIAN_JUCERPROJECT_LIBS + libraries.addArray(StringArray::fromTokens (DEBIAN_JUCERPROJECT_LIBS, ";", "\"'")); +#endif libraries.removeEmptyStrings(); for (auto& lib : libraries) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 5f00efbe..72100ad4 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -520,6 +520,39 @@ StringArray ProjectExporter::getLinuxPackages (PackageDependencyType type) const if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project)) packages.add ("libcurl"); + // on Debian, a number of 3rd-party libs have been stripped away, + // so we need to link to the system libraries + if (project.getEnabledModules().isModuleEnabled ("juce_core")) + { + packages.add ("zlib"); + } + if (project.getEnabledModules().isModuleEnabled ("juce_graphics")) + { + packages.add ("libjpeg"); + packages.add ("libpng"); + } + if (project.getEnabledModules().isModuleEnabled ("juce_audio_formats")) + { + if(project.isConfigFlagEnabled ("JUCE_USE_FLAC", true)) + { + packages.add ("flac"); + } + if(project.isConfigFlagEnabled ("JUCE_USE_OGGVORBIS", true)) + { + packages.add ("vorbis"); + packages.add ("vorbisfile"); + packages.add ("vorbisenc"); + packages.add ("ogg"); + } + } + if (project.getEnabledModules().isModuleEnabled ("juce_audio_devices")) + { + if(project.isConfigFlagEnabled ("JUCE_JACK", true)) + { + packages.add ("jack"); + } + } + if (isWebBrowserComponentEnabled (project) && type == PackageDependencyType::compile) { packages.add ("webkit2gtk-4.0");