From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/
Date: Mon, 16 Dec 2019 10:49:27 +0000 (UTC) [thread overview]
Message-ID: <1576493357.5774c968ebbb210686b29e27e1d87239955e6165.fordfrog@gentoo> (raw)
commit: 5774c968ebbb210686b29e27e1d87239955e6165
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 10:48:44 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 10:49:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5774c968
media-sound/csound-{6.13.0,9999}: fixes
1) added hdf5 use flag and related dependency (bug #703072)
2) enabled most of the cmake flags to catch other possible issues
3) fixed configuring lua library when -luajit (bug #703078)
pkg-config --variable=libname returns empty string so in that
case using default libname
4) 6.13.0 - removed BUILD_MP3OUT_OPCODE as that was introduced later
Closes: https://bugs.gentoo.org/703072
Closes: https://bugs.gentoo.org/703078
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/csound/csound-6.13.0.ebuild | 50 ++++++++++++++++++---------------
media-sound/csound/csound-9999.ebuild | 49 +++++++++++++++++---------------
2 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/media-sound/csound/csound-6.13.0.ebuild b/media-sound/csound/csound-6.13.0.ebuild
index fc723946ca3..bee79ef4877 100644
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -31,7 +31,7 @@ SLOT="0"
# java doesn't work atm as it needs to have some variables specified to work, see src_configure
# mp3 doesnt work as media-sound/lame does not install cmake file
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
vim-syntax websocket"
@@ -71,6 +71,7 @@ CDEPEND="
)
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
+ hdf5? ( sci-libs/hdf5 )
image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -121,47 +122,46 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- #-DBUILD_BELA=OFF
- #-DBUILD_BUCHLA_OPCODES=ON
+ -DBUILD_BELA=OFF
+ -DBUILD_BUCHLA_OPCODES=ON
-DBUILD_CHUA_OPCODES=$(usex chua)
-DBUILD_CSBEATS=$(usex beats)
- #-DBUILD_CUDA_OPCODES=OFF
+ -DBUILD_CUDA_OPCODES=OFF
-DBUILD_CXX_INTERFACE=$(usex cxx)
-DBUILD_DSSI_OPCODES=$(usex dssi)
- #-DBUILD_EMUGENS_OPCODES=ON
- #-DBUILD_EXCITER_OPCODES=ON
+ -DBUILD_EMUGENS_OPCODES=ON
+ -DBUILD_EXCITER_OPCODES=ON
-DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
- #-DBUILD_FRAMEBUFFER_OPCODES=ON
- #-DBUILD_HDF5_OPCODES=ON
+ -DBUILD_FRAMEBUFFER_OPCODES=ON
+ -DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=OFF
-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-DBUILD_LUA_INTERFACE=$(usex lua)
- -DBUILD_MP3OUT_OPCODE=OFF
-DBUILD_MULTI_CORE=$(usex threads)
- #-DBUULD_OPENCL_OPCODES=OFF
+ -DBUILD_OPENCL_OPCODES=OFF
-DBUILD_OSC_OPCODES=$(usex osc)
-DBUILD_P5GLOVE_OPCODES=OFF
- #-DBUILD_PADSYNTH_OPCODES=ON
- #-DBUILD_PLATEREV_OPCODES=ON
- #-DBUILD_PVSGENDY_OPCODE=OFF
+ -DBUILD_PADSYNTH_OPCODES=ON
+ -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
- #-DBUILD_SERIAL_OPCODES=ON
+ -DBUILD_SELECT_OPCODE=ON
+ -DBUILD_SERIAL_OPCODES=ON
-DBUILD_SHARED_LIBS=ON
- #-DBUILD_STACK_OPCODES=ON
+ -DBUILD_STACK_OPCODES=ON
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STATIC_LIBRARY=$(usex test)
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_UTILITIES=$(usex utils)
-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
- #-DBUILD_VST4CS_OPCODES=OFF
+ -DBUILD_VST4CS_OPCODES=OFF
-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-DBUILD_WIIMOTE_OPCODES=OFF
-DBUILD_WINSOUND=OFF
@@ -180,8 +180,8 @@ src_configure() {
-DUSE_FLTK=$(usex fltk)
-DUSE_GETTEXT=$(usex nls)
-DUSE_GIT_COMMIT=ON
- #_DUSE_IPMIDI=ON
- #-DUSE_LRINT=ON
+ _DUSE_IPMIDI=ON
+ -DUSE_LRINT=ON
-DUSE_JACK=$(usex jack)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PORTMIDI=$(usex portmidi)
@@ -199,16 +199,20 @@ src_configure() {
# set the library that we want to use
if use lua ; then
- local package
+ local libdir
+ local libname
if use luajit ; then
- package="luajit"
+ libdir=$(pkg-config --variable=libdir luajit)
+ libname=$(pkg-config --variable=libname luajit)
else
- package="lua"
+ libdir=$(pkg-config --variable=libdir lua)
+ libname=$(pkg-config --variable=libname lua)
+ [[ -z "${libname}" ]] && libname="lua"
fi
mycmakeargs+=(
- -DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so"
+ -DLUA_LIBRARY="${libdir}/lib${libname}.so"
)
fi
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 84567ca2d8d..d6e3677445f 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -31,7 +31,7 @@ SLOT="0"
# java doesn't work atm as it needs to have some variables specified to work, see src_configure
# mp3 doesnt work as media-sound/lame does not install cmake file
IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
vim-syntax websocket"
@@ -71,6 +71,7 @@ CDEPEND="
)
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
+ hdf5? ( sci-libs/hdf5 )
image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -121,19 +122,19 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- #-DBUILD_BELA=OFF
- #-DBUILD_BUCHLA_OPCODES=ON
+ -DBUILD_BELA=OFF
+ -DBUILD_BUCHLA_OPCODES=ON
-DBUILD_CHUA_OPCODES=$(usex chua)
-DBUILD_CSBEATS=$(usex beats)
- #-DBUILD_CUDA_OPCODES=OFF
+ -DBUILD_CUDA_OPCODES=OFF
-DBUILD_CXX_INTERFACE=$(usex cxx)
-DBUILD_DSSI_OPCODES=$(usex dssi)
- #-DBUILD_EMUGENS_OPCODES=ON
- #-DBUILD_EXCITER_OPCODES=ON
+ -DBUILD_EMUGENS_OPCODES=ON
+ -DBUILD_EXCITER_OPCODES=ON
-DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
- #-DBUILD_FRAMEBUFFER_OPCODES=ON
- #-DBUILD_HDF5_OPCODES=ON
+ -DBUILD_FRAMEBUFFER_OPCODES=ON
+ -DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=OFF
@@ -141,27 +142,27 @@ src_configure() {
-DBUILD_LUA_INTERFACE=$(usex lua)
-DBUILD_MP3OUT_OPCODE=OFF
-DBUILD_MULTI_CORE=$(usex threads)
- #-DBUULD_OPENCL_OPCODES=OFF
+ -DBUILD_OPENCL_OPCODES=OFF
-DBUILD_OSC_OPCODES=$(usex osc)
-DBUILD_P5GLOVE_OPCODES=OFF
- #-DBUILD_PADSYNTH_OPCODES=ON
- #-DBUILD_PLATEREV_OPCODES=ON
- #-DBUILD_PVSGENDY_OPCODE=OFF
+ -DBUILD_PADSYNTH_OPCODES=ON
+ -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
- #-DBUILD_SERIAL_OPCODES=ON
+ -DBUILD_SELECT_OPCODE=ON
+ -DBUILD_SERIAL_OPCODES=ON
-DBUILD_SHARED_LIBS=ON
- #-DBUILD_STACK_OPCODES=ON
+ -DBUILD_STACK_OPCODES=ON
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STATIC_LIBRARY=$(usex test)
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_UTILITIES=$(usex utils)
-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
- #-DBUILD_VST4CS_OPCODES=OFF
+ -DBUILD_VST4CS_OPCODES=OFF
-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-DBUILD_WIIMOTE_OPCODES=OFF
-DBUILD_WINSOUND=OFF
@@ -180,8 +181,8 @@ src_configure() {
-DUSE_FLTK=$(usex fltk)
-DUSE_GETTEXT=$(usex nls)
-DUSE_GIT_COMMIT=ON
- #_DUSE_IPMIDI=ON
- #-DUSE_LRINT=ON
+ _DUSE_IPMIDI=ON
+ -DUSE_LRINT=ON
-DUSE_JACK=$(usex jack)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PORTMIDI=$(usex portmidi)
@@ -199,16 +200,20 @@ src_configure() {
# set the library that we want to use
if use lua ; then
- local package
+ local libdir
+ local libname
if use luajit ; then
- package="luajit"
+ libdir=$(pkg-config --variable=libdir luajit)
+ libname=$(pkg-config --variable=libname luajit)
else
- package="lua"
+ libdir=$(pkg-config --variable=libdir lua)
+ libname=$(pkg-config --variable=libname lua)
+ [[ -z "${libname}" ]] && libname="lua"
fi
mycmakeargs+=(
- -DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so"
+ -DLUA_LIBRARY="${libdir}/lib${libname}.so"
)
fi
next reply other threads:[~2019-12-16 10:49 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 10:49 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-12 4:22 [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/ Eli Schwartz
2024-08-12 4:22 Eli Schwartz
2024-07-30 9:18 Pacho Ramos
2024-07-30 9:18 Pacho Ramos
2024-07-30 9:18 Pacho Ramos
2024-01-20 21:22 Conrad Kostecki
2023-06-19 6:47 Miroslav Šulc
2023-05-29 13:11 Andreas Sturmlechner
2022-08-01 22:12 Sam James
2022-08-01 8:01 Agostino Sarubbo
2022-07-17 3:39 Miroslav Šulc
2022-07-01 9:38 Miroslav Šulc
2022-07-01 9:38 Miroslav Šulc
2021-10-28 19:56 Miroslav Šulc
2021-08-18 12:58 Agostino Sarubbo
2021-08-18 12:46 Agostino Sarubbo
2021-08-01 23:49 Sam James
2021-07-18 7:04 Miroslav Šulc
2021-07-15 7:42 Agostino Sarubbo
2021-07-15 7:38 Agostino Sarubbo
2021-06-30 11:44 Miroslav Šulc
2021-06-13 8:01 Miroslav Šulc
2021-05-16 6:41 Miroslav Šulc
2021-05-15 17:56 Sam James
2021-05-15 17:55 Sam James
2021-03-12 15:59 Miroslav Šulc
2021-02-13 18:09 Miroslav Šulc
2021-02-13 18:09 Miroslav Šulc
2020-09-18 10:04 Miroslav Šulc
2020-09-18 8:26 Agostino Sarubbo
2020-09-18 7:29 Agostino Sarubbo
2020-08-11 14:23 Agostino Sarubbo
2020-08-10 13:09 Agostino Sarubbo
2020-07-08 8:02 Miroslav Šulc
2020-02-08 0:43 Miroslav Šulc
2019-12-23 22:11 Andreas Sturmlechner
2019-12-15 19:47 Miroslav Šulc
2019-12-15 17:39 Miroslav Šulc
2019-12-15 15:54 Miroslav Šulc
2019-12-15 14:09 Miroslav Šulc
2019-08-01 21:36 Andreas Sturmlechner
2019-03-10 22:46 Andreas Sturmlechner
2018-10-04 19:14 Andreas Sturmlechner
2018-02-13 21:28 Tim Harder
2018-01-06 15:29 Ulrich Müller
2017-08-31 13:21 Tim Harder
2017-08-04 0:43 Tim Harder
2017-06-03 20:52 David Seifert
2017-04-23 11:29 David Seifert
2016-12-10 20:48 Tim Harder
2016-12-08 5:16 Tim Harder
2016-08-07 9:10 Tim Harder
2016-04-02 16:49 Tim Harder
2015-11-27 13:07 Sergey Popov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1576493357.5774c968ebbb210686b29e27e1d87239955e6165.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox