| 1 |
commit: 71c4df5b28386c7e83bc523090d8263c394079b2 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 13 08:00:55 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 13 08:01:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c4df5b |
| 7 |
|
| 8 |
media-sound/csound: bump to 6.16.0 + sync'd live |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/csound/Manifest | 3 +++ |
| 14 |
.../csound/{csound-9999.ebuild => csound-6.16.0.ebuild} | 17 ++++++++--------- |
| 15 |
media-sound/csound/csound-9999.ebuild | 10 +--------- |
| 16 |
3 files changed, 12 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest |
| 19 |
index dbe4c2256bf..4503725bdf0 100644 |
| 20 |
--- a/media-sound/csound/Manifest |
| 21 |
+++ b/media-sound/csound/Manifest |
| 22 |
@@ -1,3 +1,6 @@ |
| 23 |
DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946 |
| 24 |
DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0 |
| 25 |
+DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3 |
| 26 |
+DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490 |
| 27 |
DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308 |
| 28 |
+DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca |
| 29 |
|
| 30 |
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-6.16.0.ebuild |
| 31 |
similarity index 95% |
| 32 |
copy from media-sound/csound/csound-9999.ebuild |
| 33 |
copy to media-sound/csound/csound-6.16.0.ebuild |
| 34 |
index f0b57265999..27e5f4a83d4 100644 |
| 35 |
--- a/media-sound/csound/csound-9999.ebuild |
| 36 |
+++ b/media-sound/csound/csound-6.16.0.ebuild |
| 37 |
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/" |
| 38 |
LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )" |
| 39 |
SLOT="0" |
| 40 |
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples |
| 41 |
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio |
| 42 |
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio |
| 43 |
portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils |
| 44 |
vim-syntax websocket" |
| 45 |
|
| 46 |
@@ -71,7 +71,6 @@ CDEPEND=" |
| 47 |
fluidsynth? ( media-sound/fluidsynth:= ) |
| 48 |
fltk? ( x11-libs/fltk:1[threads?] ) |
| 49 |
hdf5? ( sci-libs/hdf5 ) |
| 50 |
- image? ( media-libs/libpng:0= ) |
| 51 |
jack? ( virtual/jack ) |
| 52 |
java? ( >=virtual/jdk-1.8:* ) |
| 53 |
keyboard? ( x11-libs/fltk:1[threads?] ) |
| 54 |
@@ -119,6 +118,13 @@ src_prepare() { |
| 55 |
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ |
| 56 |
-e '/-O3/d' \ |
| 57 |
-i CMakeLists.txt || die |
| 58 |
+ |
| 59 |
+ if use doc; then |
| 60 |
+ local png="${WORKDIR}/html/images/delayk.png" |
| 61 |
+ pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes |
| 62 |
+ [[ $? -gt 15 ]] && die "Failed to fix ${png}" |
| 63 |
+ mv -f ${png/.png/fixed.png} ${png} || die |
| 64 |
+ fi |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
@@ -133,11 +139,9 @@ src_configure() { |
| 69 |
-DBUILD_DSSI_OPCODES=$(usex dssi) |
| 70 |
-DBUILD_EMUGENS_OPCODES=ON |
| 71 |
-DBUILD_EXCITER_OPCODES=ON |
| 72 |
- -DBUILD_FAUST_OPCODES=OFF |
| 73 |
-DBUILD_FLUID_OPCODES=$(usex fluidsynth) |
| 74 |
-DBUILD_FRAMEBUFFER_OPCODES=ON |
| 75 |
-DBUILD_HDF5_OPCODES=$(usex hdf5) |
| 76 |
- -DBUILD_IMAGE_OPCODES=$(usex image) |
| 77 |
-DBUILD_INSTALLER=OFF |
| 78 |
-DBUILD_JACK_OPCODES=$(usex jack) |
| 79 |
-DBUILD_JAVA_INTERFACE=$(usex java) |
| 80 |
@@ -152,7 +156,6 @@ src_configure() { |
| 81 |
-DBUILD_PLATEREV_OPCODES=ON |
| 82 |
-DBUILD_PVSGENDY_OPCODE=OFF |
| 83 |
-DBUILD_PYTHON_INTERFACE=$(usex python) |
| 84 |
- -DBUILD_PYTHON_OPCODES=$(usex python) |
| 85 |
-DBUILD_RELEASE=ON |
| 86 |
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 |
| 87 |
-DBUILD_SELECT_OPCODE=ON |
| 88 |
@@ -204,10 +207,6 @@ src_configure() { |
| 89 |
# so it must NOT be installed into cmod_dir. |
| 90 |
) |
| 91 |
|
| 92 |
- use python && mycmakeargs+=( |
| 93 |
- -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" |
| 94 |
- ) |
| 95 |
- |
| 96 |
cmake_src_configure |
| 97 |
} |
| 98 |
|
| 99 |
|
| 100 |
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild |
| 101 |
index f0b57265999..f997f81d644 100644 |
| 102 |
--- a/media-sound/csound/csound-9999.ebuild |
| 103 |
+++ b/media-sound/csound/csound-9999.ebuild |
| 104 |
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/" |
| 105 |
LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )" |
| 106 |
SLOT="0" |
| 107 |
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples |
| 108 |
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio |
| 109 |
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio |
| 110 |
portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils |
| 111 |
vim-syntax websocket" |
| 112 |
|
| 113 |
@@ -71,7 +71,6 @@ CDEPEND=" |
| 114 |
fluidsynth? ( media-sound/fluidsynth:= ) |
| 115 |
fltk? ( x11-libs/fltk:1[threads?] ) |
| 116 |
hdf5? ( sci-libs/hdf5 ) |
| 117 |
- image? ( media-libs/libpng:0= ) |
| 118 |
jack? ( virtual/jack ) |
| 119 |
java? ( >=virtual/jdk-1.8:* ) |
| 120 |
keyboard? ( x11-libs/fltk:1[threads?] ) |
| 121 |
@@ -133,11 +132,9 @@ src_configure() { |
| 122 |
-DBUILD_DSSI_OPCODES=$(usex dssi) |
| 123 |
-DBUILD_EMUGENS_OPCODES=ON |
| 124 |
-DBUILD_EXCITER_OPCODES=ON |
| 125 |
- -DBUILD_FAUST_OPCODES=OFF |
| 126 |
-DBUILD_FLUID_OPCODES=$(usex fluidsynth) |
| 127 |
-DBUILD_FRAMEBUFFER_OPCODES=ON |
| 128 |
-DBUILD_HDF5_OPCODES=$(usex hdf5) |
| 129 |
- -DBUILD_IMAGE_OPCODES=$(usex image) |
| 130 |
-DBUILD_INSTALLER=OFF |
| 131 |
-DBUILD_JACK_OPCODES=$(usex jack) |
| 132 |
-DBUILD_JAVA_INTERFACE=$(usex java) |
| 133 |
@@ -152,7 +149,6 @@ src_configure() { |
| 134 |
-DBUILD_PLATEREV_OPCODES=ON |
| 135 |
-DBUILD_PVSGENDY_OPCODE=OFF |
| 136 |
-DBUILD_PYTHON_INTERFACE=$(usex python) |
| 137 |
- -DBUILD_PYTHON_OPCODES=$(usex python) |
| 138 |
-DBUILD_RELEASE=ON |
| 139 |
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 |
| 140 |
-DBUILD_SELECT_OPCODE=ON |
| 141 |
@@ -204,10 +200,6 @@ src_configure() { |
| 142 |
# so it must NOT be installed into cmod_dir. |
| 143 |
) |
| 144 |
|
| 145 |
- use python && mycmakeargs+=( |
| 146 |
- -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" |
| 147 |
- ) |
| 148 |
- |
| 149 |
cmake_src_configure |
| 150 |
} |
Archives