Fixed VST2 build and pkgver function

5 files changed, 56 insertions, 174 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9c5466658c2..292529e61cf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dexed-git
 	pkgdesc = A software synth closely modelled on the Yamaha DX7 (git version)
-	pkgver = 0.9.4.1.r246.760f9ef
+	pkgver = 0.9.4hf1.r57.g2ebdf1e
 	pkgrel = 1
 	url = http://asb2m10.github.io/dexed/
 	changelog = ChangeLog
@@ -10,6 +10,7 @@ pkgbase = dexed-git
 	groups = vst-plugins
 	license = GPL3
 	makedepends = git
+	makedepends = steinberg-vst36
 	depends = alsa-lib
 	depends = curl
 	depends = hicolor-icon-theme
@@ -19,11 +20,17 @@ pkgbase = dexed-git
 	conflicts = dexed
 	conflicts = dexed-vst-git
 	source = dexed::git+https://github.com/asb2m10/dexed.git
+	source = https://d30pueezughrda.cloudfront.net/juce/juce-5.4.7-linux.zip
+	source = git+https://github.com/steinbergmedia/vst3sdk.git
+	source = git+https://github.com/surge-synthesizer/tuning-library.git
+	source = git+https://github.com/surge-synthesizer/surgesynthteam_tuningui.git
 	source = dexed.desktop
-	source = juce-pixel-format.patch
-	md5sums = SKIP
-	md5sums = d888f8f2c1a44ed75c77d43faee73361
-	md5sums = 3b8cd62ca811638639c7f6de18306849
+	sha256sums = SKIP
+	sha256sums = 6f259573553a26951e896ed8d0737f78c3db7668894adc699a1e517aafe76e39
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 092e8b4638f750c2d31e6d9592dee07a0f6b6f6f19e9bb07a3986da27496fe9b
 
 pkgname = dexed-git
 
diff --git a/.gitignore b/.gitignore
index fec96bca778a..4519600f9f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
 dexed/
 src/
 pkg/
-dexed-git-*.tar.xz
+tuning-library/
+surgesynthteam_tuningui/
+vst3sdk/
+dexed-git-*.pkg.tar.xz
+dexed-git-*.pkg.tar.zst
 dexed-git-*.src.tar.gz
+juce-*-linux.zip
 .AURINFO
diff --git a/ChangeLog b/ChangeLog
index 621cca270a36..4279d6391461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-04-27 Christopher Arndt <aur -at- chrisarndt -dot- de>
+
+	* 0.9.4hf1.r57.g2ebdf1e-1
+	* Added new git submodules to sources
+	* Added JUCE 5.4.7 to sources
+	* Added 'steinberg-vst36' to makedepends
+	* Create build files with Projucer
+	* Fixed 'pkgver' function
+	* Updated .gitignore file
+
 2019-09-01 Christopher Arndt <aur -at- chrisarndt -dot- de>
 
 	* 0.9.4.1.r246.760f9ef-1
diff --git a/PKGBUILD b/PKGBUILD
index 474027e56cd6..cbeebec58ac2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de>
 
 _pkgname=dexed
+_juce_version=5.4.7
 pkgname="${_pkgname}-git"
-pkgver=0.9.4.1.r246.760f9ef
+pkgver=0.9.4hf1.r57.g2ebdf1e
 pkgrel=1
 pkgdesc="A software synth closely modelled on the Yamaha DX7 (git version)"
 arch=('i686' 'x86_64')
@@ -10,39 +11,49 @@ url="http://asb2m10.github.io/dexed/"
 license=("GPL3")
 groups=('pro-audio' 'vst-plugins')
 depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'freetype2' 'libxinerama')
-makedepends=('git')
+makedepends=('git' 'steinberg-vst36')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}" "${_pkgname}-vst-git")
 source=("${_pkgname}::git+https://github.com/asb2m10/dexed.git"
-        'dexed.desktop'
-        'juce-pixel-format.patch')
-md5sums=('SKIP'
-         'd888f8f2c1a44ed75c77d43faee73361'
-         '3b8cd62ca811638639c7f6de18306849')
+        "https://d30pueezughrda.cloudfront.net/juce/juce-${_juce_version}-linux.zip"
+        'git+https://github.com/steinbergmedia/vst3sdk.git'
+        'git+https://github.com/surge-synthesizer/tuning-library.git'
+        'git+https://github.com/surge-synthesizer/surgesynthteam_tuningui.git'
+        'dexed.desktop')
+sha256sums=('SKIP'
+            '6f259573553a26951e896ed8d0737f78c3db7668894adc699a1e517aafe76e39'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '092e8b4638f750c2d31e6d9592dee07a0f6b6f6f19e9bb07a3986da27496fe9b')
 changelog=ChangeLog
 
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
 
-  local ver=$(cpp -dM Source/Dexed.h | grep '^#define DEXED_ID' | cut -d '"' -f 2)
-  # replace alpha chars with a dot
-  ver=$(echo $ver | sed -e 's/[a-z]\+/./')
-  echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  #local ver=$(cpp -dM Source/Dexed.h | grep '^#define DEXED_ID' | cut -d '"' -f 2)
+  #echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  echo $(git describe --tags | sed -E -e 's/-([0-9]+)-/-r\1-/' -e 's/^v//' -e 's/-/./g')
 }
 
-
 prepare() {
   cd "${srcdir}/${_pkgname}"
-  # patch JUCE to compile with GCC >= 9.x
-  patch -N -r - -p1 -i "${srcdir}/juce-pixel-format.patch" || return 0
+
+  git submodule init
+  git config submodule.vst3sdk.url "${srcdir}/vst3sdk"
+  git config submodule.tuning-library.url "${srcdir}/tuning-library"
+  git config submodule.surgesynthteam_tuningui.url "${srcdir}/surgesynthteam_tuningui"
+  git submodule update
+
+  mkdir -p assets
+  ln -sf "${srcdir}/JUCE" assets
+  VST2SDK_DIR="/usr/include/vst36" ./scripts/projuce-lin-vst2.sh
 }
 
 build() {
   cd "${srcdir}/${_pkgname}/Builds/Linux"
-  make \
-    CONFIG=Release \
-    CXXFLAGS="-D JUCE_JACK=1 -D JUCE_ALSA=1 -D buildVST=1 -D buildStandalone=1"
+  make CONFIG=Release
 }
 
 package() {
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