* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
@ 2015-11-27 13:07 Sergey Popov
0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2015-11-27 13:07 UTC (permalink / raw
To: gentoo-commits
commit: f6c373eb122810a19b5b38fffba210134da5b748
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 13:05:51 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c373eb
media-sound/csound: fix underlinking on libm
Reported-by: Toralf Förster <toralf.foerster <AT> gmx.de>
Gentoo-Bug: 566064
Package-Manager: portage-2.2.23
media-sound/csound/csound-6.05.0.ebuild | 3 ++
.../csound/files/csound-6.05-underlinking.patch | 53 ++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild
index 02e99b9..1249920 100644
--- a/media-sound/csound/csound-6.05.0.ebuild
+++ b/media-sound/csound/csound-6.05.0.ebuild
@@ -94,6 +94,9 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/csound-6.05-python.patch
+ # bug #566064
+ epatch "${FILESDIR}"/csound-6.05-underlinking.patch
+
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch b/media-sound/csound/files/csound-6.05-underlinking.patch
new file mode 100644
index 0000000..eac83f2
--- /dev/null
+++ b/media-sound/csound/files/csound-6.05-underlinking.patch
@@ -0,0 +1,53 @@
+commit a4b1930b506274e328ee26cd6287965cb496062b
+Author: Steven Yi <stevenyi@gmail.com>
+Date: Mon Sep 28 18:21:22 2015 -0400
+
+ modified make_utility and targets for csound-bin and mixer-bin to use add libm for linking when on Linux [fixes #526]
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b16079..18a6ad1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,6 +97,10 @@ endfunction(make_executable)
+ function(make_utility name srcs)
+ make_executable(${name} "${srcs}" "${CSOUNDLIB}")
+ add_dependencies(${name} ${CSOUNDLIB})
++
++ if(LINUX)
++ target_link_libraries(${name} m)
++ endif()
+ endfunction()
+
+
+diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt
+index d0e3a21..b31f37a 100644
+--- a/frontends/CMakeLists.txt
++++ b/frontends/CMakeLists.txt
+@@ -43,6 +43,9 @@ endfunction(make_plugin_frontend)
+
+ # We need a different name to avoid clashes with float libcsound
+ make_executable(csound-bin "${CS_MAIN_SRCS}" "${CSOUNDLIB}" csound)
++if(LINUX)
++ target_link_libraries(csound-bin m)
++endif()
+
+ message(STATUS "Building csLadspa")
+
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 25089cc..ebf0aa5 100644
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -23,9 +23,11 @@ if(BUILD_UTILITIES)
+ make_utility(hetro het_main.c)
+ make_utility(lpanal lpc_main.c)
+ make_utility(lpc_export lpcx_main.c)
+- target_link_libraries(lpc_export m)
+ make_utility(lpc_import lpci_main.c)
+- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
++ if(LINUX)
++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
++ endif()
++ target_link_libraries(mixer-bin m)
+ make_utility(pvanal pvc_main.c)
+ make_utility(pvlook pvl_main.c)
+ make_utility(pv_export pvx_main.c)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
@ 2017-07-29 11:32 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2017-07-29 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 46793735da631fae7af30b9826c267a666439057
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 11:30:58 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 11:32:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46793735
media-sound/csound: version bump to 6.09.1
Merge csound-manual back in as releases now appear to be coordinated for
both on github.
media-sound/csound/Manifest | 3 ++
.../{csound-9999.ebuild => csound-6.09.1.ebuild} | 41 ++++++++++++++++------
media-sound/csound/csound-9999.ebuild | 39 ++++++++++++++------
.../csound/files/csound-6.09.1-python.patch | 23 ++++++++++++
4 files changed, 86 insertions(+), 20 deletions(-)
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 3a5290e6ef0..e2165ff71ae 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1 +1,4 @@
+DIST Csound6.09.1_manual_html.zip 15537547 SHA256 b2e8ef90e43762c64643c6adddb1e276ac6b496b4fe64fe83e2b8393dbd69100 SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd WHIRLPOOL e5d0091dca95c311af5ecf42482a2693851fda4b38f66d3ccc3d06568a6c548a0410b1d5c444b655cf9a3bc73fbbf7cede896311bf109f30bb907b9ed1b5b744
+DIST Csound6.09.1_manual_pdf.zip 8647957 SHA256 6c4287758791d4cd04c75adfea310d7d34581294d520d4da881a5653f47c9b24 SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b WHIRLPOOL b6460e66a2d043cef9adbd5bef61913f46bafdb3cb55ea107af5903c160e066544bed0011e4d0780d04945c7f585ea8952e48046e14ec74d8fb29cc3e2493050
DIST csound-6.08.0.tar.gz 33948686 SHA256 480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca WHIRLPOOL 987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf
+DIST csound-6.09.1.tar.gz 41969942 SHA256 d49735b4ed50f2818b577abcface45fe7f9b7fb49ccd898db030893cbcdfc738 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454 WHIRLPOOL 31b3bba6ae60760cc70ca8e8234c45dcee1a070ab7a63891acac62218cfd39de3e11d24cb13789b9fb2152cebfa6a6a450a9c5c078531e8b7c5066206ae09079
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-6.09.1.ebuild
similarity index 86%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.09.1.ebuild
index 93c01700dd0..13059c170b0 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -2,31 +2,35 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 )
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git"
inherit git-r3
else
- SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ DOC_P="Csound${PV}"
+ SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? (
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+ )"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="A sound design and signal processing system for composition and performance"
HOMEPAGE="http://csound.github.io/"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
portaudio portmidi pulseaudio python samples score static-libs stk tcl test
+threads +utils vim-syntax websocket"
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -86,9 +90,20 @@ DEPEND="${RDEPEND}
)
"
+if [[ ${PV} != "9999" ]]; then
+ DEPEND+="
+ doc? (
+ app-arch/unzip
+ !app-doc/csound-manual
+ )
+ "
+fi
+
# requires specific alsa settings
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -109,7 +124,7 @@ src_prepare() {
-i CMakeLists.txt || die
local lang
- for lang in ${LANGS} ; do
+ for lang in ${IUSE_LANGS} ; do
if ! use linguas_${lang} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
@@ -175,7 +190,7 @@ src_install() {
cmake-utils_src_install
dodoc -r Release_Notes/.
- # Generate env.d file
+ # generate env.d file
cat > "${T}"/62${PN} <<-_EOF_ || die
OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
CSSTRNGS="${EPREFIX}/usr/share/locale"
@@ -203,6 +218,12 @@ src_install() {
mv "${ED%/}"/usr/bin/{,csound_}extract || die
use python && python_optimize
+
+ # install docs
+ if [[ ${PV} != "9999" ]] && use doc ; then
+ dodoc "${WORKDIR}"/*.pdf
+ dodoc -r "${WORKDIR}"/html
+ fi
}
pkg_postinst() {
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 93c01700dd0..73a1cd39197 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -2,31 +2,35 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 )
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git"
inherit git-r3
else
- SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ DOC_P="Csound${PV}"
+ SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? (
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+ )"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="A sound design and signal processing system for composition and performance"
HOMEPAGE="http://csound.github.io/"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
portaudio portmidi pulseaudio python samples score static-libs stk tcl test
+threads +utils vim-syntax websocket"
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -86,6 +90,15 @@ DEPEND="${RDEPEND}
)
"
+if [[ ${PV} != "9999" ]]; then
+ DEPEND+="
+ doc? (
+ app-arch/unzip
+ !app-doc/csound-manual
+ )
+ "
+fi
+
# requires specific alsa settings
RESTRICT="test"
@@ -109,7 +122,7 @@ src_prepare() {
-i CMakeLists.txt || die
local lang
- for lang in ${LANGS} ; do
+ for lang in ${IUSE_LANGS} ; do
if ! use linguas_${lang} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
@@ -175,7 +188,7 @@ src_install() {
cmake-utils_src_install
dodoc -r Release_Notes/.
- # Generate env.d file
+ # generate env.d file
cat > "${T}"/62${PN} <<-_EOF_ || die
OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
CSSTRNGS="${EPREFIX}/usr/share/locale"
@@ -203,6 +216,12 @@ src_install() {
mv "${ED%/}"/usr/bin/{,csound_}extract || die
use python && python_optimize
+
+ # install docs
+ if [[ ${PV} != "9999" ]] && use doc ; then
+ dodoc "${WORKDIR}"/*.pdf
+ dodoc -r "${WORKDIR}"/html
+ fi
}
pkg_postinst() {
diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
new file mode 100644
index 00000000000..47461e48aaf
--- /dev/null
+++ b/media-sound/csound/files/csound-6.09.1-python.patch
@@ -0,0 +1,23 @@
+Respect externally set PYTHON_MODULE_INSTALL_DIR.
+
+--- csound-6.09.1/CMakeLists.txt
++++ csound-6.09.1/CMakeLists.txt
+@@ -218,11 +218,13 @@
+ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ endif()
+
+-execute_process (
+- COMMAND python -c
+- "import site, sys; sys.stdout.write(site.getusersitepackages())"
+- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
+- )
++if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
++ execute_process (
++ COMMAND python -c
++ "import site, sys; sys.stdout.write(site.getusersitepackages())"
++ OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
++ )
++endif()
+
+ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+ set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
@ 2019-12-15 19:47 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2019-12-15 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 4201cebc1ec69ededd2db6043e201afc8ae38acc
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 19:45:30 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 19:47:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4201cebc
media-sound/csound-9999: some improvements
1) added info about repackaging due to license issue
2) added patch from OpenSUSE to support xdg-open
3) added script for repackaging csound for redistribution
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/csound/csound-9999.ebuild | 8 +++++
.../csound/files/csound-6.13.0-xdg-open.patch | 24 +++++++++++++++
media-sound/csound/files/repackage.sh | 35 ++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index bf5bdabf976..04aea31ab2b 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
@@ -97,6 +101,10 @@ fi
# requires specific alsa settings
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}/csound-6.13.0-xdg-open.patch"
+)
+
pkg_setup() {
if use python || use test ; then
python-single-r1_pkg_setup
diff --git a/media-sound/csound/files/csound-6.13.0-xdg-open.patch b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
new file mode 100644
index 00000000000..19d428fabf3
--- /dev/null
+++ b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
@@ -0,0 +1,24 @@
+Source: https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/csound-6.08-xdg-open.patch
+Index: csound-6.12.2/installer/misc/vim/cshelp
+===================================================================
+--- csound-6.12.2.orig/installer/misc/vim/cshelp 2018-11-07 16:05:23.000000000 +0200
++++ csound-6.12.2/installer/misc/vim/cshelp 2019-04-05 15:32:23.670308342 +0200
+@@ -3,7 +3,9 @@
+ BROWSER_CMD=""
+
+ if [ "${DISPLAY}" != "" ] ; then
+- if ( which links | grep -q -G -e "^/usr" ) ; then
++ if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then
++ BROWSER_CMD="xdg-open" ;
++ elif ( which links | grep -q -G -e "^/usr" ) ; then
+ BROWSER_CMD="links -g" ;
+ elif ( which konqueror | grep -q -G -e "^/opt" ) ; then
+ BROWSER_CMD="konqueror" ;
+@@ -38,5 +40,5 @@ else
+ OPNAME="${1}" ;
+ fi
+
+-exec ${BROWSER_CMD} "/usr/local/share/doc/csound/manual/${OPNAME}.html"
++exec ${BROWSER_CMD} "/usr/share/doc/csound-manual/${OPNAME}.html"
+
+
diff --git a/media-sound/csound/files/repackage.sh b/media-sound/csound/files/repackage.sh
new file mode 100644
index 00000000000..39b8068b930
--- /dev/null
+++ b/media-sound/csound/files/repackage.sh
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+# Adjusted from OpenSUSE script
+# Source: https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/pre_checkin.sh
+
+VERSION="${1}"
+
+if [[ -z "${VERSION}" ]]; then
+ echo "Version must be specified"
+ exit 1
+fi
+
+rm -f *.tar.*
+
+wget https://github.com/csound/csound/archive/${VERSION}.tar.gz || exit 1
+
+echo -e "\n\nUnpacking tarball\n"
+tar -xf ${VERSION}.tar.gz
+
+echo -e "Removing undistibutable files\n"
+rm -f csound-${VERSION}/Opcodes/scansyn*
+
+echo -e "Creating distributable tarball\n"
+tar -acf csound-${VERSION}-distibutable.tar.xz csound-${VERSION}
+
+echo -e "Cleaning up\n"
+rm -rf csound-${VERSION} ${VERSION}.tar.gz
+
+if ! test -e ${VERSION}.tar.gz; then
+ echo "success"
+ exit 0
+else
+ echo "error"
+ exit 1
+fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
@ 2022-08-02 4:40 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-08-02 4:40 UTC (permalink / raw
To: gentoo-commits
commit: 19d844a950eb0e03065dd04fa5052730032c2629
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 04:40:31 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 04:40:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d844a9
media-sound/csound: dropped obsolete 6.16.2
Bug: https://bugs.gentoo.org/862618
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/csound/Manifest | 3 -
media-sound/csound/csound-6.16.2.ebuild | 262 ----------------------
media-sound/csound/files/csound-6.15.0-lame.patch | 26 ---
media-sound/csound/metadata.xml | 6 -
4 files changed, 297 deletions(-)
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 8b3eb36dbfbb..9eb23bde8e3e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-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 Csound6.17.0_manual_html.zip 25897263 BLAKE2B 3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e SHA512 ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9 SHA512 bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
-DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
diff --git a/media-sound/csound/csound-6.16.2.ebuild b/media-sound/csound/csound-6.16.2.ebuild
deleted file mode 100644
index 6f59d02107af..000000000000
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/csound/csound.git"
- inherit git-r3
-else
- DOC_P="Csound$(ver_cut 1-2).0"
- SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
- doc? (
- https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
- https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
- )"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-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 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 )
-"
-
-BDEPEND="
- sys-devel/flex
- virtual/yacc
- chua? ( dev-libs/boost )
- lua? ( dev-lang/swig )
- python? ( dev-lang/swig )
- nls? ( sys-devel/gettext )
- test? (
- dev-util/cunit
- ${PYTHON_DEPS}
- )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-# https://github.com/csound/csound/issues/920
-CDEPEND="
- dev-cpp/eigen:3
- >=media-libs/libsndfile-1.0.16
- media-libs/libsamplerate
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- curl? ( net-misc/curl )
- dssi? (
- media-libs/dssi
- media-libs/ladspa-sdk
- )
- fluidsynth? ( media-sound/fluidsynth:= )
- fltk? ( x11-libs/fltk:1[threads?] )
- hdf5? ( sci-libs/hdf5 )
- jack? ( virtual/jack )
- java? ( >=virtual/jdk-1.8:* )
- keyboard? ( x11-libs/fltk:1[threads?] )
- linear? ( =sci-mathematics/gmm-5.1* )
- lua? ( ${LUA_DEPS} )
- mp3? ( >=media-sound/lame-3.100-r3 )
- osc? ( media-libs/liblo )
- portaudio? ( media-libs/portaudio )
- portmidi? ( media-libs/portmidi )
- pulseaudio? ( media-sound/pulseaudio )
- python? ( ${PYTHON_DEPS} )
- stk? ( media-libs/stk )
- utils? ( !media-sound/snd )
- websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
- ${CDEPEND}
- dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
- DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
- "${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- if use python || use test ; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake_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() {
- local mycmakeargs=(
- -DBUILD_BELA=OFF
- -DBUILD_BUCHLA_OPCODES=ON
- -DBUILD_CHUA_OPCODES=$(usex chua)
- -DBUILD_COUNTER_OPCODES=ON
- -DBUILD_CSBEATS=$(usex beats)
- -DBUILD_CUDA_OPCODES=OFF
- -DBUILD_CXX_INTERFACE=$(usex cxx)
- -DBUILD_DSSI_OPCODES=$(usex dssi)
- -DBUILD_EMUGENS_OPCODES=ON
- -DBUILD_EXCITER_OPCODES=ON
- -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
- -DBUILD_FRAMEBUFFER_OPCODES=ON
- -DBUILD_HDF5_OPCODES=$(usex hdf5)
- -DBUILD_INSTALLER=OFF
- -DBUILD_JACK_OPCODES=$(usex jack)
- -DBUILD_JAVA_INTERFACE=$(usex java)
- -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
- -DBUILD_LUA_INTERFACE=$(usex lua)
- -DBUILD_MP3OUT_OPCODE=$(usex mp3)
- -DBUILD_MULTI_CORE=$(usex threads)
- -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_PYTHON_INTERFACE=$(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_SHARED_LIBS=ON
- -DBUILD_STACK_OPCODES=ON
- -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(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_WEBSOCKET_OPCODE=$(usex websocket)
- -DBUILD_WIIMOTE_OPCODES=OFF
- -DBUILD_WINSOUND=OFF
-
- -DFAIL_MISSING=ON
- -DNEW_PARSER_DEBUG=$(usex debug)
- -DREQUIRE_PTHREADS=$(usex threads)
-
- -DUSE_ALSA=$(usex alsa)
- -DUSE_ATOMIC_BUILTIN=ON
- -DUSE_AUDIOUNIT=OFF # Apple specific
- -DUSE_COMPILER_OPTIMIZATIONS=ON
- -DUSE_COREMIDI=OFF # Apple specific
- -DUSE_CURL=$(usex curl)
- -DUSE_DOUBLE=$(usex double-precision)
- -DUSE_FLTK=$(usex fltk)
- -DUSE_GETTEXT=$(usex nls)
- -DUSE_GIT_COMMIT=ON
- -DUSE_IPMIDI=ON
- -DUSE_JACK=$(usex jack)
- -DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
- -DUSE_LRINT=ON
- -DUSE_PORTAUDIO=$(usex portaudio)
- -DUSE_PORTMIDI=$(usex portmidi)
- -DUSE_PULSEAUDIO=$(usex pulseaudio)
-
- )
-
- use java && mycmakeargs+=(
- -DJAVA_HOME="$(java-config -g JAVA_HOME)"
- )
-
- use lua && mycmakeargs+=(
- -DLUA_H_PATH="$(lua_get_include_dir)"
- -DLUA_LIBRARY="$(lua_get_shared_lib)"
- # LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
- # so it must NOT be installed into cmod_dir.
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- dodoc -r Release_Notes/.
-
- # generate env.d file
- cat > "${T}"/62${PN} <<-_EOF_ || die
- OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
- CSSTRNGS="${EPREFIX}/usr/share/locale"
- _EOF_
- if use stk ; then
- echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
- fi
- doenvd "${T}"/62${PN}
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- use samples && dodoc -r samples
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins installer/misc/vim/csound_{csd,orc,sco}.vim
- insinto /usr/share/vim/vimfiles/plugin
- doins installer/misc/vim/csound.vim
- fi
-
- # rename extract to csound_extract (bug #247394)
- mv "${ED}"/usr/bin/{,csound_}extract || die
-
- use python && python_optimize
-
- use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
-
- # install docs
- if [[ ${PV} != "9999" ]] && use doc ; then
- dodoc "${WORKDIR}"/*.pdf
- dodoc -r "${WORKDIR}"/html
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog
- elog "The extract tool is now installed as csound_extract"
- elog "due to collisions with many other packages (bug #247394)."
- elog
- fi
-}
diff --git a/media-sound/csound/files/csound-6.15.0-lame.patch b/media-sound/csound/files/csound-6.15.0-lame.patch
deleted file mode 100644
index 800ec4fd0f46..000000000000
--- a/media-sound/csound/files/csound-6.15.0-lame.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index af39138..ec48294 100644
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -41,7 +41,7 @@ check_include_file(wiiuse.h WIIUSE_H)
- find_library(WIIUSE_LIB wiiuse)
- check_include_file(p5glove.h P5GLOVE_H)
- find_library(P5GLOVE_LIB p5glove)
--check_include_file(lame.h LAME_HEADER)
-+check_include_file(lame/lame.h LAME_HEADER)
- find_library(LAME_LIB mp3lame)
-
- ## OPCODE LIBS WITH NO EXTERNAL DEPENDENCIES ##
-diff --git a/Opcodes/lame.c b/Opcodes/lame.c
-index a951f47..0c1c3e6 100644
---- a/Opcodes/lame.c
-+++ b/Opcodes/lame.c
-@@ -22,7 +22,7 @@
- */
-
- #include "csdl.h"
--#include "lame.h"
-+#include "lame/lame.h"
-
- typedef struct _mp3out {
- OPDS h;
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index cf179bf2427f..1ef132084374 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -7,17 +7,11 @@
</maintainer>
<use>
<flag name="beats">Build the beats score frontend</flag>
- <flag name="chua">Build the chua opcodes</flag>
<flag name="double-precision">Use double-precision floating point for audio samples</flag>
<flag name="dssi">Build the DSSI opcodes</flag>
- <flag name="fluidsynth">Build the fluidsynth opcodes</flag>
- <flag name="keyboard">Build Virtual MIDI keyboard</flag>
- <flag name="linear">Build the linear algebra Opcodes</flag>
<flag name="portmidi">Build the PortMIDI I/O module</flag>
<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
- <flag name="stk">Build the stk opcodes</flag>
<flag name="utils">Build stand-alone executables for utilities that can also be used via `csound -U`</flag>
- <flag name="websocket">Build the websocket opcode</flag>
</use>
<upstream>
<remote-id type="sourceforge">csound</remote-id>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-02 4:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-02 4:40 [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2019-12-15 19:47 Miroslav Šulc
2017-07-29 11:32 Tim Harder
2015-11-27 13:07 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox