diff options
author | Christopher Arndt | 2021-03-05 17:40:29 +0100 |
---|---|---|
committer | Christopher Arndt | 2021-03-05 17:40:29 +0100 |
commit | c1dd8207c45603aca46af5b27878d74f825a2949 (patch) | |
tree | daa8c02eb2ad38bcdd3f381311eafc9e2ce8d4e5 | |
parent | a61b60fb22cfa3b87ddef94854d144ef986425be (diff) | |
download | aur-c1dd8207c45603aca46af5b27878d74f825a2949.tar.gz |
Extensive PKGBUILD update for upstream version 0.9.6
-rw-r--r-- | .SRCINFO | 38 | ||||
-rw-r--r-- | .gitignore | 13 | ||||
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | PKGBUILD | 77 | ||||
-rw-r--r-- | juce-alsa.patch | 13 | ||||
-rw-r--r-- | juce-pixel-format.patch | 151 |
6 files changed, 100 insertions, 202 deletions
@@ -1,7 +1,7 @@ pkgbase = dexed pkgdesc = A software synth closely modelled on the Yamaha DX7 - pkgver = 0.9.4 - pkgrel = 5 + pkgver = 0.9.6 + pkgrel = 1 url = http://asb2m10.github.io/dexed/ changelog = ChangeLog arch = i686 @@ -9,19 +9,33 @@ pkgbase = dexed groups = pro-audio groups = vst-plugins license = GPL3 - depends = alsa-lib - depends = curl + makedepends = alsa-lib + makedepends = curl + makedepends = freetype2 + makedepends = jack + makedepends = libx11 + makedepends = libxrandr + makedepends = libxinerama + makedepends = libxcursor depends = hicolor-icon-theme - depends = freetype2 - depends = libxinerama - source = dexed-0.9.4.tar.gz::https://github.com/asb2m10/dexed/archive/v0.9.4.tar.gz + depends = libpng + source = dexed-0.9.6.tar.gz::https://github.com/asb2m10/dexed/archive/v0.9.6.tar.gz + source = https://github.com/juce-framework/JUCE/releases/download/6.0.7/juce-6.0.7-linux.zip source = dexed.desktop - source = juce-pixel-format.patch - source = juce-alsa.patch - md5sums = 0e69fdcc3c18a8ac083657213a7921a2 + source = vst3sdk-0908f475f52af56682321192d800ef25d1823dd2.tar.gz::https://github.com/steinbergmedia/vst3sdk/archive/0908f475f52af56682321192d800ef25d1823dd2.tar.gz + source = tuning-library-ea580e666e4b0825d7d9e2906407e186e38dd394.tar.gz::https://github.com/surge-synthesizer/tuning-library/archive/ea580e666e4b0825d7d9e2906407e186e38dd394.tar.gz + source = surgesynthteam_tuningui-0cfaa86484733187af78bc3a48bb89e59e64393f.tar.gz::https://github.com/surge-synthesizer/surgesynthteam_tuningui/archive/0cfaa86484733187af78bc3a48bb89e59e64393f.tar.gz + md5sums = 7dae0fe19ceefed603bef5ccf96140f1 + md5sums = 8beda8acb99a1ae7505eed909bd3e7ea md5sums = d888f8f2c1a44ed75c77d43faee73361 - md5sums = 3b8cd62ca811638639c7f6de18306849 - md5sums = a5eb7812e4b8719547d6c7ba193d2e53 + md5sums = 448948468aeb5a798cd4a12f68b07c03 + md5sums = c8ad413951b5c2adb98ff7fe15bc2db7 + md5sums = 059366b39f4f4588aff66fd6b921a2d8 pkgname = dexed + depends = hicolor-icon-theme + depends = libpng + depends = libasound.so + depends = libcurl.so + depends = libfreetype.so diff --git a/.gitignore b/.gitignore index 0898c866e3de..dbacb3d37349 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ -src/ -pkg/ -dexed-*.tar.gz +.AURINFO dexed-*.pkg.tar.xz +dexed-*.pkg.tar.zst dexed-*.src.tar.gz -.AURINFO +dexed-*.tar.gz +juce-*-linux.zip +pkg/ +src/ +surgesynthteam_tuningui-*.tar.gz +tuning-library-*.tar.gz +vst3sdk-*.tar.gz diff --git a/ChangeLog b/ChangeLog index 5696f4be3990..007ed08b402f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2021-03-05 Christopher Arndt <aur -at- chrisarndt -dot- de> + + * 0.9.6-1 + Upstream does not provide a proper source distribution anymore + So we include git sub-modules of the dependencies as they were tagged + at the time of release + Vendored JUCE 6.0.7 since the official repos lag behind in + packaging JUCE 6. + VST2 plugin was replaced by VST3 version by upstream + 2019-09-01 Christopher Arndt <aur -at- chrisarndt -dot- de> * 0.9.4-5 @@ -1,47 +1,80 @@ # Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de> +# Global assoc. array of it git hashes of +# thirdparty libs sub-modules at tag for release version +declare -g -A _thirdparty_libs=( + ['surge-synthesizer;surgesynthteam_tuningui']='0cfaa86484733187af78bc3a48bb89e59e64393f' + ['surge-synthesizer;tuning-library']='ea580e666e4b0825d7d9e2906407e186e38dd394' + ['steinbergmedia;vst3sdk']='0908f475f52af56682321192d800ef25d1823dd2' +) + pkgname="dexed" -pkgver=0.9.4 -pkgrel=5 +pkgver=0.9.6 +_juce_version=6.0.7 +pkgrel=1 pkgdesc="A software synth closely modelled on the Yamaha DX7" arch=('i686' 'x86_64') url="http://asb2m10.github.io/dexed/" license=("GPL3") groups=('pro-audio' 'vst-plugins') -depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'freetype2' 'libxinerama') -makedepends=() -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asb2m10/dexed/archive/v${pkgver}.tar.gz" - 'dexed.desktop' - 'juce-pixel-format.patch' - 'juce-alsa.patch') -md5sums=('0e69fdcc3c18a8ac083657213a7921a2' - 'd888f8f2c1a44ed75c77d43faee73361' - '3b8cd62ca811638639c7f6de18306849' - 'a5eb7812e4b8719547d6c7ba193d2e53') +depends=('hicolor-icon-theme' 'libpng') +makedepends=('alsa-lib' 'curl' 'freetype2' 'jack' 'libx11' 'libxrandr' + 'libxinerama' 'libxcursor') changelog=ChangeLog +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asb2m10/dexed/archive/v${pkgver}.tar.gz" + "https://github.com/juce-framework/JUCE/releases/download/${_juce_version}/juce-${_juce_version}-linux.zip" + 'dexed.desktop') + +# Add thirdparty libs to source array +for _proj in "${!_thirdparty_libs[@]}"; do + _arr=(${_proj//;/ }) + _vendor=${_arr[0]} + _lib=${_arr[1]} + _hash=${_thirdparty_libs[$_proj]} + source+=("${_lib}-${_hash}.tar.gz::https://github.com/${_vendor}/${_lib}/archive/${_hash}.tar.gz") +done +md5sums=('7dae0fe19ceefed603bef5ccf96140f1' + '8beda8acb99a1ae7505eed909bd3e7ea' + 'd888f8f2c1a44ed75c77d43faee73361' + '448948468aeb5a798cd4a12f68b07c03' + 'c8ad413951b5c2adb98ff7fe15bc2db7' + '059366b39f4f4588aff66fd6b921a2d8') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # https://github.com/asb2m10/dexed/pull/184 - patch -N -r - -p1 -i "${srcdir}/juce-alsa.patch" || : - # patch JUCE to compile with GCC >= 9.x - patch -N -r - -p1 -i "${srcdir}/juce-pixel-format.patch" || return 0 + + # Link thirdparty sources to lib/ dir + for _proj in "${!_thirdparty_libs[@]}"; do + _arr=(${_proj//;/ }) + _vendor=${_arr[0]} + _lib=${_arr[1]} + _hash=${_thirdparty_libs[$_proj]} + + if [[ -d libs/${_lib} ]]; then + rmdir libs/${_lib} + fi + + ln -s "${srcdir}/${_lib}-${_hash}" libs/${_lib} + done + + mkdir -p assets + ln -sf "${srcdir}/JUCE" assets + ./assets/JUCE/Projucer --resave Dexed.jucer } build() { cd "${srcdir}/${pkgname}-${pkgver}/Builds/Linux" - make \ - CONFIG=Release \ - CXXFLAGS="-D JUCE_JACK=1 -D JUCE_ALSA=1 -D buildVST=1 -D buildStandalone=1" + make CONFIG=Release } package() { + depends+=('libasound.so' 'libcurl.so' 'libfreetype.so') cd "${srcdir}/${pkgname}-${pkgver}" # install VST plugin - install -Dm755 Builds/Linux/build/Dexed.so \ - "${pkgdir}/usr/lib/vst/Dexed.so" + install -Dm755 Builds/Linux/build/Dexed.vst3/Contents/$(uname -m)-linux/Dexed.so \ + -t "${pkgdir}/usr/lib/vst/Dexed.vst3/Contents/$(uname -m)-linux/" # install standalone program install -Dm755 Builds/Linux/build/Dexed \ "${pkgdir}/usr/bin/dexed" @@ -50,7 +83,7 @@ package() { install -Dm755 Resources/ui/dexedIcon.png \ "${pkgdir}/usr/share/icons/hicolor/512x512/apps/dexed.png" install -Dm755 "${srcdir}/dexed.desktop" \ - "${pkgdir}/usr/share/applications/dexed.desktop" + -t "${pkgdir}/usr/share/applications" } # vim:set ts=2 sw=2 et: diff --git a/juce-alsa.patch b/juce-alsa.patch deleted file mode 100644 index dac4593ccd1c..000000000000 --- a/juce-alsa.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/JuceLibraryCode/AppConfig.h b/JuceLibraryCode/AppConfig.h -index 076537fe..40f2dc52 100644 ---- a/JuceLibraryCode/AppConfig.h -+++ b/JuceLibraryCode/AppConfig.h -@@ -18,6 +18,8 @@ -
- //#define JUCE_CORETEXT_AVAILABLE 0
-
-+#define JUCE_ALSA_MIDI_NAME "Dexed"
-+
- // [END_USER_CODE_SECTION]
-
- /*
diff --git a/juce-pixel-format.patch b/juce-pixel-format.patch deleted file mode 100644 index c5b185c499eb..000000000000 --- a/juce-pixel-format.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h b/JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -index cb0867c..3af7c26 100755 ---- a/JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -+++ b/JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -@@ -105,22 +105,9 @@ public: -
- //==============================================================================
- forcedinline uint8 getAlpha() const noexcept { return components.a; }
-- forcedinline uint8 getRed() const noexcept { return components.r; }
-+ forcedinline uint8 getRed() const noexcept { return components.r; }
- forcedinline uint8 getGreen() const noexcept { return components.g; }
-- forcedinline uint8 getBlue() const noexcept { return components.b; }
--
-- #if JUCE_GCC
-- // 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
-+ forcedinline uint8 getBlue() const noexcept { return components.b; }
-
- //==============================================================================
- /** Copies another pixel colour over this one.
-@@ -340,9 +327,6 @@ private: - {
- uint32 internal;
- Components components;
-- #if JUCE_GCC
-- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members
-- #endif
- };
- }
- #ifndef DOXYGEN
-@@ -425,13 +409,9 @@ public: -
- //==============================================================================
- forcedinline uint8 getAlpha() const noexcept { return 0xff; }
-- forcedinline uint8 getRed() const noexcept { return r; }
-+ forcedinline uint8 getRed() const noexcept { return r; }
- forcedinline uint8 getGreen() const noexcept { return g; }
-- forcedinline uint8 getBlue() const noexcept { return b; }
--
-- forcedinline uint8& getRed() noexcept { return r; }
-- forcedinline uint8& getGreen() noexcept { return g; }
-- forcedinline uint8& getBlue() noexcept { return b; }
-+ forcedinline uint8 getBlue() const noexcept { return b; }
-
- //==============================================================================
- /** Copies another pixel colour over this one.
-@@ -646,11 +626,9 @@ public: -
- //==============================================================================
- forcedinline uint8 getAlpha() const noexcept { return a; }
-- forcedinline uint8& getAlpha() noexcept { return a; }
--
-- forcedinline uint8 getRed() const noexcept { return 0; }
-+ forcedinline uint8 getRed() const noexcept { return 0; }
- forcedinline uint8 getGreen() const noexcept { return 0; }
-- forcedinline uint8 getBlue() const noexcept { return 0; }
-+ forcedinline uint8 getBlue() const noexcept { return 0; }
-
- //==============================================================================
- /** Copies another pixel colour over this one.
-diff --git a/JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h b/JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -index 49eed38..822a670 100755 ---- a/JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -+++ b/JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -@@ -572,18 +572,10 @@ namespace EdgeTableFillers - : destData (image), sourceColour (colour)
- {
- if (sizeof (PixelType) == 3 && destData.pixelStride == sizeof (PixelType))
-- {
- areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
- && sourceColour.getGreen() == sourceColour.getBlue();
-- filler[0].set (sourceColour);
-- filler[1].set (sourceColour);
-- filler[2].set (sourceColour);
-- filler[3].set (sourceColour);
-- }
- else
-- {
- areRGBComponentsEqual = false;
-- }
- }
-
- forcedinline void setEdgeTableYPos (int y) noexcept
-@@ -665,7 +657,6 @@ namespace EdgeTableFillers - const Image::BitmapData& destData;
- PixelType* linePixels;
- PixelARGB sourceColour;
-- PixelRGB filler[4];
- bool areRGBComponentsEqual;
-
- forcedinline PixelType* getPixel (int x) const noexcept
-@@ -680,47 +671,10 @@ namespace EdgeTableFillers -
- forcedinline void replaceLine (PixelRGB* dest, PixelARGB colour, int width) const noexcept
- {
-- if (destData.pixelStride == sizeof (*dest))
-- {
-- if (areRGBComponentsEqual) // if all the component values are the same, we can cheat..
-- {
-- memset (dest, colour.getRed(), (size_t) width * 3);
-- }
-- else
-- {
-- if (width >> 5)
-- {
-- auto intFiller = reinterpret_cast<const int*> (filler);
--
-- while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
-- {
-- dest->set (colour);
-- ++dest;
-- --width;
-- }
--
-- while (width > 4)
-- {
-- auto d = reinterpret_cast<int*> (dest);
-- *d++ = intFiller[0];
-- *d++ = intFiller[1];
-- *d++ = intFiller[2];
-- dest = reinterpret_cast<PixelRGB*> (d);
-- width -= 4;
-- }
-- }
--
-- while (--width >= 0)
-- {
-- dest->set (colour);
-- ++dest;
-- }
-- }
-- }
-+ if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
-+ memset ((void*) dest, colour.getRed(), (size_t) width * 3); // if all the component values are the same, we can cheat..
- else
-- {
-- JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
-- }
-+ JUCE_PERFORM_PIXEL_OP_LOOP (set (colour));
- }
-
- forcedinline void replaceLine (PixelAlpha* dest, const PixelARGB colour, int width) const noexcept
|