Diff deadbeef-1.9.5-r3 with a deadbeef-1.9.6_beta1

/usr/portage/media-sound/deadbeef/deadbeef-1.9.6_beta1.ebuild 2023-10-09 14:52:31.772368408 +0300
5 5

  
6 6
inherit autotools xdg flag-o-matic toolchain-funcs plocale
7 7

  
8
MY_PV=${PV/_/-}
9
DL_PV=$(ver_cut 1-2)
10

  
8 11
DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
9 12
HOMEPAGE="https://deadbeef.sourceforge.io/"
10
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
13
SRC_URI="https://sourceforge.net/projects/${PN}/files/travis/linux/${DL_PV}/deadbeef-${MY_PV}.tar.bz2/download
14
	-> ${P}.tar.bz2"
15
S="${WORKDIR}"/${PN}-${MY_PV}
11 16

  
12 17
LICENSE="
13 18
	GPL-2
......
15 20
	wavpack? ( BSD )
16 21
"
17 22
SLOT="0"
18
KEYWORDS="amd64 ~riscv x86"
19
IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libretro libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec +supereq threads vorbis wavpack"
23
IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libretro libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec +supereq vorbis wavpack"
20 24

  
21 25
REQUIRED_USE="
22 26
	|| ( alsa oss pulseaudio pipewire nullout )
23 27
"
24 28

  
25 29
DEPEND="
26
	x11-libs/gtk+:3
27
	net-misc/curl:=
30
	>=app-accessibility/at-spi2-core-2.46.0
31
	dev-libs/glib:2
28 32
	dev-libs/jansson:=
33
	dev-libs/libdispatch
34
	net-misc/curl
35
	x11-libs/cairo
36
	x11-libs/gdk-pixbuf:2
37
	x11-libs/gtk+:3
38
	x11-libs/libX11
39
	x11-libs/pango
29 40
	aac? ( media-libs/faad2 )
30 41
	alsa? ( media-libs/alsa-lib )
31 42
	cdda? (
32 43
		dev-libs/libcdio:=
33 44
		media-libs/libcddb
34
		dev-libs/libcdio-paranoia:=
35
	)
36
	cover? (
37
		media-libs/imlib2[jpeg,png]
45
		media-sound/cdparanoia
38 46
	)
47
	cover? ( media-libs/imlib2[jpeg,png] )
39 48
	dts? ( media-libs/libdca )
40 49
	ffmpeg? ( media-video/ffmpeg:= )
41 50
	flac? (
......
46 55
	mp3? ( media-sound/mpg123 )
47 56
	musepack? ( media-sound/musepack-tools )
48 57
	nls? ( virtual/libintl )
49
	notify? (
50
		sys-apps/dbus
51
	)
58
	notify? ( sys-apps/dbus )
52 59
	opus? ( media-libs/opusfile )
53 60
	pulseaudio? ( media-libs/libpulse )
54
	pipewire? ( media-video/pipewire )
61
	pipewire? ( media-video/pipewire:= )
55 62
	vorbis? ( media-libs/libvorbis )
56 63
	wavpack? ( media-sound/wavpack )
57
	dev-libs/libdispatch:=
58 64
"
59 65

  
60 66
RDEPEND="${DEPEND}"
61 67
BDEPEND="
62 68
	dev-util/intltool
63
	sys-devel/gettext
64 69
	sys-devel/clang
70
	>=sys-devel/gettext-0.21
65 71
	sys-devel/llvm
66 72
	virtual/pkgconfig
67 73
"
68 74

  
69 75
PATCHES=(
70
	"${FILESDIR}/deadbeef-1.9.2-drop-Werror.patch"
76
	"${FILESDIR}"/${PN}-1.9.6-drop-Werror.patch
77
	"${FILESDIR}"/${PN}-1.9.6-update-gettext.patch
78
	"${FILESDIR}"/${PN}-1.9.6-fix-desktop-launcher.patch
71 79
)
72 80

  
73 81
src_prepare() {
......
78 86
	}
79 87

  
80 88
	drop_and_stub() {
81
		rm -rf "${1}"
82
		mkdir "${1}"
83
		cat > "${1}/Makefile.in" <<-EOF
89
		einfo drop_and_stub "${1}"
90
		rm -r "${1}" || die
91
		mkdir "${1}" || die
92
		cat > "${1}/Makefile.in" <<-EOF || die
84 93
			all: nothing
85 94
			install: nothing
86 95
			nothing:
......
93 102
	eautoreconf
94 103

  
95 104
	# Get rid of bundled gettext. (Avoid build failures with musl)
96
	use elibc_musl || drop_and_stub "${S}/intl"
105
	drop_and_stub "${S}/intl"
97 106

  
98 107
	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
99 108
	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
100 109
		drop_and_stub "${S}/plugins/${i}"
101 110
	done
102 111

  
103
	rm -rf "${S}/plugins/rg_scanner/ebur128"
112
	rm -r "${S}/plugins/rg_scanner/ebur128" || die
104 113
}
105 114

  
106 115
src_configure () {
......
152 161
		"$(use_enable mp3 libmpg123)"
153 162
		"$(use_enable nls)"
154 163
		"$(use_enable vorbis)"
155
		"$(use_enable threads)"
156 164
		"$(use_enable flac)"
157 165
		"$(use_enable supereq)"
158 166
		"$(use_enable cdda)"
Thank you!