commit: 0b94703700b420be51b83e1d13b0b00a62677658 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Aug 12 18:04:33 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Aug 12 18:04:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b947037
media-sound/ardour: bump to 6.2, dropped 5.12, py3 Bug: https://bugs.gentoo.org/733972 Bug: https://bugs.gentoo.org/640168 Closes: https://bugs.gentoo.org/726042 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/ardour/Manifest | 3 +- media-sound/ardour/ardour-5.12.ebuild | 137 --------------------- .../{ardour-6.0.ebuild => ardour-6.2.ebuild} | 17 ++- media-sound/ardour/ardour-9999.ebuild | 17 ++- .../ardour/files/ardour-4.x-revision-naming.patch | 38 ------ 5 files changed, 17 insertions(+), 195 deletions(-) diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index bf2aa3d6bda..4a3220d8015 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,2 +1 @@ -DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7 SHA512 42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3 -DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d +DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8 diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild deleted file mode 100644 index e29d333138f..00000000000 --- a/media-sound/ardour/ardour-5.12.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' -inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="http://ardour.org/"; - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"; - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://gentoo/${P}.tar.bz2" - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - >=dev-cpp/glibmm-2.32.0 - >=dev-cpp/gtkmm-2.16:2.4 - >=dev-cpp/libgnomecanvasmm-2.26:2.6 - dev-libs/boost:= - >=dev-libs/glib-2.10.1:2 - dev-libs/libsigc++:2 - >=dev-libs/libxml2-2.6:2 - dev-libs/libxslt - >=gnome-base/libgnomecanvas-2 - media-libs/alsa-lib - media-libs/aubio - media-libs/flac - media-libs/freetype:2 - media-libs/libart_lgpl - media-libs/liblo - >=media-libs/liblrdf-0.4.0-r20 - >=media-libs/libsamplerate-0.1 - >=media-libs/libsndfile-1.0.18 - >=media-libs/libsoundtouch-1.6.0 - media-libs/raptor:2 - >=media-libs/rubberband-1.6.0 - >=media-libs/taglib-1.7 - media-libs/vamp-plugin-sdk - net-misc/curl - sys-libs/readline:0= - sci-libs/fftw:3.0[threads] - virtual/libusb:1 - x11-libs/cairo - >=x11-libs/gtk+-2.8.1:2 - x11-libs/pango - jack? ( virtual/jack ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - >=media-libs/suil-0.6.10 - >=media-libs/lv2-1.4.0" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - jack? ( virtual/jack ) - sys-devel/gettext - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -pkg_setup() { - if has_version \>=dev-libs/libsigc++-2.6 ; then - append-cxxflags -std=c++11 - fi - python-any-r1_pkg_setup -} - -src_prepare() { - eapply_user - if ! [[ ${PV} == *9999* ]]; then - eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch - touch "${S}/libs/ardour/revision.cc" - fi - sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die - MARCH=$(get-flag march) - OPTFLAGS="" - if use cpu_flags_x86_sse; then - if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the flags now, but please consider switching your march in make.conf!" - fi - OPTFLAGS="sse" - fi - if use cpu_flags_x86_mmx; then - if [[ ${MARCH} == "i486" ]]; then - elog "You enabled mmx with i486 set as march! You have been warned!" - fi - OPTFLAGS="${OPTFLAGS} mmx" - fi - if use cpu_flags_x86_3dnow; then - OPTFLAGS="${OPTFLAGS} 3dnow" - fi - sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ - -i "${S}"/wscript || die - sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die - append-flags "-lboost_system" - python_fix_shebang "${S}"/wscript - python_fix_shebang "${S}"/waf -} - -src_configure() { - tc-export CC CXX - mkdir -p "${D}" - waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ - --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --nls \ - --optimize -} - -src_install() { - waf-utils_src_install - mv ${PN}.1 ${PN}${SLOT}.1 - doman ${PN}${SLOT}.1 - newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png - make_desktop_entry ardour5 ardour5 ardour5 AudioVideo -} - -pkg_postinst() { - elog "Please do _not_ report problems with the package to ${PN} upstream." - elog "If you think you've found a bug, check the upstream binary package" - elog "before you report anything to upstream." -} diff --git a/media-sound/ardour/ardour-6.0.ebuild b/media-sound/ardour/ardour-6.2.ebuild similarity index 88% rename from media-sound/ardour/ardour-6.0.ebuild rename to media-sound/ardour/ardour-6.2.ebuild index 304e08fcb60..62d9c9a3223 100644 --- a/media-sound/ardour/ardour-6.0.ebuild +++ b/media-sound/ardour/ardour-6.2.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh" inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils @@ -114,15 +113,15 @@ src_configure() { tc-export CC CXX mkdir -p "${D}" waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ $( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \ - $( use nls && echo "--nls" ) || echo --no-nls \ + $( use nls && echo "--nls" ) || echo --no-nls \ --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --optimize + --prefix=/usr \ + --configdir=/etc \ + --optimize #not possible right now --use-external-libs } src_compile() { diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 304e08fcb60..62d9c9a3223 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='threads(+)' -#EPYTHON='python2.7' PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh" inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils @@ -114,15 +113,15 @@ src_configure() { tc-export CC CXX mkdir -p "${D}" waf-utils_src_configure \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ $( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \ - $( use nls && echo "--nls" ) || echo --no-nls \ + $( use nls && echo "--nls" ) || echo --no-nls \ --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --optimize + --prefix=/usr \ + --configdir=/etc \ + --optimize #not possible right now --use-external-libs } src_compile() { diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch deleted file mode 100644 index d558f4792a8..00000000000 --- a/media-sound/ardour/files/ardour-4.x-revision-naming.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ardour-4.2/wscript -+++ ardour-4.2/wscript -@@ -162,7 +162,7 @@ - if os.path.isdir (os.path.join(os.getcwd(), '.git')): - rev = fetch_git_revision () - else: -- rev = fetch_tarball_revision () -+ rev = os.environ['PV'] - - # - # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit -@@ -238,16 +238,16 @@ - return version - - def create_stored_revision(): -- rev = "" -- if os.path.exists('.git'): -- rev = fetch_git_revision(); -- print("Git version: " + rev + "\n") -- elif os.path.exists('libs/ardour/revision.cc'): -- print("Using packaged revision") -- return -- else: -- print("Missing libs/ardour/revision.cc. Blame the packager.") -- sys.exit(-1) -+ rev = os.environ['PV'] + "-gentoo" -+# if os.path.exists('.git'): -+# rev = fetch_git_revision(); -+# print("Git version: " + rev + "\n") -+# elif os.path.exists('libs/ardour/revision.cc'): -+# print("Using packaged revision") -+# return -+# else: -+# print("Missing libs/ardour/revision.cc. Blame the packager.") -+# sys.exit(-1) - - try: - #
