[arch-commits] Commit in juce/trunk (3 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Dec 11 23:25:45 UTC 2021
Date: Saturday, December 11, 2021 @ 23:25:45
Author: dvzrv
Revision: 1068419
upgpkg: juce 6.1.3-1: Upgrade to 6.1.3.
Update patch to link against system libs using cmake.
Simplify quoting in file.
Do not break long lines in package().
Added:
juce/trunk/juce-6.1.3-cmake_link_against_system_deps.patch
Modified:
juce/trunk/PKGBUILD
Deleted:
juce/trunk/juce-6.1.2-cmake_link_against_system_deps.patch
-------------------------------------------------+
PKGBUILD | 42 ++++------
juce-6.1.2-cmake_link_against_system_deps.patch | 88 ----------------------
juce-6.1.3-cmake_link_against_system_deps.patch | 88 ++++++++++++++++++++++
3 files changed, 107 insertions(+), 111 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-11 23:09:54 UTC (rev 1068418)
+++ PKGBUILD 2021-12-11 23:25:45 UTC (rev 1068419)
@@ -3,19 +3,19 @@
_name=JUCE
pkgbase=juce
pkgname=(juce juce-docs)
-pkgver=6.1.2
-pkgrel=2
+pkgver=6.1.3
+pkgrel=1
pkgdesc="Cross-platform C++ framework"
-arch=('x86_64')
+arch=(x86_64)
url="https://github.com/juce-framework/juce/"
-license=('Apache' 'BSD' 'GPL3' 'ISC')
-makedepends=('alsa-lib' 'cmake' 'freetype2' 'doxygen' 'gendesk' 'graphviz'
-'gtk3' 'jack' 'ladspa' 'libjpeg-turbo' 'libpng' 'python' 'webkit2gtk' 'zlib')
+license=(Apache BSD GPL3 ISC)
+makedepends=(alsa-lib cmake freetype2 doxygen gendesk graphviz gtk3 jack ladspa
+libjpeg-turbo libpng python webkit2gtk zlib)
source=(
"$pkgname-$pkgver.tar.gz::https://github.com/juce-framework/${pkgname}/archive/${pkgver}.tar.gz"
"${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.3-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"
@@ -22,19 +22,19 @@
"${pkgname}-6.1.2-projucer_juce_paths.patch"
"${pkgname}_VSTInterface.h"
)
-sha512sums=('0427be40e9cea3b215358f0661e9dabcbc4f1be7aba7d0f44e35f8426dd49ba31da99d0f18a6ee28b3dce50114a1647157802e6231d9b912269f179191ebccc1'
+sha512sums=('8ca658f4468f47c2c871b3ec0df3b64c918a0bfba9fdf76aa840505140cbf5a8aabc9692938a922be43b940d2fe24ab5142d5b8ff446c863785dd28850d1d666'
'52aba043ad3e5154b67f4d140f1d1e936962325763b47bbec57e1ef0a9cccbe6fa0b99598a756cb76853b5c1c5084b32055fc6a76f992b10323d867c82023399'
'91ef9ced3a72db3b24d5892149cb3ac19fd132a0cc48a36afe1664864e7deb4928a3a19a92aee11f277beccbb8e500e4fa1aba74d77a52b3517ce4bb429904c6'
- '08b0b5a945dc77073b77b2ec678d48394d7baf2bcb0213b2d5e37ab755d8e33b86511045f412f15fd9ba32aced330e611d0fa9f10b10468956898751fb50a754'
+ '8d5105e7ea0977cba598c13e53708ca88cdea52c3fc92cca8849eb4e64209d4902d8eef6a1bda0894138f2e1fe4247156b1d39e74207d978534768f92490f2e8'
'ccec528a1daaf255a4686dad2d59314adab03a935a79893b04a8f04256179a2b1ba84fa563fd6781b314b9d2fc1ddf4892576f77d748e40577747013b3a60bc3'
'dddf5510f9391fc663db29174215e9575e9ec3956bb649c8a83564b0dcfa1202cc430fadd8faafa390b45c3a2e79ba75e3cdfb118db1e5c35836fad954b67e32'
'2e1b823d9e5611e2c9efa1459f309f9add76d163411bb32cbd8c93f9751c6b97842af430f866f9ebce02d7602a655fd1f9d62f0530e5dc4d2621cbbd5444aad8'
'766b761bf60a09fd01e9e6422df5b34c5305d41672b82b2c54819c581a952af5d7c8c39868c8615b57b14f772624bae4545ec878f2098ab5b8afb2ecf59146a1'
'36a244740872cd203db3e1cebba5a5e245a3300a8c6c76046455ecc38083348f069987d0cba8f569390b4f0ba855799b8ff559cb540f02382b67a46d5b9cc420')
-b2sums=('40ee2769aa165337d9cad6dadf1e4ee60a0dd4e69ebbcacc8e98469a5556c4884ddf2a3704778ede8a6112eab4062d768e92aa07e547be8afef2771bc130e962'
+b2sums=('911c7320241c0ef1036752f314d17bc57c52cdf7d91754e34c9e525a3639a435e14b8cc21aa62f37afbf2ed5efb85625e85c9c504e2e496432cd3cb1338583e1'
'2419fd707b03a5e33cef03576cbeddb99ab4fd67f4fbec8047668ffb1daf78803cd608d7255893394e6d83dce5afd51608793384567228130a0082bcc9a67f60'
'8accc2bb2def2b6c91084879071299c0d94e652dad61f15457d8a3c49507db30dcbd25f0311cc044661470ff986d7566ef503ec183b6ada535341dcb456d8e6d'
- 'adae21dc435805fb73381c71e942b5a7ad65063310cbd33d9aa49d8c2a7abd94bd6f712ebe6a43a1efe243feba86149dc2b6b40e5a3e60b18e929b141bb939b8'
+ 'cc766ff15858ed1d66c4f79b182903931e9bcfb0c83ab7ef5fccb487185b9ea31284764c232df962b1438671d79710f9a8d5a0e1d36ffeea43fca23b446c80e8'
'ee72102ecdf57490e9aec0fe6368d61e3c9f86a8b13fd35b3889eac591d716cc98c19b87d6d09360848202b4a108bbc39639d36e28d69908c80ee514b2cf40ee'
'b0a8758f6a97a487b7734839d59f0c0684d69ac67acba168a707296eeb82fb13c630506dcb05f45e1eaf9620adc881c6c467fdc3f3cfbb0326a4e6ebf36407e8'
'cd6c59deed414529c49dbf8506905cc7848bb48073e054d4cf2450c17c7268860330bd2d2e6d30e5a2a68cec2106e3498619e85ce602439f75ba9393084498f6'
@@ -73,9 +73,9 @@
export CPPFLAGS+=" -DJUCER_ENABLE_GPL_MODE=1"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE='None' \
+ -DCMAKE_BUILD_TYPE=None \
-DJUCE_BUILD_EXTRAS=ON \
- -DJUCE_TOOL_INSTALL_DIR='bin' \
+ -DJUCE_TOOL_INSTALL_DIR=bin \
-Wno-dev \
-B build \
-S .
@@ -84,8 +84,8 @@
}
package_juce() {
- depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libpng' 'libfreetype.so'
- 'libjpeg.so' 'zlib')
+ depends=(gcc-libs glibc hicolor-icon-theme libpng libfreetype.so libjpeg.so
+ zlib)
optdepends=('fst: for building FST plugins')
cd "$pkgname-$pkgver"
@@ -92,18 +92,14 @@
make DESTDIR="${pkgdir}" VERBOSE=1 -C build install
# install custom vst2 handling from juce < 5.4.1
- install -vDm 644 ../juce_VSTInterface.h \
- -t "${pkgdir}/usr/share/juce/modules/juce_audio_processors/format_types/"
+ install -vDm 644 ../juce_VSTInterface.h -t "${pkgdir}/usr/share/juce/modules/juce_audio_processors/format_types/"
# projucer has no install target
- install -vDm 755 build/extras/Projucer/Projucer_artefacts/None/Projucer \
- -t "${pkgdir}/usr/bin"
+ install -vDm 755 build/extras/Projucer/Projucer_artefacts/None/Projucer -t "${pkgdir}/usr/bin"
# xdg desktop integration
install -vDm 644 *.desktop -t "${pkgdir}/usr/share/applications/"
- install -vDm 644 examples/Assets/juce_icon.png \
- "${pkgdir}/usr/share/icons/hicolor/512x512/apps/Projucer.png"
+ install -vDm 644 examples/Assets/juce_icon.png "${pkgdir}/usr/share/icons/hicolor/512x512/apps/Projucer.png"
# docs
- install -vDm 644 {{BREAKING-CHANGES,ChangeList}.txt,README.md} \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -vDm 644 {{BREAKING-CHANGES,ChangeList}.txt,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
# license
install -vDm 644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
Deleted: juce-6.1.2-cmake_link_against_system_deps.patch
===================================================================
--- juce-6.1.2-cmake_link_against_system_deps.patch 2021-12-11 23:09:54 UTC (rev 1068418)
+++ juce-6.1.2-cmake_link_against_system_deps.patch 2021-12-11 23:25:45 UTC (rev 1068419)
@@ -1,88 +0,0 @@
-diff -ruN a/extras/AudioPerformanceTest/CMakeLists.txt e/extras/AudioPerformanceTest/CMakeLists.txt
---- a/extras/AudioPerformanceTest/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ e/extras/AudioPerformanceTest/CMakeLists.txt 2021-09-25 20:11:11.782908700 +0200
-@@ -32,6 +32,11 @@
- JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0)
-
- target_link_libraries(AudioPerformanceTest PRIVATE
-+ "FLAC"
-+ "ogg"
-+ "vorbis"
-+ "vorbisenc"
-+ "vorbisfile"
- juce::juce_audio_utils
- juce::juce_recommended_config_flags
- juce::juce_recommended_lto_flags
-diff -ruN a/extras/AudioPluginHost/CMakeLists.txt e/extras/AudioPluginHost/CMakeLists.txt
---- a/extras/AudioPluginHost/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ e/extras/AudioPluginHost/CMakeLists.txt 2021-09-25 20:31:04.882600939 +0200
-@@ -55,6 +55,10 @@
- JUCE_WEB_BROWSER=0)
-
- target_link_libraries(AudioPluginHost PRIVATE
-+ "ogg"
-+ "vorbis"
-+ "vorbisenc"
-+ "vorbisfile"
- juce::juce_audio_utils
- juce::juce_cryptography
- juce::juce_dsp
-diff -ruN a/extras/NetworkGraphicsDemo/CMakeLists.txt e/extras/NetworkGraphicsDemo/CMakeLists.txt
---- a/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ e/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-09-25 20:14:30.376577084 +0200
-@@ -31,6 +31,13 @@
- JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0)
-
- target_link_libraries(NetworkGraphicsDemo PRIVATE
-+ "FLAC"
-+ "ogg"
-+ "png"
-+ "vorbis"
-+ "vorbisenc"
-+ "vorbisfile"
-+ "z"
- juce::juce_audio_utils
- juce::juce_cryptography
- juce::juce_opengl
-diff -ruN a/extras/UnitTestRunner/CMakeLists.txt e/extras/UnitTestRunner/CMakeLists.txt
---- a/extras/UnitTestRunner/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ e/extras/UnitTestRunner/CMakeLists.txt 2021-09-25 20:22:11.631027145 +0200
-@@ -33,6 +33,13 @@
- JUCE_WEB_BROWSER=0)
-
- target_link_libraries(UnitTestRunner PRIVATE
-+ "FLAC"
-+ "ogg"
-+ "png16"
-+ "vorbis"
-+ "vorbisenc"
-+ "vorbisfile"
-+ "z"
- juce::juce_analytics
- juce::juce_audio_utils
- juce::juce_dsp
-diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
---- a/extras/Build/juceaide/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ b/extras/Build/juceaide/CMakeLists.txt 2021-09-25 18:52:06.968927572 +0200
-@@ -37,6 +37,9 @@
- JUCE_USE_CURL=0)
-
- target_link_libraries(juceaide PRIVATE
-+ "jpeg"
-+ "png16"
-+ "z"
- juce::juce_build_tools
- juce::juce_recommended_config_flags
- juce::juce_recommended_lto_flags
-diff -ruN a/extras/Projucer/CMakeLists.txt b/extras/Projucer/CMakeLists.txt
---- a/extras/Projucer/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200
-+++ b/extras/Projucer/CMakeLists.txt 2021-09-25 19:02:39.550915895 +0200
-@@ -158,6 +158,8 @@
- ../Build/CMake/juce_runtime_arch_detection.cpp)
-
- target_link_libraries(Projucer PRIVATE
-+ "png16"
-+ "jpeg"
- ProjucerData
- juce::juce_build_tools
- juce::juce_cryptography
Added: juce-6.1.3-cmake_link_against_system_deps.patch
===================================================================
--- juce-6.1.3-cmake_link_against_system_deps.patch (rev 0)
+++ juce-6.1.3-cmake_link_against_system_deps.patch 2021-12-11 23:25:45 UTC (rev 1068419)
@@ -0,0 +1,88 @@
+diff -ruN a/extras/AudioPerformanceTest/CMakeLists.txt b/extras/AudioPerformanceTest/CMakeLists.txt
+--- a/extras/AudioPerformanceTest/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/AudioPerformanceTest/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100
+@@ -32,6 +32,11 @@
+ JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0)
+
+ target_link_libraries(AudioPerformanceTest PRIVATE
++ "FLAC"
++ "ogg"
++ "vorbis"
++ "vorbisenc"
++ "vorbisfile"
+ juce::juce_audio_utils
+ juce::juce_recommended_config_flags
+ juce::juce_recommended_lto_flags
+diff -ruN a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMakeLists.txt
+--- a/extras/AudioPluginHost/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/AudioPluginHost/CMakeLists.txt 2021-12-12 00:08:03.473979636 +0100
+@@ -63,6 +63,10 @@
+ JUCE_WEB_BROWSER=0)
+
+ target_link_libraries(AudioPluginHost PRIVATE
++ "ogg"
++ "vorbis"
++ "vorbisenc"
++ "vorbisfile"
+ AudioPluginHostData
+ juce::juce_audio_utils
+ juce::juce_cryptography
+diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
+--- a/extras/Build/juceaide/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/Build/juceaide/CMakeLists.txt 2021-12-12 00:06:59.970419777 +0100
+@@ -37,6 +37,9 @@
+ JUCE_USE_CURL=0)
+
+ target_link_libraries(juceaide PRIVATE
++ "jpeg"
++ "png16"
++ "z"
+ juce::juce_build_tools
+ juce::juce_recommended_config_flags
+ juce::juce_recommended_lto_flags
+diff -ruN a/extras/NetworkGraphicsDemo/CMakeLists.txt b/extras/NetworkGraphicsDemo/CMakeLists.txt
+--- a/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100
+@@ -31,6 +31,13 @@
+ JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0)
+
+ target_link_libraries(NetworkGraphicsDemo PRIVATE
++ "FLAC"
++ "ogg"
++ "png"
++ "vorbis"
++ "vorbisenc"
++ "vorbisfile"
++ "z"
+ juce::juce_audio_utils
+ juce::juce_cryptography
+ juce::juce_opengl
+diff -ruN a/extras/Projucer/CMakeLists.txt b/extras/Projucer/CMakeLists.txt
+--- a/extras/Projucer/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/Projucer/CMakeLists.txt 2021-12-12 00:06:59.970419777 +0100
+@@ -158,6 +158,8 @@
+ ../Build/CMake/juce_runtime_arch_detection.cpp)
+
+ target_link_libraries(Projucer PRIVATE
++ "png16"
++ "jpeg"
+ ProjucerData
+ juce::juce_build_tools
+ juce::juce_cryptography
+diff -ruN a/extras/UnitTestRunner/CMakeLists.txt b/extras/UnitTestRunner/CMakeLists.txt
+--- a/extras/UnitTestRunner/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100
++++ b/extras/UnitTestRunner/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100
+@@ -33,6 +33,13 @@
+ JUCE_WEB_BROWSER=0)
+
+ target_link_libraries(UnitTestRunner PRIVATE
++ "FLAC"
++ "ogg"
++ "png16"
++ "vorbis"
++ "vorbisenc"
++ "vorbisfile"
++ "z"
+ juce::juce_analytics
+ juce::juce_audio_utils
+ juce::juce_dsp
More information about the arch-commits
mailing list