diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /media-sound/csound | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'media-sound/csound')
-rw-r--r-- | media-sound/csound/Manifest | 2 | ||||
-rw-r--r-- | media-sound/csound/csound-9999.ebuild | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest index 6fabdad942f1..e16819218fc7 100644 --- a/media-sound/csound/Manifest +++ b/media-sound/csound/Manifest @@ -5,5 +5,5 @@ DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803b DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308 EBUILD csound-6.15.0-r100.ebuild 7242 BLAKE2B 1bd143e32a403c31a56a60418a081494538ffe642ec17674ecac1f0f9bc88bf21152a1c37e2072cbe658b0e7797e9d4bc2c7ed07c40b69b2b10b9345543cafcd SHA512 fc4835b16a97ba2a78666389361322cfb8b494fd6b992824a6a5e7ca6450ce9ea0a3d56c4460c29831b574689e67eacb5c070dd07667cc180faeddf9aabf2eb9 -EBUILD csound-9999.ebuild 7244 BLAKE2B 0166d4d0ebba238eb91f286970bae7630cd9c4c6fa232620fdbc1f832ab1ffb7f3e39a1b3e6f819cf4c933a7201bbe0188453a3e681d94834bdb67eaa03f8810 SHA512 1f2551193a6947be3cec77452e60db47349c35b4ccc6763925e181f5ac8e9b20f71abd37aadab358909206f8ecd8eb880d982fdbf945916aef07ccf2180d6d41 +EBUILD csound-9999.ebuild 7006 BLAKE2B e04db3e22b004426fe8978a751d81aaac3d25e2930eb1f48e3335801f84afd8a31b7a2f6afe6d63bce836d7e0c1f36ba2164853c6ee92199425c603c5eb9b2d2 SHA512 5312299ffbfc9971c55b479041d5ae2ffdef6138cffcf79e72a7713f1bad11a1ade280118993bd0733770986500c9b03848bdabce9f934e069cd07ad7d2c86ff MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52 diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index bb0ad26e45fb..cdc5d7cf5933 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -30,19 +30,18 @@ HOMEPAGE="https://csound.github.io/" LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )" SLOT="0" -# java doesn't work atm as it needs to have some variables specified to work, see src_configure IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples -fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio +fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" REQUIRED_USE=" alsa? ( threads ) + java? ( cxx ) linear? ( double-precision ) lua? ( ${LUA_REQUIRED_USE} cxx ) python? ( ${PYTHON_REQUIRED_USE} cxx ) " -# java? ( cxx ) BDEPEND=" sys-devel/flex @@ -58,8 +57,6 @@ BDEPEND=" " # linear currently works only with sci-mathematics-gmm-5.1 # https://github.com/csound/csound/issues/920 -# currently not used deps due to some issues -# java? ( virtual/jdk:* ) CDEPEND=" dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 @@ -76,6 +73,7 @@ CDEPEND=" hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) + java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( ${LUA_DEPS} ) @@ -142,7 +140,7 @@ src_configure() { -DBUILD_IMAGE_OPCODES=$(usex image) -DBUILD_INSTALLER=OFF -DBUILD_JACK_OPCODES=$(usex jack) - -DBUILD_JAVA_INTERFACE=OFF + -DBUILD_JAVA_INTERFACE=$(usex java) -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear) -DBUILD_LUA_INTERFACE=$(usex lua) -DBUILD_MP3OUT_OPCODE=$(usex mp3) @@ -195,13 +193,9 @@ src_configure() { ) - #use java && mycmakeargs+=( - #-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include" - #-DJAVA_AWT_LIBRARY="?" - #-DJAVA_JVM_LIBRARY="?" - #-DJAVA_INCLUDE_PATH2="?" - #-DJAVA_AWT_INCLUDE_PATH="?" - #) + use java && mycmakeargs+=( + -DJAVA_HOME="$(java-config -g JAVA_HOME)" + ) use lua && mycmakeargs+=( -DLUA_H_PATH="$(lua_get_include_dir)" |