* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2015-11-17 8:41 Alexis Ballier
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier @ 2015-11-17 8:41 UTC (permalink / raw
To: gentoo-commits
commit: b720951f73de6b176136dbb8f5f4fdc9c4f705d2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 08:40:56 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 08:40:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b720951f
media-sound/zynaddsubfx: bump to 2.5.2
Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-sound/zynaddsubfx/Manifest | 1 +
.../zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch | 14 ++++++
media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild | 54 ++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 993e522..7fac81f 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -3,3 +3,4 @@ DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 SHA256 7d43bfece3b02625528dab7139e0fbada5
DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
DIST zynaddsubfx-2.5.1.tar.gz 4214568 SHA256 e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 SHA512 387d96bb5d6dfebd3129c047091380850d80092cf8e397ab1932b7a149d0fd9fb67033768ef68b50d33362f98ba20697ad9e4c25b5cf268484a24ecc156857e0 WHIRLPOOL 323f30cacc6d3c875a1324413aba091cdf4f62925b0deb6faa8500ee0574f2d96e3030151c0bc7c8d044be91c6e38f4283a5251456957e7bc714f914e1daa519
+DIST zynaddsubfx-2.5.2.tar.gz 4572973 SHA256 9588f97c83f38899a3c5c0407208ae29edea03c2db8939bffed9f17e7c53d987 SHA512 c48c3ce896d111d96fcfbff482f7488af66b71bff7d3129d34e3bd6db2c6a8433429317a648b3fdbaac5ae1307aa74b9c356e6d956898d0fa903f56d90ed1d8c WHIRLPOOL 3084386f6f3ea8d5caaea2c2b32fc242f1f7b8b539e9984aeea3efbc7743829d9fb5e8bb9da7708085e23b79aa6df9575470facdfcbc9f6cb672ac28de35070c
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
new file mode 100644
index 0000000..e3cc278
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.2/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.2.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.2/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+- DESTINATION share/doc/zynaddsubfx
+- )
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+ DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
new file mode 100644
index 0000000..fdf3a48
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+ sci-libs/fftw:3.0
+ alsa? ( media-libs/alsa-lib )
+ fltk? ( >=x11-libs/fltk-1.3:1 )
+ jack? ( media-sound/jack-audio-connection-kit )
+ lash? ( media-sound/lash )"
+# portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.2-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_configure() {
+ append-cxxflags "-std=c++11"
+ use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+ mycmakeargs=(
+ `use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+ `use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+ `use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+ `use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ insinto /usr/share/${PN}
+ doins -r "${S}"/instruments/*
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2017-02-12 16:07 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2017-02-12 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 54139b7d8917fed0e368029c3a44df198b309a66
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 16:05:17 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 16:07:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54139b7d
media-sound/zynaddsubfx: Remove 2.4.3
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/zynaddsubfx/Manifest | 1 -
.../zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch | 12 -----
.../files/zynaddsubfx-2.4.3-nofltk.patch | 24 ---------
media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild | 57 ----------------------
4 files changed, 94 deletions(-)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index cfd4c0c0d1..5d9451e3f1 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,3 @@
-DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
DIST zynaddsubfx-2.5.4.tar.bz2 6765621 SHA256 014b1d9ad1750c310369676b46a4555ba6bec512c38ccba17ceb89c78552949a SHA512 d63bf4582f308f02e75502478923f58cd4660706ba6122ee03e3e6697ce661c9ed82477f8c50e0c5eaf93f1ab9dfd4cc8b1c14d78ba0c38971c5d6ecbae413c7 WHIRLPOOL cda1ed0f8fe73f05bc293f13394c6d7f360224adc9d2cd8b2c6c5081d8850c22b4690df0416737765856a9d832fe19a300417ff927769b1d539eca63ec4d9d90
DIST zynaddsubfx-3.0.0.tar.bz2 6809813 SHA256 94593db88402dedd2f451720b81dd1caea1217a954349bbf254620c12904c45c SHA512 5fec53680352610301b1cfa9b6a6d73dfe17a17bbb5f39f765344054054434e1699c2bca6e56dd416cac9b88e456760be44c760012ddd0e24b9b52c69ffcc8e4 WHIRLPOOL 5377001e8f157c909705834695f05b8ea04d097e045879f12ab24f5e61bca747d8d0415c9f3b8df64e52bcaf7fb26f281c3088911ef9ceaab02983648178e957
DIST zynaddsubfx-3.0.1.tar.bz2 6811606 SHA256 a8017f382be5af9e46e6e8771fb7d7c1fd2e480cf099bbb0c29606b217dd32e2 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43 WHIRLPOOL 3bfe976e24f10bd94b6b3c1c994a505fcdb65d993cd76360c5b477567a10a3b864f155a035b538d081607b90ab71ed96a116249399dbda6050ce068c8dd5458b
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
deleted file mode 100644
index 587e4a4219..0000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ZynAddSubFX-2.4.1/CMakeLists.txt
-===================================================================
---- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
-+++ ZynAddSubFX-2.4.1/CMakeLists.txt
-@@ -5,7 +5,3 @@ project(zynaddsubfx)
- enable_testing()
- #Currently the only directory that uses cmake
- add_subdirectory(src)
--
--install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
-- DESTINATION share/doc/zynaddsubfx
-- )
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
deleted file mode 100644
index c20828328f..0000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=437018
-
-Index: ZynAddSubFX-2.4.3/src/main.cpp
-===================================================================
---- ZynAddSubFX-2.4.3.orig/src/main.cpp
-+++ ZynAddSubFX-2.4.3/src/main.cpp
-@@ -37,8 +37,6 @@
- #include "Misc/Dump.h"
- extern Dump dump;
-
--#include <FL/Fl.H>
--
- //Nio System
- #include "Nio/Nio.h"
-
-@@ -51,6 +49,8 @@ QApplication *app;
-
- #elif defined FLTK_GUI
-
-+#include <FL/Fl.H>
-+
- #include "UI/MasterUI.h"
- #endif // FLTK_GUI
-
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
deleted file mode 100644
index 356c173ac6..0000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils cmake-utils
-
-MY_P=ZynAddSubFX-${PV}
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
- sci-libs/fftw:3.0
- alsa? ( media-libs/alsa-lib )
- fltk? ( >=x11-libs/fltk-1.3:1 )
- jack? ( media-sound/jack-audio-connection-kit )
- lash? ( media-sound/lash )"
-# portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.1-docs.patch
- "${FILESDIR}"/${PN}-2.4.3-nofltk.patch
-)
-
-DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
-
-src_configure() {
- use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
- mycmakeargs=(
- `use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
- `use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
- `use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
- `use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- insinto /usr/share/${PN}
- doins -r "${S}"/instruments/*
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2018-01-07 18:16 Alexis Ballier
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier @ 2018-01-07 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 223bbb7dea968fef915ed6069cbeb5588edbf01d
Author: Simon van der Veldt <simon.vanderveldt <AT> gmail <DOT> com>
AuthorDate: Sun Jan 7 12:17:16 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 18:14:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223bbb7d
media-sound/zynaddsubfx bump to 3.0.3
media-sound/zynaddsubfx/Manifest | 1 +
.../zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch | 14 ++++++
media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild | 55 ++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index fbefddbd1b4..47de38d02ba 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,2 +1,3 @@
DIST zynaddsubfx-3.0.1.tar.bz2 6811606 BLAKE2B 4dc400b97381f03c4bc6ff749f1bcb6e4bb41c796a97b0ccf2cf3c8dd0b98235dec40f726e838934923719b8d3378be92a5e70b6a613ee8b9922632c22b0b691 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43
DIST zynaddsubfx-3.0.2.tar.bz2 7979193 BLAKE2B 9c77ef24de20a694477bf2d433fc2ee4ca3ad9d34c33e24ebabd91c4449fbabeae9d146645ce95d25355e9e8c277dd677f4c30032e65a22e6c8a336cd344fb50 SHA512 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57
+DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
new file mode 100644
index 00000000000..b094986ea86
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.2/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.2.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.2/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+- DESTINATION share/doc/zynaddsubfx
+- )
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
+ DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
new file mode 100644
index 00000000000..a2778f8b90e
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+ sci-libs/fftw:3.0
+ media-libs/liblo
+ alsa? ( media-libs/alsa-lib )
+ fltk? ( >=x11-libs/fltk-1.3:1 )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )"
+# portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-${PV}-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_configure() {
+ append-cxxflags "-std=c++11"
+ use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+ mycmakeargs=(
+ `use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+ `use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+ `use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+ `use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+ -DPluginLibDir=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ insinto /usr/share/${PN}
+ doins -r "${S}"/instruments/*
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2019-02-09 23:57 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-02-09 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 031642ded0aa3500ce497aaade5867b8b69af43a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 9 23:16:35 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 23:57:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031642de
media-sound/zynaddsubfx: EAPI-7 bump, comprehensive dependency fixes
Add USE doc, dssi, portaudio
Add missing dependencies
Fix cmake options
Improve DESCRIPTION
Closes: https://bugs.gentoo.org/659886
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch | 6 +-
media-sound/zynaddsubfx/metadata.xml | 3 +
.../zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild | 84 ++++++++++++++++++++++
3 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
index b094986ea86..2a35e0544c8 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -1,7 +1,5 @@
-Index: zynaddsubfx-2.5.2/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.2.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.2/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
#Currently the only directory that uses cmake
add_subdirectory(src)
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index bca5422640b..63c95289a8f 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -5,6 +5,9 @@
<email>proaudio@gentoo.org</email>
<name>Gentoo ProAudio Project</name>
</maintainer>
+ <use>
+ <flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">zynaddsubfx</remote-id>
</upstream>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
new file mode 100644
index 00000000000..42707c6895b
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ >=dev-libs/mxml-2.2.1
+ media-libs/liblo
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ dssi? ( media-libs/dssi )
+ fltk? (
+ >=x11-libs/fltk-1.3:1
+ x11-libs/libX11
+ x11-libs/libXpm
+ )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )
+ portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if ! use dssi; then
+ sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use jack; then
+ sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+ fi
+ if ! use lash; then
+ sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use portaudio; then
+ sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ append-cxxflags -std=c++11
+
+ local mycmakeargs=(
+ -DPluginLibDir=$(get_libdir)
+ $(cmake-utils_use_find_package alsa Alsa)
+ $(cmake-utils_use_find_package doc Doxygen)
+ $(cmake-utils_use_find_package fltk FLTK)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake-utils_src_install
+ insinto /usr/share/${PN}
+ doins -r instruments/*
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2019-06-20 10:37 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-06-20 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 3cb3f65f10b50d1ae53c6a956f224ae23a4f5ad9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 10:29:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 10:29:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb3f65f
media-sound/zynaddsubfx: Drop 3.0.3-r1
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/zynaddsubfx/Manifest | 1 -
.../zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch | 12 ----
.../zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild | 84 ----------------------
3 files changed, 97 deletions(-)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 174652726f3..57b7d0923fc 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,2 +1 @@
-DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
deleted file mode 100644
index 2a35e0544c8..00000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
- #Currently the only directory that uses cmake
- add_subdirectory(src)
-
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
-- DESTINATION share/doc/zynaddsubfx
-- )
- install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
- DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
deleted file mode 100644
index 82a682845d5..00000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa doc dssi +fltk jack lash portaudio"
-
-REQUIRED_USE="|| ( alsa jack portaudio )"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-DEPEND="
- >=dev-libs/mxml-2.2.1
- media-libs/liblo
- sci-libs/fftw:3.0
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- dssi? ( media-libs/dssi )
- fltk? (
- >=x11-libs/fltk-1.3:1
- x11-libs/libX11
- x11-libs/libXpm
- )
- jack? ( virtual/jack )
- lash? ( media-sound/lash )
- portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-docs.patch )
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if ! use dssi; then
- sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
- fi
- if ! use jack; then
- sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
- fi
- if ! use lash; then
- sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
- fi
- if ! use portaudio; then
- sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- append-cxxflags -std=c++11
-
- local mycmakeargs=(
- -DPluginLibDir=$(get_libdir)
- $(cmake-utils_use_find_package alsa Alsa)
- $(cmake-utils_use_find_package doc Doxygen)
- $(cmake-utils_use_find_package fltk FLTK)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- cmake-utils_src_install
- insinto /usr/share/${PN}
- doins -r instruments/*
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2021-01-01 23:27 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-01-01 23:27 UTC (permalink / raw
To: gentoo-commits
commit: a6410c7da3b8639705122551d2e657bae4ba72f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 23:26:41 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 23:26:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6410c7d
media-sound/zynaddsubfx: Fix cmake with IUSE=jack
Closes: https://bugs.gentoo.org/761823
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch | 15 +++++++++++++++
media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild | 7 +++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
new file mode 100644
index 00000000000..8fbcf9aca56
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
@@ -0,0 +1,15 @@
+Fix missing CMake include
+
+Authored by:  Simon van der Veldt 2020-09-30
+Committed by:  Mark McCurry 2020-10-03
+
+--- a/src/Nio/CMakeLists.txt
++++ b/src/Nio/CMakeLists.txt
+@@ -21,6 +21,7 @@
+ add_definitions(-DIN_DEFAULT="${DefaultInput}")
+
+ if(JackEnable)
++ include(CheckIncludeFiles)
+ include_directories(${JACK_INCLUDE_DIR})
+ list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
+ list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index 72b00573167..36d58edcadf 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,7 +38,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-cmake.patch # bug 761823
+)
DOCS=( ChangeLog HISTORY.txt README.adoc )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2022-01-27 8:43 Miroslav Šulc
0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2022-01-27 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 4dbf4f80da2ee7c5e3325d4f25512dc0ed1a4b48
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 08:42:55 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 08:42:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbf4f80
media-sound/zynaddsubfx: bump to 3.0.6, +alsa
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/zynaddsubfx/Manifest | 1 +
.../zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch | 14 ++++
media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild | 89 ++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 57b7d0923fc5..64dfea5bacae 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1 +1,2 @@
DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
+DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
new file mode 100644
index 000000000000..e10b92d096eb
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c70857..20e20d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,9 +35,6 @@ include(CTestConfig.cmake)
+ add_subdirectory(src)
+ add_subdirectory(doc) # Doxygen only
+
+-install(FILES AUTHORS.txt COPYING README.adoc
+- DESTINATION share/doc/zynaddsubfx
+- )
+ install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
+ DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
new file mode 100644
index 000000000000..7ba88ec4ec0a
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ dev-libs/mxml
+ media-libs/liblo
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ dssi? ( media-libs/dssi )
+ fltk? (
+ x11-libs/fltk:1
+ x11-libs/libX11
+ x11-libs/libXpm
+ )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )
+ portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.adoc )
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use dssi; then
+ sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use jack; then
+ sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+ fi
+ if ! use lash; then
+ sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use portaudio; then
+ sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+
+ # FIXME upstream: sandbox error
+ sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
+}
+
+src_configure() {
+ append-cxxflags -std=c++11
+
+ local mycmakeargs=(
+ -DPluginLibDir=$(get_libdir)
+ $(cmake_use_find_package alsa Alsa)
+ $(cmake_use_find_package doc Doxygen)
+ $(cmake_use_find_package fltk FLTK)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake_src_install
+ insinto /usr/share/${PN}
+ doins -r instruments/*
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2023-05-21 7:42 Miroslav Šulc
0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2023-05-21 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 1c6f6237975331084706c4935bddd56af4349f2a
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sat May 20 20:22:52 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 21 07:42:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6f6237
media-sound/zynaddsubfx: backport GCC 13 fixes
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31109
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/zynaddsubfx-3.0.6-stdint.patch | 46 ++++++++++++++++++++++
.../zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild | 3 +-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
new file mode 100644
index 000000000000..4590183ab0f9
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
@@ -0,0 +1,46 @@
+Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/f384d92486d6b515cb628d0f52008a9e03341d8c
+Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707
+
+From f384d92486d6b515cb628d0f52008a9e03341d8c Mon Sep 17 00:00:00 2001
+From: fundamental <mark.d.mccurry@gmail.com>
+Date: Wed, 19 Apr 2023 21:52:01 -0400
+Subject: [PATCH] Bank: Add stdint.h header include
+
+As uint8_t is used, this header should be included.
+---
+ src/Misc/Bank.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h
+index 5120441a5..3f324dd84 100644
+--- a/src/Misc/Bank.h
++++ b/src/Misc/Bank.h
+@@ -18,6 +18,7 @@
+ #include <vector>
+ #include "../globals.h"
+ #include "Config.h"
++#include <stdint.h>
+
+ //entries in a bank
+ #define BANK_SIZE 160
+
+From 70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707 Mon Sep 17 00:00:00 2001
+From: fundamental <mark.d.mccurry@gmail.com>
+Date: Sat, 22 Apr 2023 10:21:09 -0400
+Subject: [PATCH] MidiIn: Add stdint.h header include
+
+---
+ src/Nio/MidiIn.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Nio/MidiIn.h b/src/Nio/MidiIn.h
+index ce0bcfec3..c6b30c61d 100644
+--- a/src/Nio/MidiIn.h
++++ b/src/Nio/MidiIn.h
+@@ -17,6 +17,7 @@
+ #define MIDI_IN_H
+
+ #include "Engine.h"
++#include <stdint.h>//uint8_t
+
+ namespace zyn {
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
index 91346729c831..ed506ba3f20e 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -45,6 +45,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-stdint.patch
)
DOCS=( AUTHORS.txt NEWS.txt README.adoc )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
@ 2023-12-19 22:39 Miroslav Šulc
0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2023-12-19 22:39 UTC (permalink / raw
To: gentoo-commits
commit: c318dc516a2b39839d4c2b026111e87652f5f4f9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 22:34:13 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 22:35:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c318dc51
media-sound/zynaddsubfx: build new UI instead of unmaintained one
Closes: https://bugs.gentoo.org/920178
Closes: https://github.com/gentoo/gentoo/pull/34315
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/zynaddsubfx/Manifest | 1 +
.../files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch | 19 +++
.../zyn-fusion-ui-3.0.6-libzest_location.patch | 11 ++
.../files/zyn-fusion-ui-3.0.6-makefile_find.patch | 69 ++++++++++
.../zyn-fusion-ui-3.0.6-system_wide_location.patch | 40 ++++++
.../zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch | 2 -
.../files/zynaddsubfx-3.0.6-libzest_location.patch | 11 ++
.../files/zynaddsubfx-3.0.6-stdint.patch | 149 ++++++++++++++++-----
.../zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild | 113 ++++++++++++++++
9 files changed, 376 insertions(+), 39 deletions(-)
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 899fdbeb6639..748fcac41684 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1 +1,2 @@
+DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd
DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch
new file mode 100644
index 000000000000..005b1733e5e2
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch
@@ -0,0 +1,19 @@
+--- i/Makefile
++++ w/Makefile
+@@ -16,10 +16,14 @@ linux:
+ $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+- `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
++ $(CFLAGS) \
++ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \
++ $(LDFLAGS)
+ $(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \
++ $(CFLAGS) \
+ -DPUGL_HAVE_GL \
+- -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs
++ -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \
++ $(LDFLAGS)
+
+ osx: deps/libuv.a
+ ruby ./rebuild-fcache.rb
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch
new file mode 100644
index 000000000000..a24921196fe6
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch
@@ -0,0 +1,11 @@
+--- i/test-libversion.c
++++ w/test-libversion.c
+@@ -660,7 +660,7 @@ int main(int argc, char **argv)
+ if(!handle)
+ handle = dlopen("libzest.so", RTLD_LAZY);
+ if(!handle)
+- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
++ handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY);
+ #endif
+ if(!handle) {
+ printf("[ERROR] Cannot Open libzest.so\n");
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch
new file mode 100644
index 000000000000..77cc47913f57
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch
@@ -0,0 +1,69 @@
+From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Sat, 21 May 2022 13:19:48 +0200
+Subject: [PATCH] Use find internals instead of piping into grep
+
+Makefile:
+Use GNU find internals (e.g. `-iname`, `-exec` and conditionals) instead
+of piping into multiple instances of grep.
+Simplify line counting by using wc from find.
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ linux:
+ # force rebuilding all code that depends on hotloading.
+ touch src/mruby-widget-lib/src/api.c
+ cd mruby && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake
+- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
+@@ -30,7 +30,7 @@ osx: deps/libuv.a
+ cd deps/pugl && python2 ./waf
+ cd src/osc-bridge && CFLAGS="-I ../../deps/libuv/include " make lib
+ cd mruby && MRUBY_CONFIG=../build_config.rb rake
+- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` ./deps/libnanovg.a \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+ ./deps/libuv/.libs/libuv.a -lm -framework OpenGL -lpthread
+@@ -41,7 +41,7 @@ windows: buildpuglwin deps/libuv-win.a
+ $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o
+ cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/libuv/include " make lib
+ cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake
+- $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \
++ $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+ ./deps/libuv-win.a \
+@@ -98,21 +98,21 @@ stats:
+ @echo 'mruby-qml-parse commits: ' `cd src/mruby-qml-parse && git log --oneline | wc -l`
+ @echo 'mruby-qml-spawn commits: ' `cd src/mruby-qml-spawn && git log --oneline | wc -l`
+ @echo 'osc-bridge commits: ' `cd src/osc-bridge && git log --oneline | wc -l`
+- @echo 'number of qml files:' `find src/ -type f | grep -e qml$$ | wc -l`
+- @echo 'number of ruby files:' `find src/ -type f | grep -e rb$$ | wc -l`
+- @echo 'number of c files:' `find src/ -type f | grep -e c$$ | wc -l`
+- @echo 'number of header files:' `find src/ -type f | grep -e h$$ | wc -l`
++ @echo 'number of qml files:' `find src/ -type f -iname "*.qml" | wc -l`
++ @echo 'number of ruby files:' `find src/ -type f -iname "*.rb" | wc -l`
++ @echo 'number of c files:' `find src/ -type f -iname "*.c" | wc -l`
++ @echo 'number of header files:' `find src/ -type f -iname "*.h" | wc -l`
+ @echo 'lines of OSC schema:' `wc -l src/osc-bridge/schema/test.json`
+ @echo 'lines of qml:'
+- @wc -l `find src/ -type f | grep qml$$` | tail -n 1
++ @`find src/ -type f -iname "*.qml" -exec wc -l {} +` | tail -n 1
+ @echo 'lines of ruby:'
+- @wc -l `find src/ -type f | grep -e rb$$ | grep -v fcache` | tail -n 1
++ @`find src/ -type f \( -iname "*.rb" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1
+ @echo 'lines of c source:'
+- @wc -l `find src/ -type f | grep -e c$$` | tail -n 1
++ @`find src/ -type f -iname "*.c" -exec wc -l {} +` | tail -n 1
+ @echo 'lines of c header:'
+- @wc -l `find src/ -type f | grep -e h$$` | tail -n 1
++ @`find src/ -type f -iname "*.h" -exec wc -l {} +` | tail -n 1
+ @echo 'total lines of code:'
+- @wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1
++ @`find src/ -type f \( -iname "*.qml" -o -iname "*.rb" -o -iname "*.c" -o -iname "*.h" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1
+
+
+ verbose: ## Compile mruby with --trace
diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch
new file mode 100644
index 000000000000..3001e08754dc
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch
@@ -0,0 +1,40 @@
+--- i/src/mruby-widget-lib/mrblib/script.rb
++++ w/src/mruby-widget-lib/mrblib/script.rb
+@@ -160,13 +160,13 @@ class ZRunner
+ search = @search_path
+ search ||= ""
+ font_error = false
+- sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
++ sans = ["/usr/share/fonts/roboto/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
+ if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1)
+ GL::debug "[ERROR] could not find sans font"
+ font_error = true
+ end
+
+- bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
++ bold = ["/usr/share/fonts/roboto/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
+ if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1)
+ GL::debug "[ERROR] could not find bold font"
+ font_error = true
+--- i/src/mruby-widget-lib/src/api.c
++++ w/src/mruby-widget-lib/src/api.c
+@@ -110,7 +110,7 @@ zest_open(char *address)
+ if(strstr(path, "libzest"))
+ strstr(path, "libzest")[0] = 0;
+ char path2[256];
+- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml");
++ snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml");
+ FILE *f = fopen(path2, "r");
+ if(f) {
+ printf("[INFO:Zyn] Found Assets at %s\n", path);
+--- i/src/osc-bridge/src/bridge.c
++++ w/src/osc-bridge/src/bridge.c
+@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri)
+ schema_t sch;
+
+ //printf("[debug] loading json file\n");
+- FILE *f = fopen("schema/test.json", "r");
++ FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r");
+ if(!f && br->search_path) {
+ char tmp[256];
+ snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json");
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
index e10b92d096eb..0db30ed2395c 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c70857..20e20d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,6 @@ include(CTestConfig.cmake)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch
new file mode 100644
index 000000000000..79e9e30083e5
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch
@@ -0,0 +1,11 @@
+--- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
++++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
+@@ -68,7 +68,7 @@ public:
+ #else
+ handle = dlopen("./libzest.so", RTLD_LAZY);
+ if(!handle)
+- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
++ handle = dlopen("/usr/lib64/zynaddsubfx/libzest.so", RTLD_LAZY);
+ if(!handle)
+ handle = dlopen("libzest.so", RTLD_LAZY);
+ #endif
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
index 4590183ab0f9..3c1bd7937810 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch
@@ -1,46 +1,121 @@
-Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/f384d92486d6b515cb628d0f52008a9e03341d8c
-Upstream Commit: https://github.com/zynaddsubfx/zynaddsubfx/commit/70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707
-
-From f384d92486d6b515cb628d0f52008a9e03341d8c Mon Sep 17 00:00:00 2001
-From: fundamental <mark.d.mccurry@gmail.com>
-Date: Wed, 19 Apr 2023 21:52:01 -0400
-Subject: [PATCH] Bank: Add stdint.h header include
-
-As uint8_t is used, this header should be included.
----
- src/Misc/Bank.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h
-index 5120441a5..3f324dd84 100644
---- a/src/Misc/Bank.h
-+++ b/src/Misc/Bank.h
-@@ -18,6 +18,7 @@
+--- zynaddsubfx-3.0.6/src/Params/ADnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/ADnoteParameters.h
+@@ -16,6 +16,7 @@
+
+ #include "../globals.h"
+ #include "PresetsArray.h"
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6/src/Params/Controller.h
++++ zynaddsubfx-3.0.6.mod/src/Params/Controller.h
+@@ -17,6 +17,7 @@
+
+ #include <stdint.h>
+ #include "../globals.h"
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6/src/Params/EnvelopeParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/EnvelopeParams.h
+@@ -17,6 +17,7 @@
+ #include "../globals.h"
+ #include "../Misc/XMLwrapper.h"
+ #include "Presets.h"
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6/src/Params/FilterParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/FilterParams.h
+@@ -17,6 +17,7 @@
+ #include "../globals.h"
+ #include "../Misc/XMLwrapper.h"
+ #include "PresetsArray.h"
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6/src/Params/LFOParams.h
++++ zynaddsubfx-3.0.6.mod/src/Params/LFOParams.h
+@@ -17,6 +17,7 @@
+ #include <Misc/Time.h>
+ #include <rtosc/ports.h>
+ #include "Presets.h"
++#include <cstdint>
+
+ #define LFO_SINE 0
+ #define LFO_TRIANGLE 1
+--- zynaddsubfx-3.0.6/src/Params/PADnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/PADnoteParameters.h
+@@ -19,7 +19,7 @@
+ #include "Presets.h"
+ #include <string>
+ #include <functional>
+-
++#include <cstdint>
+ namespace zyn {
+
+ /**
+--- zynaddsubfx-3.0.6/src/Params/SUBnoteParameters.h
++++ zynaddsubfx-3.0.6.mod/src/Params/SUBnoteParameters.h
+@@ -17,6 +17,7 @@
+ #include <stdint.h>
+ #include "../globals.h"
+ #include "Presets.h"
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6.old/src/Misc/Bank.cpp
++++ zynaddsubfx-3.0.6/src/Misc/Bank.cpp
+@@ -17,6 +17,7 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstdint>
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <algorithm>
+--- zynaddsubfx-3.0.6.old/src/Misc/Bank.h
++++ zynaddsubfx-3.0.6/src/Misc/Bank.h
+@@ -16,6 +16,7 @@
+
+ #include <string>
#include <vector>
++#include <cstdint>
#include "../globals.h"
#include "Config.h"
-+#include <stdint.h>
-
- //entries in a bank
- #define BANK_SIZE 160
-
-From 70905c96fe7b9ffde19bc4bc05b0dc53a1ed1707 Mon Sep 17 00:00:00 2001
-From: fundamental <mark.d.mccurry@gmail.com>
-Date: Sat, 22 Apr 2023 10:21:09 -0400
-Subject: [PATCH] MidiIn: Add stdint.h header include
-
----
- src/Nio/MidiIn.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Nio/MidiIn.h b/src/Nio/MidiIn.h
-index ce0bcfec3..c6b30c61d 100644
---- a/src/Nio/MidiIn.h
-+++ b/src/Nio/MidiIn.h
+
+--- zynaddsubfx-3.0.6.old/src/Nio/InMgr.cpp
++++ zynaddsubfx-3.0.6/src/Nio/InMgr.cpp
+@@ -17,6 +17,7 @@
+ #include "../Misc/MiddleWare.h"
+ #include <rtosc/thread-link.h>
+ #include <iostream>
++#include <cstdint>
+ using namespace std;
+
+ extern zyn::MiddleWare *middleware;
+--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.cpp
++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.cpp
+@@ -15,6 +15,7 @@
+ #include "../globals.h"
+ #include "InMgr.h"
+ #include <string.h>
++#include <cstdint>
+
+ namespace zyn {
+
+--- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.h
++++ zynaddsubfx-3.0.6/src/Nio/MidiIn.h
@@ -17,6 +17,7 @@
#define MIDI_IN_H
#include "Engine.h"
-+#include <stdint.h>//uint8_t
++#include <cstdint>
namespace zyn {
+
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild
new file mode 100644
index 000000000000..7303db4ad930
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="https://zynaddsubfx.sourceforge.net/"
+
+SRC_URI="
+ mirror://sourceforge/zynaddsubfx/${P}.tar.bz2
+ mirror://sourceforge/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa doc dssi jack lash portaudio"
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+DEPEND="
+ dev-libs/mxml
+ media-libs/liblo
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ doc? ( dev-texlive/texlive-fontutils )
+ dssi? ( media-libs/dssi )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )
+ portaudio? ( media-libs/portaudio )
+"
+RDEPEND="
+ ${DEPEND}
+ media-fonts/roboto
+"
+BDEPEND="
+ dev-lang/ruby:*
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-stdint.patch
+ "${FILESDIR}"/${P}-libzest_location.patch
+)
+ZYN_FUSION_UI_PATCHES=(
+ "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch
+ "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch
+ "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch
+ "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.adoc )
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use dssi; then
+ sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use jack; then
+ sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+ fi
+ if ! use lash; then
+ sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use portaudio; then
+ sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+
+ # FIXME upstream: sandbox error
+ sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
+
+ cd ../zyn-fusion-ui-src-${PV}
+ eapply "${ZYN_FUSION_UI_PATCHES[@]}"
+}
+
+src_configure() {
+ append-cxxflags -std=c++11
+
+ local mycmakeargs=(
+ -DPluginLibDir=$(get_libdir)
+ -DGuiModule=zest
+ -DDefaultInput=jack
+ -DDefaultOutput=jack
+ $(cmake_use_find_package alsa Alsa)
+ $(cmake_use_find_package doc Doxygen)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+ emake -C ../zyn-fusion-ui-src-${PV}
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake_src_install
+
+ cd ../zyn-fusion-ui-src-${PV}
+ newbin zest zyn-fusion
+ insinto /usr/$(get_libdir)/${PN}
+ doins libzest.so
+ insinto /usr/share/${PN}/qml
+ doins -r src/mruby-zest/{example,qml}/*.qml
+ insinto /usr/share/${PN}/schema
+ doins src/osc-bridge/schema/test.json
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-12-19 22:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-27 8:43 [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 22:39 Miroslav Šulc
2023-05-21 7:42 Miroslav Šulc
2021-01-01 23:27 Andreas Sturmlechner
2019-06-20 10:37 Andreas Sturmlechner
2019-02-09 23:57 Andreas Sturmlechner
2018-01-07 18:16 Alexis Ballier
2017-02-12 16:07 Johannes Huber
2015-11-17 8:41 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox