From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 ADB4C1382C5 for ; Wed, 14 Apr 2021 13:51:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCAE1E0B21; Wed, 14 Apr 2021 13:51:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5D34AE0B21 for ; Wed, 14 Apr 2021 13:51:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B092D340D11 for ; Wed, 14 Apr 2021 13:51:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE9FA649 for ; Wed, 14 Apr 2021 13:51:37 +0000 (UTC) From: "Miroslav Šulc" 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" Message-ID: <1618408292.85099f7fd4924a0441cb67fd988115aa951dbdc9.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/csound/csound-6.15.0-r101.ebuild media-sound/csound/csound-9999.ebuild media-sound/csound/files/csound-6.15.0-fix-soname.patch X-VCS-Directories: media-sound/csound/files/ media-sound/csound/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 85099f7fd4924a0441cb67fd988115aa951dbdc9 X-VCS-Branch: master Date: Wed, 14 Apr 2021 13:51:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f549845-fdd0-408d-851d-5815d9dd8e01 X-Archives-Hash: b23faa75a9b7e0800ae9397117c0fdea commit: 85099f7fd4924a0441cb67fd988115aa951dbdc9 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Apr 14 13:51:17 2021 +0000 Commit: Miroslav Šulc gentoo 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 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 +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