From 820b3cf4687f358703c643bacf3e5a06ccfa4402 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Sep 2023 23:18:20 +0100 Subject: gentoo auto-resync : 22:09:2023 - 23:18:20 --- media-sound/Manifest.gz | Bin 57436 -> 57446 bytes media-sound/ardour/Manifest | 8 +- media-sound/ardour/ardour-7.4-r2.ebuild | 190 ----------------------- media-sound/ardour/ardour-7.4-r3.ebuild | 188 ++++++++++++++++++++++ media-sound/ardour/ardour-7.5-r1.ebuild | 188 ++++++++++++++++++++++ media-sound/ardour/ardour-7.5.ebuild | 190 ----------------------- media-sound/ardour/ardour-9999.ebuild | 2 - media-sound/ardour/files/ardour-7.4-libc++.patch | 56 ++++--- media-sound/spotify/Manifest | 6 +- media-sound/spotify/spotify-1.2.13.ebuild | 131 ---------------- media-sound/spotify/spotify-1.2.20.ebuild | 131 ++++++++++++++++ media-sound/spotify/spotify-1.2.8-r1.ebuild | 131 ---------------- 12 files changed, 546 insertions(+), 675 deletions(-) delete mode 100644 media-sound/ardour/ardour-7.4-r2.ebuild create mode 100644 media-sound/ardour/ardour-7.4-r3.ebuild create mode 100644 media-sound/ardour/ardour-7.5-r1.ebuild delete mode 100644 media-sound/ardour/ardour-7.5.ebuild delete mode 100644 media-sound/spotify/spotify-1.2.13.ebuild create mode 100644 media-sound/spotify/spotify-1.2.20.ebuild delete mode 100644 media-sound/spotify/spotify-1.2.8-r1.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 413ec457c590..e29fe1574212 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 09ff4605778c..320c98adf532 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,8 +1,8 @@ AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c -AUX ardour-7.4-libc++.patch 1417 BLAKE2B d3e3b94a0d6f6a1b5ce9af18d6a014e46c12cecaf307f6cd6beac4143b0280bd708de9360ebe0a584fdc28a25e831abc39f0d26d073db39a3d51e607b9fc8f41 SHA512 40f1c8671304d855b4ea7e3a30e18d33e62669b12da1bae4b8f317aa90d3a9c85900ed5467c1722a3b01b1a72971fa74f353623e16100f4e22ce0b6daa7e3b6c +AUX ardour-7.4-libc++.patch 1519 BLAKE2B 77f6f35301b7eb3b04cc4287344ed6da1521470fb1e8e5fc006ba505b8ebcfc044d03c4f91a9992f4b737228984009fd0114109c9e9dbf6ac22a1fb7226138a0 SHA512 da3e4ccf54f24aace189aa717d0ed91cd559956d86e7c8e9f2f6f52b3aeed54b71e27393ca17616c112cc311e99c376b36030a49260eacb77826a26e4d1f1543 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e -EBUILD ardour-7.4-r2.ebuild 5101 BLAKE2B 53d6fe2967a668d8d99c8f413b8c63438d72e67a05737c5ed45f5a0cc32c1f38a71660157eeb782686aa773cea4074997baa9c21e9ea8065532517ee988249c8 SHA512 3fa6ce860d63ee3de50aa6b2a87f68df03dc33c0ad8fcd4fa90971367808fbd5a0f7b8baf125ffb51d9685b05984fb2ef46c2b47db155c028144bba9d8894d73 -EBUILD ardour-7.5.ebuild 5109 BLAKE2B 1d64b458b4c7627a8f4c6274b6b0990c2c044a2a00bdebb6e6964faf48d9b0e89f9103dbaeda68e166e2b740fae4976426c7cc58536a474598cc6ed92db46d75 SHA512 7b92eaeee7d66f670c0085e041a25af68179765f902a8d0502104d265a2e94d5929454c7d2ecac6450d549bd3e7d16e54f4cea65ca4d7802e5ed6d6abc4202d8 -EBUILD ardour-9999.ebuild 5110 BLAKE2B 7c1e4facefccf0c21411d8a665e965c827790530b1e341b000e7a3800965ba5166976c8216ea0bbc8add53b62f81b2518f9286a82c5d3a61a3486b6df8c226cd SHA512 00b912f1df0df597d66d6694c7fe87991edeb8687bb3b1215d58f98fd48d0d19a2022fb815cdb03656f6def55ced6394436269b56f8da7ec1035ad4d87839b03 +EBUILD ardour-7.4-r3.ebuild 5031 BLAKE2B 35c7aec6ac5425f5497702322b18f45a5a26dfe855e9b5af833ad044956f5afb54c1f8a23b76c839f7a3390ddca007d965633b07c89b48f41126c2a0b037886d SHA512 8da9e699c0789f7ab157be0c925be7fb907922b59ea485c050c4505266db4460ea512f3f1e527543f6befa330224f47e423e0a4f9461f5fb806ead3c390f7991 +EBUILD ardour-7.5-r1.ebuild 5039 BLAKE2B e6400b18926a0e6d6559a49beb9e22612ce2be62eab1e7e33410f26a2cefe7817437a7fe9e39b7c7c537bfb6b464b4b5fee386be2bf903ecebb38fcc474b3ca1 SHA512 dae8b3300fa79f979082631e7b3120e61a2ce1e0f5b8bb9c618d664b7698b8e512559efa79eae65dbae242ae2e07b1d7ce44eeaa166e9a950af48534ace3c716 +EBUILD ardour-9999.ebuild 5040 BLAKE2B 33067b4af30ff09d223aec49302886790d1fd0d0d35a3d07efe4aa1fadbbd9738df6d18c70efb0a15eb04feb9de885873b74cedb8fc949208f971efc015bc8da SHA512 37a88375879e3bc2223496722c1aa217f8c4ba6a8175b48a295c741b3e0a55bbc2b243cbbe81df601688778a3426830f6a1a05e0d6086498a822456571274160 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb diff --git a/media-sound/ardour/ardour-7.4-r2.ebuild b/media-sound/ardour/ardour-7.4-r2.ebuild deleted file mode 100644 index 2bfcbebca1ea..000000000000 --- a/media-sound/ardour/ardour-7.4-r2.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='threads(+)' -PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" -inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="https://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="7" -IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/libsigc++:2 - dev-libs/libxml2: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 - media-libs/libsamplerate - media-libs/libsndfile - media-libs/libsoundtouch - media-libs/raptor:2 - media-libs/rubberband - media-libs/taglib - 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 - x11-libs/pango - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - media-libs/suil[X,gtk2] - media-libs/lv2" -# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - jack? ( virtual/jack )" - -PATCHES=( - "${FILESDIR}/${PN}-6.8-metadata.patch" - "${FILESDIR}/${PN}-7.4-libc++.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 - 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 - } - 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 - ) - - [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ ) - - 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-7.4-r3.ebuild b/media-sound/ardour/ardour-7.4-r3.ebuild new file mode 100644 index 000000000000..0fee9b81252e --- /dev/null +++ b/media-sound/ardour/ardour-7.4-r3.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE='threads(+)' +PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" +inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg + +DESCRIPTION="Digital Audio Workstation" +HOMEPAGE="https://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="7" +IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" + +RDEPEND=" + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-libs/boost:= + dev-libs/glib:2 + dev-libs/libsigc++:2 + dev-libs/libxml2: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 + media-libs/libsamplerate + media-libs/libsndfile + media-libs/libsoundtouch + media-libs/raptor:2 + media-libs/rubberband + media-libs/taglib + 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 + x11-libs/pango + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + media-libs/lilv + media-libs/sratom + dev-libs/sord + media-libs/suil[X,gtk2] + media-libs/lv2" +# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + jack? ( virtual/jack )" + +PATCHES=( + "${FILESDIR}/${PN}-6.8-metadata.patch" + "${FILESDIR}/${PN}-7.4-libc++.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 + 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 + } + 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-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild new file mode 100644 index 000000000000..e012233b45d4 --- /dev/null +++ b/media-sound/ardour/ardour-7.5-r1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE='threads(+)' +PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" +inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg + +DESCRIPTION="Digital Audio Workstation" +HOMEPAGE="https://ardour.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" + inherit git-r3 +else + KEYWORDS="amd64 ~loong ~x86" + SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" + S="${WORKDIR}/Ardour-${PV}.0" +fi + +LICENSE="GPL-2" +SLOT="7" +IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" + +RDEPEND=" + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-libs/boost:= + dev-libs/glib:2 + dev-libs/libsigc++:2 + dev-libs/libxml2: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 + media-libs/libsamplerate + media-libs/libsndfile + media-libs/libsoundtouch + media-libs/raptor:2 + media-libs/rubberband + media-libs/taglib + 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 + x11-libs/pango + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + media-libs/lilv + media-libs/sratom + dev-libs/sord + media-libs/suil[X,gtk2] + media-libs/lv2" +# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + jack? ( virtual/jack )" + +PATCHES=( + "${FILESDIR}/${PN}-6.8-metadata.patch" + "${FILESDIR}/${PN}-7.4-libc++.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 + 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 + } + 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-7.5.ebuild b/media-sound/ardour/ardour-7.5.ebuild deleted file mode 100644 index 2bef74d90d7e..000000000000 --- a/media-sound/ardour/ardour-7.5.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='threads(+)' -PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" -inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="https://ardour.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" - inherit git-r3 -else - KEYWORDS="amd64 ~loong ~x86" - SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -SLOT="7" -IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/libsigc++:2 - dev-libs/libxml2: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 - media-libs/libsamplerate - media-libs/libsndfile - media-libs/libsoundtouch - media-libs/raptor:2 - media-libs/rubberband - media-libs/taglib - 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 - x11-libs/pango - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - media-libs/suil[X,gtk2] - media-libs/lv2" -# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - jack? ( virtual/jack )" - -PATCHES=( - "${FILESDIR}/${PN}-6.8-metadata.patch" - "${FILESDIR}/${PN}-7.4-libc++.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 - 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 - } - 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 - ) - - [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ ) - - 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 607dfeed3930..029d71ed7696 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -146,8 +146,6 @@ src_configure() { # not possible right now --use-external-libs ) - [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ ) - waf-utils_src_configure "${myconf[@]}" } diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch index 85f13ba47dbc..a596fafba0f7 100644 --- a/media-sound/ardour/files/ardour-7.4-libc++.patch +++ b/media-sound/ardour/files/ardour-7.4-libc++.patch @@ -1,39 +1,49 @@ -From d8e42490b18bd0c8a827d96608e951bf5bc875e4 Mon Sep 17 00:00:00 2001 +From https://github.com/Ardour/ardour/pull/822/commits/c2ac82bfbacc583c49b306826dedec754633bbe7 Mon Sep 17 00:00:00 2001 From: Violet Purcell -Date: Sun, 4 Jun 2023 04:56:58 -0400 -Subject: [PATCH] Fix build with libc++ on linux +Date: Thu, 21 Sep 2023 21:09:30 -0400 +Subject: [PATCH] Backport VST3 libc++ fix on linux +LLVM libc++ does not have the ext/atomicity.h header. This fix is copied +from the upstream vst3_pluginterfaces repo. + +Signed-off-by: Violet Purcell --- a/libs/vst3/pluginterfaces/base/funknown.cpp +++ b/libs/vst3/pluginterfaces/base/funknown.cpp -@@ -44,7 +44,9 @@ +@@ -44,13 +44,23 @@ #endif #if SMTG_OS_LINUX -+#ifndef USE_LIBCXX ++#if !defined (SMTG_USE_STDATOMIC_H) ++#if defined (_LIBCPP_VERSION) ++#define SMTG_USE_STDATOMIC_H 1 ++#else #include ++#endif +#endif /* UUID */ #include #include -@@ -83,7 +85,7 @@ int32 PLUGIN_API atomicAdd (int32& var, int32 d) + #include + #endif + ++#if defined (SMTG_USE_STDATOMIC_H) && SMTG_USE_STDATOMIC_H ++#include ++#endif ++ + namespace Steinberg { + + //------------------------------------------------------------------------ +@@ -79,7 +89,9 @@ namespace FUnknownPrivate { + //------------------------------------------------------------------------ + int32 PLUGIN_API atomicAdd (int32& var, int32 d) + { +-#if SMTG_OS_WINDOWS ++#if SMTG_USE_STDATOMIC_H ++ return atomic_fetch_add (reinterpret_cast (&var), d) +d; ++#elif SMTG_OS_WINDOWS return InterlockedExchangeAdd ((volatile long int*)&var, d) + d; #elif SMTG_OS_MACOS return OSAtomicAdd32Barrier (d, (int32_t*)&var); --#elif SMTG_OS_LINUX -+#elif SMTG_OS_LINUX && !defined USE_LIBCXX - __gnu_cxx::__atomic_add (&var, d); - return var; - #else ---- a/wscript -+++ b/wscript -@@ -545,6 +545,8 @@ int main() { return 0; }''', - if opt.use_libcpp or conf.env['build_host'] in [ 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]: - cxx_flags.append('--stdlib=libc++') - linker_flags.append('--stdlib=libc++') -+ if platform == 'linux': -+ cxx_flags.append('-DUSE_LIBCXX') - - if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura' ]: - conf.check_cxx(cxxflags=["-std=c++11"]) -- -2.40.1 +2.42.0 + diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 912868ed982b..418b623c6b8d 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,6 +1,4 @@ AUX spotify-wrapper 1377 BLAKE2B b75890e77c96198d7bd788b5d954fb5c10095d9ca59e2c33a48003d5e559231db7aade027206da7d96f9c7bb6c19482c4d382918262e25c912cf47975a990793 SHA512 553d25d286368b1600bb7dc5c3ab681b380e9c9ff30df335796952c86e77912775ddeee03db348220e9d84a4bc32f4a8d85c7a1551a60e4155ee960b4a6d8799 -DIST spotify-client_1.2.13.661.ga588f749_amd64.deb 121793588 BLAKE2B b9b6b659e823e6713b2db5f3c6f7c6e4ce9cedfc0b4222d96b8baec3d086dcf804f021bb0e530f6c3003df9725ff7705aaa0af457a031124e5f104f4bc434ce1 SHA512 5ccac37274ca587414a9f4c5c427fd5d4b93bbde0b39efb94ccf79a1b5947df4a00a79e00686e59a4ccd097eca0bad88e6f030f2e236d86a82c37d8e011217e9 -DIST spotify-client_1.2.8.923.g4f94bf0d_amd64.deb 119841576 BLAKE2B 2d7ce02907f00dfbd30020ea0576842253110deb10bb4de12807f9f9eacb84d7c6ee09f91da5aa2647c6e0eee7a1386d9059124012c1749e56ab081022d62815 SHA512 d4bc076d87018c851f851cc8b65e05b1611701994a97963bd63aa816518b1f5fa4d89956fea8ef234a41f1c4d6f8a3aa2bfc4fbd3b39f58f0bed5aec79c60edc -EBUILD spotify-1.2.13.ebuild 3741 BLAKE2B b3140aeecc7fe4d33149d55d3e910e1b6974f213aec1cd1be392e875ebb46b69241cd2b128dc45783826e6306cff6f69d49e5641fe5c98b7909895f9ec148bb1 SHA512 1b116133d973df89af946bcf91867f8d49950508a053065454558d04a9e1009d34a2734adc835da672c3c5655ae0be4517ecd2ee67465ba50008cc2779c099c4 -EBUILD spotify-1.2.8-r1.ebuild 3741 BLAKE2B eeafa9f9e43525666f937cb266c536c5baa8677e981629e94022778bb123df2affc199baed998dad11af927377960973f8811d46724e13128caa0daf0fbdf0c9 SHA512 2946203413c4d8e12b125253ded8cf3bf7850ec419ee4c1398a4d458f7cdec8250579e01e950e1bcf344942da0edc0fce1ff14bef00ddbcdfeec8714f6141472 +DIST spotify-client_1.2.20.1210.g2a8a8a57_amd64.deb 124183006 BLAKE2B 32f48b06311d25ced25516e8a521dd87ebd44179fdb93b6f5ba53636eb4b53b5be97092d227968846188f0d51d9a8f6f2e350d009b797519d1cb0f252783076d SHA512 a527d6fecec9fa925d8c60e0ba8764ec8f53d3f5268d0b968d3bdeca7d367081f7faa0bcd1fe016491f15e37a1238ad40dbca1fc93b2533e0238e7a7a07f352b +EBUILD spotify-1.2.20.ebuild 3739 BLAKE2B e2220761d0c40a3163922fe2dbab784412a908d0c6f35eea8c11cf5d75620f4a88f9365817bc8cca56b7e676dadff0b656c820e74db6250e664bb84a6c8bede3 SHA512 167ba188a4c50d537bb71cfd616b495442f536f278180031f9a10a6a337f2453bb47ed0b027d1730cfc3dd3da5a54b3585a02ac6811644a8b65898ac5613d06c MISC metadata.xml 521 BLAKE2B 6859f340482640ec95ed103b2ca4b1e6c316509d8b87402068e1164a4efeaac9cf8ac5360ea038eb09c3682dd8e8e10a9cc872a3820c1a8341fcccaab34e0a18 SHA512 7527cfdf2d421e1bd7c156b930f980a464fad60f2ba2fafa5b79e4f04baad97a6ce3176987e8a32c8b5bcae20acf2b416812b26de1f7bc76205e0d8bee4e98e8 diff --git a/media-sound/spotify/spotify-1.2.13.ebuild b/media-sound/spotify/spotify-1.2.13.ebuild deleted file mode 100644 index 960cb1c7fa5c..000000000000 --- a/media-sound/spotify/spotify-1.2.13.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature pax-utils unpacker xdg - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/download/linux/" -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" -BUILD_ID_AMD64="661.ga588f749" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" - -LICENSE="Spotify" -SLOT="0" -KEYWORDS="amd64" -IUSE="libnotify local-playback pax-kernel pulseaudio" -RESTRICT="mirror strip" - -BDEPEND=" - >=dev-util/patchelf-0.10 - sys-devel/gettext -" -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/openssl:0= - dev-python/dbus-python - media-libs/alsa-lib - media-libs/fontconfig - media-libs/harfbuzz - media-libs/mesa[X(+)] - net-misc/curl[ssl] - net-print/cups[ssl] - sys-apps/dbus - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libdrm - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/pango - !gnome-extra/gnome-integration-spotify - libnotify? ( x11-libs/libnotify ) - local-playback? ( media-video/ffmpeg:0/56.58.58 ) - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-sound/apulse ) -" - #gnome-integration-spotify causes spotify to fail to launch - #sys-libs/glibc - -S="${WORKDIR}/" - -QA_PREBUILT=" - opt/spotify/spotify-client/spotify - opt/spotify/spotify-client/libEGL.so - opt/spotify/spotify-client/libGLESv2.so - opt/spotify/spotify-client/libcef.so - opt/spotify/spotify-client/libvk_swiftshader.so - opt/spotify/spotify-client/libvulkan.so.1 - opt/spotify/spotify-client/swiftshader/libEGL.so - opt/spotify/spotify-client/swiftshader/libGLESv2.so -" - -src_prepare() { - default - # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. - patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ - || die "failed to patch libcurl library dependency" -} - -src_install() { - gunzip usr/share/doc/spotify-client/changelog.gz || die - dodoc usr/share/doc/spotify-client/changelog - - SPOTIFY_PKG_HOME=usr/share/spotify - insinto /usr/share/pixmaps - doins ${SPOTIFY_PKG_HOME}/icons/*.png - - # install in /opt/spotify - SPOTIFY_HOME=/opt/spotify/spotify-client - insinto ${SPOTIFY_HOME} - doins -r ${SPOTIFY_PKG_HOME}/* - fperms +x ${SPOTIFY_HOME}/spotify - - dodir /usr/bin - SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \ - envsubst '$SPOTIFY_HOME $LIBDIR' \ - < "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die - fperms +x /usr/bin/spotify - - local size - for size in 16 22 24 32 48 64 128 256 512; do - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ - "spotify-client.png" - done - domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" - if use pax-kernel; then - #create the headers, reset them to default, then paxmark -m them - pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die - eqawarn "You have set USE=pax-kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - ewarn "If Spotify crashes after an upgrade its cache may be corrupt." - ewarn "To remove the cache:" - ewarn "rm -rf ~/.cache/spotify" - - optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray -} diff --git a/media-sound/spotify/spotify-1.2.20.ebuild b/media-sound/spotify/spotify-1.2.20.ebuild new file mode 100644 index 000000000000..63539ab7a600 --- /dev/null +++ b/media-sound/spotify/spotify-1.2.20.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature pax-utils unpacker xdg + +DESCRIPTION="Spotify is a social music platform" +HOMEPAGE="https://www.spotify.com/download/linux/" +SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" +BUILD_ID_AMD64="1210.g2a8a8a57" +SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" + +LICENSE="Spotify" +SLOT="0" +KEYWORDS="amd64" +IUSE="libnotify local-playback pax-kernel pulseaudio" +RESTRICT="mirror strip" + +BDEPEND=" + >=dev-util/patchelf-0.10 + sys-devel/gettext +" +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + dev-libs/openssl:0= + dev-python/dbus-python + media-libs/alsa-lib + media-libs/fontconfig + media-libs/harfbuzz + media-libs/mesa[X(+)] + net-misc/curl[ssl] + net-print/cups[ssl] + sys-apps/dbus + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/pango + !gnome-extra/gnome-integration-spotify + libnotify? ( x11-libs/libnotify ) + local-playback? ( media-video/ffmpeg:0/56.58.58 ) + pulseaudio? ( media-libs/libpulse ) + !pulseaudio? ( media-sound/apulse ) +" + #gnome-integration-spotify causes spotify to fail to launch + #sys-libs/glibc + +S="${WORKDIR}/" + +QA_PREBUILT=" + opt/spotify/spotify-client/spotify + opt/spotify/spotify-client/libEGL.so + opt/spotify/spotify-client/libGLESv2.so + opt/spotify/spotify-client/libcef.so + opt/spotify/spotify-client/libvk_swiftshader.so + opt/spotify/spotify-client/libvulkan.so.1 + opt/spotify/spotify-client/swiftshader/libEGL.so + opt/spotify/spotify-client/swiftshader/libGLESv2.so +" + +src_prepare() { + default + # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. + patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ + || die "failed to patch libcurl library dependency" +} + +src_install() { + gunzip usr/share/doc/spotify-client/changelog.gz || die + dodoc usr/share/doc/spotify-client/changelog + + SPOTIFY_PKG_HOME=usr/share/spotify + insinto /usr/share/pixmaps + doins ${SPOTIFY_PKG_HOME}/icons/*.png + + # install in /opt/spotify + SPOTIFY_HOME=/opt/spotify/spotify-client + insinto ${SPOTIFY_HOME} + doins -r ${SPOTIFY_PKG_HOME}/* + fperms +x ${SPOTIFY_HOME}/spotify + + dodir /usr/bin + SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \ + envsubst '$SPOTIFY_HOME $LIBDIR' \ + < "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die + fperms +x /usr/bin/spotify + + local size + for size in 16 22 24 32 48 64 128 256 512; do + newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ + "spotify-client.png" + done + domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" + if use pax-kernel; then + #create the headers, reset them to default, then paxmark -m them + pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die + eqawarn "You have set USE=pax-kernel meaning that you intend to run" + eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" + eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is being broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + ewarn "If Spotify crashes after an upgrade its cache may be corrupt." + ewarn "To remove the cache:" + ewarn "rm -rf ~/.cache/spotify" + + optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray +} diff --git a/media-sound/spotify/spotify-1.2.8-r1.ebuild b/media-sound/spotify/spotify-1.2.8-r1.ebuild deleted file mode 100644 index f99e0123c1f0..000000000000 --- a/media-sound/spotify/spotify-1.2.8-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature pax-utils unpacker xdg - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/download/linux/" -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" -BUILD_ID_AMD64="923.g4f94bf0d" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" - -LICENSE="Spotify" -SLOT="0" -KEYWORDS="amd64" -IUSE="libnotify local-playback pax-kernel pulseaudio" -RESTRICT="mirror strip" - -BDEPEND=" - >=dev-util/patchelf-0.10 - sys-devel/gettext -" -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/openssl:0= - dev-python/dbus-python - media-libs/alsa-lib - media-libs/fontconfig - media-libs/harfbuzz - media-libs/mesa[X(+)] - net-misc/curl[ssl] - net-print/cups[ssl] - sys-apps/dbus - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libdrm - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/pango - !gnome-extra/gnome-integration-spotify - libnotify? ( x11-libs/libnotify ) - local-playback? ( media-video/ffmpeg:0/56.58.58 ) - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-sound/apulse ) -" - #gnome-integration-spotify causes spotify to fail to launch - #sys-libs/glibc - -S="${WORKDIR}/" - -QA_PREBUILT=" - opt/spotify/spotify-client/spotify - opt/spotify/spotify-client/libEGL.so - opt/spotify/spotify-client/libGLESv2.so - opt/spotify/spotify-client/libcef.so - opt/spotify/spotify-client/libvk_swiftshader.so - opt/spotify/spotify-client/libvulkan.so.1 - opt/spotify/spotify-client/swiftshader/libEGL.so - opt/spotify/spotify-client/swiftshader/libGLESv2.so -" - -src_prepare() { - default - # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. - patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ - || die "failed to patch libcurl library dependency" -} - -src_install() { - gunzip usr/share/doc/spotify-client/changelog.gz || die - dodoc usr/share/doc/spotify-client/changelog - - SPOTIFY_PKG_HOME=usr/share/spotify - insinto /usr/share/pixmaps - doins ${SPOTIFY_PKG_HOME}/icons/*.png - - # install in /opt/spotify - SPOTIFY_HOME=/opt/spotify/spotify-client - insinto ${SPOTIFY_HOME} - doins -r ${SPOTIFY_PKG_HOME}/* - fperms +x ${SPOTIFY_HOME}/spotify - - dodir /usr/bin - SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \ - envsubst '$SPOTIFY_HOME $LIBDIR' \ - < "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die - fperms +x /usr/bin/spotify - - local size - for size in 16 22 24 32 48 64 128 256 512; do - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ - "spotify-client.png" - done - domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" - if use pax-kernel; then - #create the headers, reset them to default, then paxmark -m them - pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die - eqawarn "You have set USE=pax-kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - ewarn "If Spotify crashes after an upgrade its cache may be corrupt." - ewarn "To remove the cache:" - ewarn "rm -rf ~/.cache/spotify" - - optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray -} -- cgit v1.2.3