From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-sound/csound/Manifest | 4 +- media-sound/csound/csound-6.15.0-r101.ebuild | 271 +++++++++++++++++++++ media-sound/csound/csound-9999.ebuild | 2 + .../csound/files/csound-6.15.0-fix-soname.patch | 21 ++ 4 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 media-sound/csound/csound-6.15.0-r101.ebuild create mode 100644 media-sound/csound/files/csound-6.15.0-fix-soname.patch (limited to 'media-sound/csound') diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest index e16819218fc7..ecdd2e74a789 100644 --- a/media-sound/csound/Manifest +++ b/media-sound/csound/Manifest @@ -1,9 +1,11 @@ AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a +AUX csound-6.15.0-fix-soname.patch 814 BLAKE2B b288dbb48eff8691ff5a35ca3cb9afff0a7b8213c163055081c46e1c190cebdbab9cd1c9d25763d0ee2ba9d283fa02c7e8a72c09abda127af1c1109e11aaebc5 SHA512 5ca3234911fd59a512047c966ef3478e70df3cd10846ec9f297d4112109563b79f1862ab602a7a1b17a6ddba880cdc240f97ae578889d731d2bf8dcd1f09117b AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946 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 7006 BLAKE2B e04db3e22b004426fe8978a751d81aaac3d25e2930eb1f48e3335801f84afd8a31b7a2f6afe6d63bce836d7e0c1f36ba2164853c6ee92199425c603c5eb9b2d2 SHA512 5312299ffbfc9971c55b479041d5ae2ffdef6138cffcf79e72a7713f1bad11a1ade280118993bd0733770986500c9b03848bdabce9f934e069cd07ad7d2c86ff +EBUILD csound-6.15.0-r101.ebuild 7402 BLAKE2B cb961c72b5876d8894b30fac74ee3bd42b3f023e8b9319be963adb2e1fa0a7bf6fddc820404330f7fa2c1bc59c642814b18c6535b7cf0a9f5fc62513867be28e SHA512 74820618ce311412b7a17b5b842f0b7624d8f5dd410ff07f689c0abcd567475ebbf3ef0f10afd5599189221ce5adf9cee41c27f5d4872aaf3fa8860c93e9b2d3 +EBUILD csound-9999.ebuild 7114 BLAKE2B 881fa5a0828fe1374c706f0a1cbdc02f711512e009c4628a171a5630bd50f2e1a49db924034d7b5a607ecda027417790a9e881b1b62d14f7b1392779c0530a60 SHA512 f02323ac78b0a30a7a0e6048036085ee5a1dfb97b4cc70c99507e55197917c43ffb0367ccd52922eb286b629acda342e499ec5f0a874b5dcb4f1234d17bedae4 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52 diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild new file mode 100644 index 000000000000..6705f7c34293 --- /dev/null +++ b/media-sound/csound/csound-6.15.0-r101.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2021 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_{7,8,9} ) + +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${PV}" + 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 +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 ) +" + +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 ) + 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} ) + 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" + "${FILESDIR}/${PN}-6.15.0-fix-soname.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_FAUST_OPCODES=OFF + -DBUILD_FLUID_OPCODES=$(usex fluidsynth) + -DBUILD_FRAMEBUFFER_OPCODES=ON + -DBUILD_HDF5_OPCODES=$(usex hdf5) + -DBUILD_IMAGE_OPCODES=$(usex image) + -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_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_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. + ) + + use python && mycmakeargs+=( + -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" + ) + + 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/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index cdc5d7cf5933..f0b572659996 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -244,6 +244,8 @@ src_install() { 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 diff --git a/media-sound/csound/files/csound-6.15.0-fix-soname.patch b/media-sound/csound/files/csound-6.15.0-fix-soname.patch new file mode 100644 index 000000000000..7bac87082565 --- /dev/null +++ b/media-sound/csound/files/csound-6.15.0-fix-soname.patch @@ -0,0 +1,21 @@ +From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001 +From: vlazzarini +Date: Tue, 13 Apr 2021 21:04:05 +0100 +Subject: [PATCH] issue #1449 + +--- + interfaces/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt +index d72c4ffdc6..3da25b627a 100644 +--- a/interfaces/CMakeLists.txt ++++ b/interfaces/CMakeLists.txt +@@ -216,6 +216,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE) + ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}) + if(${CMAKE_COMPILER_IS_GNUCC}) + target_compile_options(_jcsound6 PRIVATE "-Wno-error") ++ target_link_options(_jcsound6 PRIVATE "-Wl,-soname,lib_jcsound.so.1") + endif() + + install(TARGETS _jcsound6 -- cgit v1.2.3