From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1131383-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AECC1138334
for <garchives@archives.gentoo.org>; Mon, 16 Dec 2019 10:49:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E508AE07FA;
Mon, 16 Dec 2019 10:49:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B7307E07FA
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Dec 2019 10:49:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 80D9034D786
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Dec 2019 10:49:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AB8D38D7
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Dec 2019 10:49:27 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1576493357.5774c968ebbb210686b29e27e1d87239955e6165.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/csound/csound-6.13.0.ebuild media-sound/csound/csound-9999.ebuild
X-VCS-Directories: media-sound/csound/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 5774c968ebbb210686b29e27e1d87239955e6165
X-VCS-Branch: master
Date: Mon, 16 Dec 2019 10:49:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 312a9d41-0d90-4dcf-8503-c45bc8340869
X-Archives-Hash: 08ea88b5f0515877e4b1ff4c112f7599
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