commit: 71c4df5b28386c7e83bc523090d8263c394079b2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 08:00:55 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 08:01:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c4df5b
media-sound/csound: bump to 6.16.0 + sync'd live
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/csound/Manifest | 3 +++
.../csound/{csound-9999.ebuild => csound-6.16.0.ebuild} | 17 ++++++++---------
media-sound/csound/csound-9999.ebuild | 10 +---------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index dbe4c2256bf..4503725bdf0 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B
b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1
SHA512
cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B
898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e
SHA512
0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
+DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
SHA512
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
+DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
SHA512
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
SHA512
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B
cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578
SHA512
243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
diff --git a/media-sound/csound/csound-9999.ebuild
b/media-sound/csound/csound-6.16.0.ebuild
similarity index 95%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.16.0.ebuild
index f0b57265999..27e5f4a83d4 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/";
LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
SLOT="0"
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc
portaudio
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
portaudio portmidi pulseaudio python samples static-libs stk test +threads
+utils
vim-syntax websocket"
@@ -71,7 +71,6 @@ CDEPEND="
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
hdf5? ( sci-libs/hdf5 )
- image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
java? ( >=virtual/jdk-1.8:* )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -119,6 +118,13 @@ src_prepare() {
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
+
+ if use doc; then
+ local png="${WORKDIR}/html/images/delayk.png"
+ pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help
for exit codes
+ [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+ mv -f ${png/.png/fixed.png} ${png} || die
+ fi
}
src_configure() {
@@ -133,11 +139,9 @@ src_configure() {
-DBUILD_DSSI_OPCODES=$(usex dssi)
-DBUILD_EMUGENS_OPCODES=ON
-DBUILD_EXCITER_OPCODES=ON
- -DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-DBUILD_FRAMEBUFFER_OPCODES=ON
-DBUILD_HDF5_OPCODES=$(usex hdf5)
- -DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=$(usex java)
@@ -152,7 +156,6 @@ src_configure() {
-DBUILD_PLATEREV_OPCODES=ON
-DBUILD_PVSGENDY_OPCODE=OFF
-DBUILD_PYTHON_INTERFACE=$(usex python)
- -DBUILD_PYTHON_OPCODES=$(usex python)
-DBUILD_RELEASE=ON
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be
redistributed: https://github.com/csound/csound/issues/1148
-DBUILD_SELECT_OPCODE=ON
@@ -204,10 +207,6 @@ src_configure() {
# so it must NOT be installed into cmod_dir.
)
- use python && mycmakeargs+=(
- -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
- )
-
cmake_src_configure
}
diff --git a/media-sound/csound/csound-9999.ebuild
b/media-sound/csound/csound-9999.ebuild
index f0b57265999..f997f81d644 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/";
LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
SLOT="0"
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc
portaudio
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
portaudio portmidi pulseaudio python samples static-libs stk test +threads
+utils
vim-syntax websocket"
@@ -71,7 +71,6 @@ CDEPEND="
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
hdf5? ( sci-libs/hdf5 )
- image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
java? ( >=virtual/jdk-1.8:* )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -133,11 +132,9 @@ src_configure() {
-DBUILD_DSSI_OPCODES=$(usex dssi)
-DBUILD_EMUGENS_OPCODES=ON
-DBUILD_EXCITER_OPCODES=ON
- -DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-DBUILD_FRAMEBUFFER_OPCODES=ON
-DBUILD_HDF5_OPCODES=$(usex hdf5)
- -DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=$(usex java)
@@ -152,7 +149,6 @@ src_configure() {
-DBUILD_PLATEREV_OPCODES=ON
-DBUILD_PVSGENDY_OPCODE=OFF
-DBUILD_PYTHON_INTERFACE=$(usex python)
- -DBUILD_PYTHON_OPCODES=$(usex python)
-DBUILD_RELEASE=ON
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be
redistributed: https://github.com/csound/csound/issues/1148
-DBUILD_SELECT_OPCODE=ON
@@ -204,10 +200,6 @@ src_configure() {
# so it must NOT be installed into cmod_dir.
)
- use python && mycmakeargs+=(
- -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
- )
-
cmake_src_configure
}
