commit: 5744da87a6bf1f417179b0cd36bf647850b071a5
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 20:15:42 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 20:15:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5744da87
media-sound/csound-{6.13.0,9999}: bump + more fixes
1) bumped to 6.13.0
2) updated SRC_URI to repackaged csound
3) 9999 - replaced package name in patch name with variable
4) disabled Apple specific cmake flags
5) fixed typo in files/repackage.sh
Closes: https://bugs.gentoo.org/700298
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/csound/Manifest | 3 +++
media-sound/csound/{csound-9999.ebuild => csound-6.13.0.ebuild} | 8 ++++----
media-sound/csound/csound-9999.ebuild | 8 ++++----
media-sound/csound/files/repackage.sh | 2 +-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 1fd37912a56..3a3c34187d4 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B
dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab
SHA512
f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B
ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c
SHA512
cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
+DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B
4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab
SHA512
87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
+DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B
f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82
SHA512
30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
DIST csound-6.10.0.tar.gz 42036496 BLAKE2B
4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697
SHA512
1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
+DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B
efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566
SHA512
b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
diff --git a/media-sound/csound/csound-9999.ebuild
b/media-sound/csound/csound-6.13.0.ebuild
similarity index 97%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.13.0.ebuild
index 04aea31ab2b..fc723946ca3 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
DOC_P="Csound${PV}"
- SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz ->
${P}.tar.gz
+
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
@@ -102,7 +102,7 @@ fi
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/csound-6.13.0-xdg-open.patch"
+ "${FILESDIR}/${P}-xdg-open.patch"
)
pkg_setup() {
@@ -172,9 +172,9 @@ src_configure() {
-DUSE_ALSA=$(usex alsa)
#-DUSE_ATOMIC_BUILTIN=ON
- #-DUSE_AUDIOUNIT=ON
+ -DUSE_AUDIOUNIT=OFF # Apple specific
#-DUSE_COMPILER_OPTIMIZATIONS=ON
- #-DUSE_COREMIDI=ON
+ -DUSE_COREMIDI=OFF # Apple specific
-DUSE_CURL=$(usex curl)
-DUSE_DOUBLE=$(usex double-precision)
-DUSE_FLTK=$(usex fltk)
diff --git a/media-sound/csound/csound-9999.ebuild
b/media-sound/csound/csound-9999.ebuild
index 04aea31ab2b..84567ca2d8d 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
DOC_P="Csound${PV}"
- SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz ->
${P}.tar.gz
+
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
@@ -102,7 +102,7 @@ fi
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/csound-6.13.0-xdg-open.patch"
+ "${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
)
pkg_setup() {
@@ -172,9 +172,9 @@ src_configure() {
-DUSE_ALSA=$(usex alsa)
#-DUSE_ATOMIC_BUILTIN=ON
- #-DUSE_AUDIOUNIT=ON
+ -DUSE_AUDIOUNIT=OFF # Apple specific
#-DUSE_COMPILER_OPTIMIZATIONS=ON
- #-DUSE_COREMIDI=ON
+ -DUSE_COREMIDI=OFF # Apple specific
-DUSE_CURL=$(usex curl)
-DUSE_DOUBLE=$(usex double-precision)
-DUSE_FLTK=$(usex fltk)
diff --git a/media-sound/csound/files/repackage.sh
b/media-sound/csound/files/repackage.sh
index 39b8068b930..fea97d24a46 100644
--- a/media-sound/csound/files/repackage.sh
+++ b/media-sound/csound/files/repackage.sh
@@ -21,7 +21,7 @@ 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}
+tar -acf csound-${VERSION}-distributable.tar.xz csound-${VERSION}
echo -e "Cleaning up\n"
rm -rf csound-${VERSION} ${VERSION}.tar.gz
