[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
commit: 19d844a950eb0e03065dd04fa5052730032c2629
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Aug 2 04:40:31 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Aug 2 04:40:47 2022 +
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 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..
--- 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} == "" ]]; 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
[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
commit: 4201cebc1ec69ededd2db6043e201afc8ae38acc
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Dec 15 19:45:30 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Dec 15 19:47:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4201cebc
media-sound/csound-: 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 gentoo.org>
media-sound/csound/csound-.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-.ebuild
b/media-sound/csound/csound-.ebuild
index bf5bdabf976..04aea31ab2b 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.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 000..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.0 +0200
csound-6.12.2/installer/misc/vim/cshelp2019-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 000..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
[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
commit: 46793735da631fae7af30b9826c267a666439057
Author: Tim Harder gentoo org>
AuthorDate: Sat Jul 29 11:30:58 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Jul 29 11:32:25 2017 +
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-.ebuild => csound-6.09.1.ebuild} | 41 --
media-sound/csound/csound-.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-.ebuild
b/media-sound/csound/csound-6.09.1.ebuild
similarity index 86%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.09.1.ebuild
index 93c01700dd0..13059c170b0 100644
--- a/media-sound/csound/csound-.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} == * ]]; then
+if [[ ${PV} == "" ]]; 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} != "" ]]; 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
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/
commit: f6c373eb122810a19b5b38fffba210134da5b748
Author: Sergey Popov gentoo org>
AuthorDate: Fri Nov 27 13:05:51 2015 +
Commit: Sergey Popov gentoo org>
CommitDate: Fri Nov 27 13:05:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c373eb
media-sound/csound: fix underlinking on libm
Reported-by: Toralf Förster 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 000..eac83f2
--- /dev/null
+++ b/media-sound/csound/files/csound-6.05-underlinking.patch
@@ -0,0 +1,53 @@
+commit a4b1930b506274e328ee26cd6287965cb496062b
+Author: Steven Yi
+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)
