commit: 85099f7fd4924a0441cb67fd988115aa951dbdc9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 13:51:17 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 13:51:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85099f7f
media-sound/csound: enabled [java] in 6.15.0-r101 + fixed symlink
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...csound-9999.ebuild => csound-6.15.0-r101.ebuild} | 10 ++++++++++
media-sound/csound/csound-9999.ebuild | 2 ++
.../csound/files/csound-6.15.0-fix-soname.patch | 21 +++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/media-sound/csound/csound-9999.ebuild
b/media-sound/csound/csound-6.15.0-r101.ebuild
similarity index 94%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.15.0-r101.ebuild
index cdc5d7cf593..6705f7c3429 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -103,6 +103,7 @@ 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() {
@@ -119,6 +120,13 @@ 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() {
@@ -244,6 +252,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/csound-9999.ebuild
b/media-sound/csound/csound-9999.ebuild
index cdc5d7cf593..f0b57265999 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 00000000000..7bac8708256
--- /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 <[email protected]>
+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
