From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- media-sound/ardour/Manifest | 5 +- media-sound/ardour/ardour-6.2-r1.ebuild | 8 +- media-sound/ardour/ardour-6.3.ebuild | 147 +++++++++++++++++++++ ...-6.2-use-signed-int-for-atomic-operations.patch | 69 ++++++++++ 4 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 media-sound/ardour/ardour-6.3.ebuild create mode 100644 media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch (limited to 'media-sound/ardour') diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index ee7399ec51d6..ec9b5fb7d2b0 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,5 +1,8 @@ AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e +AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8 -EBUILD ardour-6.2-r1.ebuild 4159 BLAKE2B d4be7982a9335ef22798d0368c87706723159be068f900ccf1559bd61d5c2aa2234024d7035618462d805b489354575be14e4162ea7bcd270e2413b5c11e512b SHA512 c88db3ea4f1904e84a1a4e221c3f987419287e6bb64e7ef849669afbb6bb1d7a1177051eb73358f5eaae164b77c988def9c79b07735fe7aeccdd3fa7f04d3923 +DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0 +EBUILD ardour-6.2-r1.ebuild 4435 BLAKE2B e546f198d129f4f5193e9f6d153859385fc1e420fd8d9995f73587d9a555522d077bbea684d252770f091c63ba844f24b8564e74b8767fc9e3ff306294f5abf0 SHA512 7c82b2762b3e787fc7276aba9fa68391fc599dc672e72f55d1280a7279c350de27f1a8129c0b55fa672cff2b94c0948d8d7cdb43085bd887793b34f119fd63e2 +EBUILD ardour-6.3.ebuild 4323 BLAKE2B f9970069239670093057c724947e5b2fb5235cea146c201730d702d74567990bc8501b2552a044fbfe38c2171754165b9463711be3f0d2301ee51bd4049a42aa SHA512 a265d4655dfc0bb1d3fcb7bf727ea7481a2ed52e0269b45693f04529a3fda7e4eb6b792d632530eca78f37df978dad8344e8b461cb42a774041adf7cdc53df0b EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild index 9935afaf3d5d..82d1575b195a 100644 --- a/media-sound/ardour/ardour-6.2-r1.ebuild +++ b/media-sound/ardour/ardour-6.2-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" S="${WORKDIR}/Ardour-${PV}.0" fi @@ -71,8 +71,14 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-fix-no-nls.patch" + "${FILESDIR}/${P}-use-signed-int-for-atomic-operations.patch" ) +pkg_pretend() { + [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \ + ewarn "Linking with gold linker might produce broken executable, see bug #733972" +} + pkg_setup() { if has_version \>=dev-libs/libsigc++-2.6 ; then append-cxxflags -std=c++11 diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild new file mode 100644 index 000000000000..6bd303b0e465 --- /dev/null +++ b/media-sound/ardour/ardour-6.3.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_REQ_USE='threads(+)' +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 + +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="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" + S="${WORKDIR}/Ardour-${PV}.0" +fi + +LICENSE="GPL-2" +SLOT="6" +IUSE="altivec doc jack nls phonehome 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" +# !bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle... + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + jack? ( virtual/jack ) + sys-devel/gettext + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] )" + +pkg_pretend() { + [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \ + ewarn "Linking with gold linker might produce broken executable, see bug #733972" +} + +pkg_setup() { + if has_version \>=dev-libs/libsigc++-2.6 ; then + append-cxxflags -std=c++11 + fi + python-any-r1_pkg_setup +} + +src_prepare() { + default + 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 + my_lcmsg() { + rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po + } + l10n_for_each_disabled_locale_do my_lcmsg +} + +src_configure() { + tc-export CC CXX + mkdir -p "${D}" + waf-utils_src_configure \ + --destdir="${D}" \ + --configdir=/etc \ + --optimize \ + $(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 phonehome "--phone-home" "--no-phone-home") \ + $(usex nls "--nls" "--no-nls") +#not possible right now --use-external-libs +} +src_compile() { + waf-utils_src_compile + use nls && waf-utils_src_compile i18n +} +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 ardour6 ardour6 ardour6 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/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch new file mode 100644 index 000000000000..90454593b68d --- /dev/null +++ b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch @@ -0,0 +1,69 @@ +From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001 +From: Robin Gareus +Date: Thu, 16 Jul 2020 16:13:21 +0200 +Subject: [PATCH] Use signed int for atomic operations -- #8314 + +--- + libs/pbd/pbd/mpmc_queue.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h +index a7909a901..2c08068e1 100644 +--- a/libs/pbd/pbd/mpmc_queue.h ++++ b/libs/pbd/pbd/mpmc_queue.h +@@ -82,7 +82,7 @@ public: + push_back (T const& data) + { + cell_t* cell; +- guint pos = g_atomic_int_get (&_enqueue_pos); ++ gint pos = g_atomic_int_get (&_enqueue_pos); + for (;;) { + cell = &_buffer[pos & _buffer_mask]; + guint seq = g_atomic_int_get (&cell->_sequence); +@@ -108,7 +108,7 @@ public: + pop_front (T& data) + { + cell_t* cell; +- guint pos = g_atomic_int_get (&_dequeue_pos); ++ gint pos = g_atomic_int_get (&_dequeue_pos); + for (;;) { + cell = &_buffer[pos & _buffer_mask]; + guint seq = g_atomic_int_get (&cell->_sequence); +@@ -138,8 +138,8 @@ private: + cell_t* _buffer; + size_t _buffer_mask; + +- volatile guint _enqueue_pos; +- volatile guint _dequeue_pos; ++ volatile gint _enqueue_pos; ++ volatile gint _dequeue_pos; + }; + + } /* end namespace */ +-- +2.28.0 + +From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001 +From: Robin Gareus +Date: Thu, 16 Jul 2020 18:07:14 +0200 +Subject: [PATCH] Use signed int for atomic operations part II -- #8314 + +--- + libs/ardour/ardour/session.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h +index dcc8c88ed..f491f7f17 100644 +--- a/libs/ardour/ardour/session.h ++++ b/libs/ardour/ardour/session.h +@@ -1762,7 +1762,7 @@ private: + OnlyLoop, + }; + +- volatile guint _punch_or_loop; // enum PunchLoopLock ++ volatile gint _punch_or_loop; // enum PunchLoopLock + gint current_usecs_per_track; + + bool punch_active () const; +-- +2.28.0 -- cgit v1.2.3