[arch-commits] Commit in juce/trunk (PKGBUILD juce-6.1.2-devendor_libs.patch)

David Runge dvzrv at gemini.archlinux.org
Mon Sep 27 19:34:58 UTC 2021


    Date: Monday, September 27, 2021 @ 19:34:58
  Author: dvzrv
Revision: 1025785

upgpkg: juce 6.1.2-2: Rebuild to apply patch for devendoring libraries.

Apply patch to devendor flac, jpeg-turbo, ogg, vorbis, libpng and zlib.
Remove custom CPPFLAGS exports, that ensured building against system libs before.

Added:
  juce/trunk/juce-6.1.2-devendor_libs.patch
Modified:
  juce/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   10 +---
 juce-6.1.2-devendor_libs.patch |   87 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-27 19:32:37 UTC (rev 1025784)
+++ PKGBUILD	2021-09-27 19:34:58 UTC (rev 1025785)
@@ -4,7 +4,7 @@
 pkgbase=juce
 pkgname=(juce juce-docs)
 pkgver=6.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform C++ framework"
 arch=('x86_64')
 url="https://github.com/juce-framework/juce/"
@@ -16,6 +16,7 @@
   "${pkgname}-6.1.2-cmake_install.patch"
   "${pkgname}-6.1.2-cmake_juce_utils.patch"
   "${pkgname}-6.1.2-cmake_link_against_system_deps.patch"
+  "${pkgname}-6.1.2-devendor_libs.patch"
   "${pkgname}-6.1.2-fst_vst.patch"
   "${pkgname}-6.1.2-projucer_disable_update_check.patch"
   "${pkgname}-6.1.2-projucer_juce_paths.patch"
@@ -25,6 +26,7 @@
             '52aba043ad3e5154b67f4d140f1d1e936962325763b47bbec57e1ef0a9cccbe6fa0b99598a756cb76853b5c1c5084b32055fc6a76f992b10323d867c82023399'
             '91ef9ced3a72db3b24d5892149cb3ac19fd132a0cc48a36afe1664864e7deb4928a3a19a92aee11f277beccbb8e500e4fa1aba74d77a52b3517ce4bb429904c6'
             '08b0b5a945dc77073b77b2ec678d48394d7baf2bcb0213b2d5e37ab755d8e33b86511045f412f15fd9ba32aced330e611d0fa9f10b10468956898751fb50a754'
+            'ccec528a1daaf255a4686dad2d59314adab03a935a79893b04a8f04256179a2b1ba84fa563fd6781b314b9d2fc1ddf4892576f77d748e40577747013b3a60bc3'
             'dddf5510f9391fc663db29174215e9575e9ec3956bb649c8a83564b0dcfa1202cc430fadd8faafa390b45c3a2e79ba75e3cdfb118db1e5c35836fad954b67e32'
             '2e1b823d9e5611e2c9efa1459f309f9add76d163411bb32cbd8c93f9751c6b97842af430f866f9ebce02d7602a655fd1f9d62f0530e5dc4d2621cbbd5444aad8'
             '766b761bf60a09fd01e9e6422df5b34c5305d41672b82b2c54819c581a952af5d7c8c39868c8615b57b14f772624bae4545ec878f2098ab5b8afb2ecf59146a1'
@@ -33,6 +35,7 @@
         '2419fd707b03a5e33cef03576cbeddb99ab4fd67f4fbec8047668ffb1daf78803cd608d7255893394e6d83dce5afd51608793384567228130a0082bcc9a67f60'
         '8accc2bb2def2b6c91084879071299c0d94e652dad61f15457d8a3c49507db30dcbd25f0311cc044661470ff986d7566ef503ec183b6ada535341dcb456d8e6d'
         'adae21dc435805fb73381c71e942b5a7ad65063310cbd33d9aa49d8c2a7abd94bd6f712ebe6a43a1efe243feba86149dc2b6b40e5a3e60b18e929b141bb939b8'
+        'ee72102ecdf57490e9aec0fe6368d61e3c9f86a8b13fd35b3889eac591d716cc98c19b87d6d09360848202b4a108bbc39639d36e28d69908c80ee514b2cf40ee'
         'b0a8758f6a97a487b7734839d59f0c0684d69ac67acba168a707296eeb82fb13c630506dcb05f45e1eaf9620adc881c6c467fdc3f3cfbb0326a4e6ebf36407e8'
         'cd6c59deed414529c49dbf8506905cc7848bb48073e054d4cf2450c17c7268860330bd2d2e6d30e5a2a68cec2106e3498619e85ce602439f75ba9393084498f6'
         '4d42e73b4d15f0ef16a55d927de43127518f4420fe54f78b2c2a0e57a08eb192138f65f381017d0f1e6ca286009f63f16c269b58e7405c35894c0bc3ac91de7b'
@@ -68,11 +71,6 @@
   cd "$pkgname-$pkgver"
   # enable GPL mode via CPPFLAGS
   export CPPFLAGS+=" -DJUCER_ENABLE_GPL_MODE=1"
-  export CPPFLAGS+=" -DJUCE_INCLUDE_FLAC_CODE=0"
-  export CPPFLAGS+=" -DJUCE_INCLUDE_JPEGLIB_CODE=0"
-  export CPPFLAGS+=" -DJUCE_INCLUDE_OGGVORBIS_CODE=0"
-  export CPPFLAGS+=" -DJUCE_INCLUDE_PNGLIB_CODE=0"
-  export CPPFLAGS+=" -DJUCE_INCLUDE_ZLIB_CODE=0 -DJUCE_ZLIB_INCLUDE_PATH='<zlib.h>'"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE='None' \

Added: juce-6.1.2-devendor_libs.patch
===================================================================
--- juce-6.1.2-devendor_libs.patch	                        (rev 0)
+++ juce-6.1.2-devendor_libs.patch	2021-09-27 19:34:58 UTC (rev 1025785)
@@ -0,0 +1,87 @@
+diff -ruN a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp	2021-09-20 14:26:04.000000000 +0200
++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp	2021-09-26 21:02:34.760731676 +0200
+@@ -528,6 +528,39 @@
+         packages.add ("gtk+-x11-3.0");
+     }
+ 
++    // as vendored libraries were removed, we need to link against 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");
++        }
++    }
++
+     packages.removeEmptyStrings();
+     packages.removeDuplicates (false);
+ 
+diff -ruN a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
+--- a/modules/juce_core/juce_core.h	2021-09-20 14:26:04.000000000 +0200
++++ b/modules/juce_core/juce_core.h	2021-09-26 21:16:41.501526112 +0200
+@@ -65,6 +65,31 @@
+ 
+ #include "system/juce_TargetPlatform.h"
+ 
++#ifdef JUCE_INCLUDE_ZLIB_CODE
++# undef JUCE_INCLUDE_ZLIB_CODE
++#endif
++#define JUCE_INCLUDE_ZLIB_CODE 0
++
++#ifdef JUCE_INCLUDE_FLAC_CODE
++# undef JUCE_INCLUDE_FLAC_CODE
++#endif
++#define JUCE_INCLUDE_FLAC_CODE 0
++
++#ifdef JUCE_INCLUDE_OGGVORBIS_CODE
++# undef JUCE_INCLUDE_OGGVORBIS_CODE
++#endif
++#define JUCE_INCLUDE_OGGVORBIS_CODE 0
++
++#ifdef JUCE_INCLUDE_JPEGLIB_CODE
++# undef JUCE_INCLUDE_JPEGLIB_CODE
++#endif
++#define JUCE_INCLUDE_JPEGLIB_CODE 0
++
++#ifdef JUCE_INCLUDE_PNGLIB_CODE
++# undef JUCE_INCLUDE_PNGLIB_CODE
++#endif
++#define JUCE_INCLUDE_PNGLIB_CODE 0
++
+ //==============================================================================
+ /** Config: JUCE_FORCE_DEBUG
+ 
+@@ -124,7 +149,7 @@
+     specify the path where your zlib headers live.
+ */
+ #ifndef JUCE_INCLUDE_ZLIB_CODE
+- #define JUCE_INCLUDE_ZLIB_CODE 1
++ #define JUCE_INCLUDE_ZLIB_CODE 0
+ #endif
+ 
+ #ifndef JUCE_ZLIB_INCLUDE_PATH



More information about the arch-commits mailing list