From 4e4ee9865a958b6a854f9bca96637244c628d525 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2023 18:06:43 +0100 Subject: gentoo auto-resync : 09:10:2023 - 18:06:43 --- media-sound/spotify/Manifest | 4 +- media-sound/spotify/files/spotify-wrapper | 11 --- media-sound/spotify/spotify-1.2.20-r2.ebuild | 132 --------------------------- media-sound/spotify/spotify-1.2.20-r3.ebuild | 130 ++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 145 deletions(-) delete mode 100644 media-sound/spotify/spotify-1.2.20-r2.ebuild create mode 100644 media-sound/spotify/spotify-1.2.20-r3.ebuild (limited to 'media-sound/spotify') diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 2c23472e1b76..bc71b1c7dc1e 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,4 +1,4 @@ -AUX spotify-wrapper 1377 BLAKE2B b75890e77c96198d7bd788b5d954fb5c10095d9ca59e2c33a48003d5e559231db7aade027206da7d96f9c7bb6c19482c4d382918262e25c912cf47975a990793 SHA512 553d25d286368b1600bb7dc5c3ab681b380e9c9ff30df335796952c86e77912775ddeee03db348220e9d84a4bc32f4a8d85c7a1551a60e4155ee960b4a6d8799 +AUX spotify-wrapper 922 BLAKE2B c3ac2049a1302ec6ac0c1dc4c1514199c49a87474ef77c392e0ce5c2dba65788255e5b04dc3b8142fd8f315ebfd2491a7ec259d6347357e059fd0e2f7f777caf SHA512 f658cd4338c3072638d39d79eb6b1a5d959cfd4398dbb08d5cd108ab246c43e337ad11cf10a25c57cad12c8342526f8928c992e81d0c5c678fc5056f8832f42c DIST spotify-client_1.2.20.1210.g2a8a8a57_amd64.deb 124183006 BLAKE2B 32f48b06311d25ced25516e8a521dd87ebd44179fdb93b6f5ba53636eb4b53b5be97092d227968846188f0d51d9a8f6f2e350d009b797519d1cb0f252783076d SHA512 a527d6fecec9fa925d8c60e0ba8764ec8f53d3f5268d0b968d3bdeca7d367081f7faa0bcd1fe016491f15e37a1238ad40dbca1fc93b2533e0238e7a7a07f352b -EBUILD spotify-1.2.20-r2.ebuild 3776 BLAKE2B ea7cac96bafad1bfa1cf4d2aa15a85061a73a66cd62acf5604282ea26c91d1794f0aa7d34d47a421819853d1bba6fe524dc6c4386658123ee3ffa3a35c5e9562 SHA512 42bb39179ef25f340e3ea43a3b5ebb908512338ac28c1556c01c90cc01ca154e93150c0d05691f721aa5d842ac97ef0192f4912f219df5d61ba8eba44fe73641 +EBUILD spotify-1.2.20-r3.ebuild 3688 BLAKE2B 68697650937820a6c7ea7b908ff54e3faa1e82c5e2a677685626e50ea10099b58693ae85d4931df179448ff840333ff13db668abbd94adee00acc5e0be1bffec SHA512 389febcee44203d6e26867851ab9b9988b424b321e6270b42aeba0979ed52bf097da44eae3d17acc8b5bde661e34783f2876a1f7074a3363e431935d717d20ec MISC metadata.xml 521 BLAKE2B 6859f340482640ec95ed103b2ca4b1e6c316509d8b87402068e1164a4efeaac9cf8ac5360ea038eb09c3682dd8e8e10a9cc872a3820c1a8341fcccaab34e0a18 SHA512 7527cfdf2d421e1bd7c156b930f980a464fad60f2ba2fafa5b79e4f04baad97a6ce3176987e8a32c8b5bcae20acf2b416812b26de1f7bc76205e0d8bee4e98e8 diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper index 862fa4c680d6..0d7295af5ca1 100644 --- a/media-sound/spotify/files/spotify-wrapper +++ b/media-sound/spotify/files/spotify-wrapper @@ -5,17 +5,6 @@ export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse" if command -v spotify-dbus.py > /dev/null; then echo "Launching spotify with Gnome systray integration." spotify-dbus.py "$@" -elif [ -e "$SPOTIFY_HOME/spotify-tray" ] > /dev/null; then - echo "Launching spotify with generic systray integration." - minimized= - for arg; do - if [ "$arg" = --minimized ]; then - minimized=$arg - break - fi - done - GDK_BACKEND="x11" "$SPOTIFY_HOME/spotify-tray" \ - --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@" else if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}" diff --git a/media-sound/spotify/spotify-1.2.20-r2.ebuild b/media-sound/spotify/spotify-1.2.20-r2.ebuild deleted file mode 100644 index 7d4a9417eaec..000000000000 --- a/media-sound/spotify/spotify-1.2.20-r2.ebuild +++ /dev/null @@ -1,132 +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="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 ) - dev-libs/libayatana-appindicator - 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.20-r3.ebuild b/media-sound/spotify/spotify-1.2.20-r3.ebuild new file mode 100644 index 000000000000..333a0fd7c799 --- /dev/null +++ b/media-sound/spotify/spotify-1.2.20-r3.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop 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 ) + dev-libs/libayatana-appindicator + 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" +} -- cgit v1.2.3