From c7c046a33897c533b949ee76326d620f5e07f2e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Oct 2022 07:52:23 +0100 Subject: gentoo auto-resync : 16:10:2022 - 07:52:23 --- media-sound/Manifest.gz | Bin 57198 -> 57193 bytes media-sound/ardour/Manifest | 6 +- media-sound/ardour/ardour-6.9-r2.ebuild | 2 +- media-sound/ardour/ardour-7.0.ebuild | 185 +++++++++++++++++++++ media-sound/ardour/ardour-9999.ebuild | 2 +- media-sound/clementine/Manifest | 4 - media-sound/clementine/clementine-1.4.0_rc1.ebuild | 181 -------------------- ...clementine-1.4.0_rc1-QPainterPath_include.patch | 50 ------ ....0_rc1-gcc11-fix-static-assertion-failure.patch | 70 -------- media-sound/yoshimi/Manifest | 2 - media-sound/yoshimi/yoshimi-2.2.1.ebuild | 60 ------- 11 files changed, 191 insertions(+), 371 deletions(-) create mode 100644 media-sound/ardour/ardour-7.0.ebuild delete mode 100644 media-sound/clementine/clementine-1.4.0_rc1.ebuild delete mode 100644 media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch delete mode 100644 media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch delete mode 100644 media-sound/yoshimi/yoshimi-2.2.1.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 66da2a0790fb..35dfb5ebf399 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index 547aa4bd4324..e31efdbc0200 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,5 +1,7 @@ AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234 -EBUILD ardour-6.9-r2.ebuild 4880 BLAKE2B f0bda35454e1bf344a4296e822a32bcebfabc1f5ddbf4b76f33f69c5ef9d8ccaa4b6ead7228324f0c828bd1dd4538698bcdfbc2f1d18d9b2c51a91e6280f7845 SHA512 a0b544100e88708818ff809f85251981c490033e7d7ea11d9558326e9138bed9ed66f0d79a3108bb91256485505f0b5cae3341de9b7f481b5cc559d806005a25 -EBUILD ardour-9999.ebuild 5045 BLAKE2B 59ce5767e5dbcadfd948af2de5c8284540ef73321de6b4725185fe285db315710f14304ef31b4899811428375535c02d3d8c285fb50f8513ef1a55a8d4e994a7 SHA512 be4ea4500bcaa8aae369429ea6da1474842f6528a398f63d80238189233845684d98d8334bd8242dc999dc71961d31d22d153856f01d802cd255656abdf49372 +DIST Ardour-7.0.0.tar.bz2 12681139 BLAKE2B 7549c627ca085f40b4224ecd8a8f6e2a7a8a9a662e8a97048e9af3a0c6a0463ce69cea8ea20b867ae98649c3ab1b5940efed39978579b6b319b29ba5beb75d4d SHA512 5eeb84973f9a08e3bd2fbf9b829e902e001137ce330bcb26404f7a9da4ab3e89fdecca867511df7ae7bd3c744f7f2a5f9235b3de56c0d0c90d0a95dd6c043a27 +EBUILD ardour-6.9-r2.ebuild 4827 BLAKE2B 5b801194b7b30aacb4e3420e4cb1dd417b24f226a5651a495207b73716f0934fe16c67ede13e9efbdefb4df8d40c8f29fcb0b9eceb4b5deae1ed6b5c281b9907 SHA512 295c8cfaa174ca3a20f021b9139706fb1a987524468e6c574d3ecd1248ff66ba0fd445a11fc65116650d2c89788b66324c28a09344fbaadbdb9f96fece716f69 +EBUILD ardour-7.0.ebuild 4992 BLAKE2B 01f4753ac88da4d77d70cc5e1f0f78d93b0ac0f2ce5bed40d5dcf76fd61ccc221cc4e1414cd14e3ef8d16670a19fe9517b0681e870d86ec303ff4973e7c72366 SHA512 38bc166884bf5ec47071a5216ba0c53f8a2963a97714c5be9c0d6f5154c519b7f737ca63408a614959ce1893f50c742a48372875cd6727b572290451e2d26e9d +EBUILD ardour-9999.ebuild 4992 BLAKE2B 01f4753ac88da4d77d70cc5e1f0f78d93b0ac0f2ce5bed40d5dcf76fd61ccc221cc4e1414cd14e3ef8d16670a19fe9517b0681e870d86ec303ff4973e7c72366 SHA512 38bc166884bf5ec47071a5216ba0c53f8a2963a97714c5be9c0d6f5154c519b7f737ca63408a614959ce1893f50c742a48372875cd6727b572290451e2d26e9d MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild index 21e7af85210c..3f85c9a41e8f 100644 --- a/media-sound/ardour/ardour-6.9-r2.ebuild +++ b/media-sound/ardour/ardour-6.9-r2.ebuild @@ -58,7 +58,7 @@ RDEPEND=" media-libs/lilv media-libs/sratom dev-libs/sord - || ( >=media-libs/suil-0.10.16-r1[gtk2] =dev-libs/libsigc++-2.6 ; then + append-cxxflags -std=c++11 + fi + python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + + 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 + } + plocale_for_each_disabled_locale my_lcmsg +} + +src_configure() { + # avoid bug https://bugs.gentoo.org/800067 + local -x AS="$(tc-getCC) -c" + + local backends="alsa,dummy" + use jack && backends+=",jack" + use pulseaudio && backends+=",pulseaudio" + + tc-export CC CXX + mkdir -p "${D}" + local myconf=( + --configdir=/etc + --freedesktop + --noconfirm + --optimize + --with-backends=${backends} + $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") + $(usex doc "--docs" '') + $(usex nls "--nls" "--no-nls") + $(usex phonehome "--phone-home" "--no-phone-home") + # not possible right now --use-external-libs + ) + + waf-utils_src_configure "${myconf[@]}" +} + +src_compile() { + waf-utils_src_compile + use nls && waf-utils_src_compile i18n +} + +src_install() { + local s + + waf-utils_src_install + + mv ${PN}.1 ${PN}${SLOT}.1 || die + doman ${PN}${SLOT}.1 + + for s in 16 22 32 48 256 512; do + newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png + done + + # the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6 + find "${D}/usr/share/icons/" -name ardour6.png -delete + + sed -i \ + -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \ + -e 's/;AudioEditing;/;X-AudioEditing;/' \ + build/gtk2_ardour/ardour${SLOT}.desktop || die + domenu build/gtk2_ardour/ardour${SLOT}.desktop + + insinto /usr/share/mime/packages + newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml +} + +pkg_postinst() { + xdg_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-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index 6b4cd2f9e9be..463082c09921 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -58,7 +58,7 @@ RDEPEND=" media-libs/lilv media-libs/sratom dev-libs/sord - || ( >=media-libs/suil-0.10.16-r1[gtk2] -Date: Thu, 28 May 2020 10:34:31 +0200 -Subject: [PATCH] Adds missing QPainterPath include - ---- - src/widgets/freespacebar.cpp | 1 + - src/widgets/osdpretty.cpp | 1 + - src/widgets/sliderwidget.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp -index 3067f722b..c9789d353 100644 ---- a/src/widgets/freespacebar.cpp -+++ b/src/widgets/freespacebar.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - const int FreeSpaceBar::kBarHeight = 20; - const int FreeSpaceBar::kBarBorderRadius = 8; -diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp -index 9d95716d8..30cef7dae 100644 ---- a/src/widgets/osdpretty.cpp -+++ b/src/widgets/osdpretty.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp -index 581a0de7b..96bbc0e5e 100644 ---- a/src/widgets/sliderwidget.cpp -+++ b/src/widgets/sliderwidget.cpp -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.27.0.rc2 - diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch deleted file mode 100644 index 1a492fe5664c..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch +++ /dev/null @@ -1,70 +0,0 @@ -From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Wed, 16 Dec 2020 20:03:26 +0100 -Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was causing compilation failures, static assertion failed, with GCC 11. - -Fix #6865 - -Signed-off-by: Robert-André Mauchin ---- - ext/clementine-spotifyblob/CMakeLists.txt | 2 +- - ext/clementine-tagreader/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 2 +- - tests/CMakeLists.txt | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt -index e5342ee5b..6fd551d57 100644 ---- a/ext/clementine-spotifyblob/CMakeLists.txt -+++ b/ext/clementine-spotifyblob/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob) - include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common) - include_directories(${CMAKE_SOURCE_DIR}/src) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option") - - link_directories(${SPOTIFY_LIBRARY_DIRS}) - -diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt -index 855e390cf..a48b01450 100644 ---- a/ext/clementine-tagreader/CMakeLists.txt -+++ b/ext/clementine-tagreader/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) - include_directories(${CMAKE_SOURCE_DIR}/src) - include_directories(${CMAKE_BINARY_DIR}/src) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - - set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 627b2e7cb..0bbc775ba 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,6 @@ - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option") - - option(BUILD_WERROR "Build with -Werror" ON) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 4474e7be5..ff571fc19 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8.11) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing") - - if(USE_SYSTEM_GMOCK) - include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}) diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest index d489e574d8e1..76fe021a354b 100644 --- a/media-sound/yoshimi/Manifest +++ b/media-sound/yoshimi/Manifest @@ -1,5 +1,3 @@ -DIST yoshimi-2.2.1.tar.gz 8039881 BLAKE2B 8ef8851b6e0808190f8bf97fc6502448d703cd910726f44c8c1f839299badcd858872291f54d4d219d12e11acc31ec1d342f5df5009d71b0fc1d8eae2f6cb7d1 SHA512 9f1895273b8e6ecedf503d59f351f568c189a03d5111d3bc7de8cc0c025f89f48383540f462184b9fad9487ea3cc18c0cc6cb6b1ba7ccd2619ddb2c28c4c66f0 DIST yoshimi-2.2.2.1.tar.gz 8038479 BLAKE2B a33d231770981dcc4f2215941c60b3d959eaa93f883cda483d8d97452e37676b8dc1397b4c45bf2e2e63f1da1454c4187ea1709e58d867471ef1fa028f255512 SHA512 edabf5130c71c5fc303f6825e0323cd00b341079e61577772c547f104413646623b5c2a86a0ffd573013b4b84b6fa724161f851ead6d525e7f630d95ab724987 -EBUILD yoshimi-2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173 EBUILD yoshimi-2.2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61 diff --git a/media-sound/yoshimi/yoshimi-2.2.1.ebuild b/media-sound/yoshimi/yoshimi-2.2.1.ebuild deleted file mode 100644 index d37c7559c8db..000000000000 --- a/media-sound/yoshimi/yoshimi-2.2.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Software synthesizer based on ZynAddSubFX" -HOMEPAGE="https://yoshimi.github.io/" -SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+lv2" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - dev-libs/mxml - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libsndfile - sci-libs/fftw:3.0= - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib - virtual/jack - x11-libs/cairo[X] - x11-libs/fltk:1[opengl] - lv2? ( media-libs/lv2 ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}/src" - -DOCS=( ../Changelog ../README.txt ) - -src_prepare() { - cmake_src_prepare - sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die - append-cxxflags -lpthread - append-cppflags -lpthread -} - -src_configure() { - local mycmakeargs=( - -DLV2Plugin=$(usex lv2) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # unpack Histories.tar.bz2 to avoid QA issues - pushd "${ED}/usr/share/doc/${PF}" || die - tar xvf Histories.tar.bz2 || die - rm Histories.tar.bz2 - popd -} -- cgit v1.2.3