Attachment #665675 for bug #670248




SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"

IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
REQUIRED_USE="
	alsa? ( sound )
	fcitx4? ( dbus )
	gles2? ( video )
	ibus? ( dbus )
	jack? ( sound )
	nas? ( sound )
	opengl? ( video )

CDEPEND="
	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
	fcitx4? ( app-i18n/fcitx:4 )
	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
	ibus? ( app-i18n/ibus )
	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
	kms? (
		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]

RDEPEND="${CDEPEND}
	vulkan? ( media-libs/vulkan-loader )"
DEPEND="${CDEPEND}
	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
	vulkan? ( dev-util/vulkan-headers )
	X? ( x11-base/xorg-proto )
"


	# Unbundle some headers.
	rm -r src/video/khronos || die
	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die

	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
}

multilib_src_configure() {
	use custom-cflags || strip-flags

	if use ibus; then
		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
	fi

	# sorted by `./configure --help`
	local myeconfargs=(
		$(use_enable static-libs static)

		$(use_enable vulkan video-vulkan)
		$(use_enable udev libudev)
		$(use_enable dbus)
		$(use_enable fcitx4 fcitx)
		$(use_enable ibus)
		$(use_enable tslib input-tslib)
		--disable-directx
		--disable-rpath

Lines 24-31 Link Here

(-)a/media-libs/libsdl2/metadata.xml (+2 lines)
24	Perl, PHP, Pike, Python, and Ruby.	24	Perl, PHP, Pike, Python, and Ruby.
25	</longdescription>	25	</longdescription>
26	<use>	26	<use>
		27	<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
27	<flag name="gles2">include OpenGL ES 2.0 support</flag>	28	<flag name="gles2">include OpenGL ES 2.0 support</flag>
28	<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>	29	<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
		30	<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
29	<flag name="joystick">Control joystick support (disable at your own risk)</flag>	31	<flag name="joystick">Control joystick support (disable at your own risk)</flag>
30	<flag name="kms">Build the KMSDRM video driver</flag>	32	<flag name="kms">Build the KMSDRM video driver</flag>
31	<flag name="sound">Control audio support (disable at your own risk)</flag>	33	<flag name="sound">Control audio support (disable at your own risk)</flag>

Lines 1-6 Link Here

(-)a/profiles/arch/alpha/package.use.mask (+4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		5	# app-i18n/fcitx:4 not keyworded.
		6	media-libs/libsdl2 fcitx4
		7
4	# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)	8	# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)
5	# media-libs/libilbc is not ported to alpha	9	# media-libs/libilbc is not ported to alpha
6	net-analyzer/wireshark ilbc	10	net-analyzer/wireshark ilbc

Lines 1-6 Link Here

(-)a/profiles/arch/arm/package.use.mask (+4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		5	# app-i18n/fcitx:4 not keyworded.
		6	media-libs/libsdl2 fcitx4
		7
4	# Mark Wright <gienah@gentoo.org> (2020-10-11)	8	# Mark Wright <gienah@gentoo.org> (2020-10-11)
5	# dev-ml/ppx_jane is not keyworded	9	# dev-ml/ppx_jane is not keyworded
6	dev-ml/cinaps test	10	dev-ml/cinaps test

Lines 1-6 Link Here

(-)a/profiles/arch/arm64/package.use.stable.mask (+4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		5	# app-i18n/fcitx:4 not stable.
		6	media-libs/libsdl2 fcitx4
		7
4	# Sam James <sam@gentoo.org> (2020-10-06)	8	# Sam James <sam@gentoo.org> (2020-10-06)
5	# Not yet stable on arm64.	9	# Not yet stable on arm64.
6	media-plugins/gst-plugins-meta dvb vpx	10	media-plugins/gst-plugins-meta dvb vpx

Lines 17-22 Link Here

(-)a/profiles/arch/hppa/package.use.stable.mask (+4 lines)
17		17
18	#--- END OF EXAMPLES ---	18	#--- END OF EXAMPLES ---
19		19
		20	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		21	# app-i18n/fcitx:4 not stable.
		22	media-libs/libsdl2 fcitx4
		23
20	# Rolf Eike Beer <eike@sf-mail.de> (2020-06-10)	24	# Rolf Eike Beer <eike@sf-mail.de> (2020-06-10)
21	# not stable dev-vcs/mercurial because of broken dependencies: bug #727390	25	# not stable dev-vcs/mercurial because of broken dependencies: bug #727390
22	app-portage/layman mercurial	26	app-portage/layman mercurial

Lines 1-6 Link Here

(-)a/profiles/arch/ia64/package.use.mask (+4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		5	# app-i18n/fcitx:4 not keyworded.
		6	media-libs/libsdl2 fcitx4
		7
4	# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)	8	# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)
5	# media-libs/libilbc is not ported to ia64	9	# media-libs/libilbc is not ported to ia64
6	net-analyzer/wireshark ilbc	10	net-analyzer/wireshark ilbc

Lines 1-6 Link Here

(-)a/profiles/arch/sparc/package.use.mask (-1 / +4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
		5	# app-i18n/fcitx:4 not keyworded.
		6	media-libs/libsdl2 fcitx4
		7
4	# Matt Turner <mattst88@gentoo.org> (2020-08-11)	8	# Matt Turner <mattst88@gentoo.org> (2020-08-11)
5	# No drivers on this architecture support Vulkan	9	# No drivers on this architecture support Vulkan
6	media-libs/mesa vulkan vulkan-overlay zink	10	media-libs/mesa vulkan vulkan-overlay zink
7	-

Return to bug 670248

Lines 13-22 LICENSE="ZLIB" Link Here

(-)a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild (-3 / +13 lines)
13	SLOT="0"	13	SLOT="0"
14	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"	14	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
15		15
16	IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"	16	IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
17	REQUIRED_USE="	17	REQUIRED_USE="
18	alsa? ( sound )	18	alsa? ( sound )
		19	fcitx4? ( dbus )
19	gles2? ( video )	20	gles2? ( video )
		21	ibus? ( dbus )
20	jack? ( sound )	22	jack? ( sound )
21	nas? ( sound )	23	nas? ( sound )
22	opengl? ( video )	24	opengl? ( video )
Lines 29-35 REQUIRED_USE=" Link Here
29	CDEPEND="	31	CDEPEND="
30	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )	32	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
31	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )	33	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
		34	fcitx4? ( app-i18n/fcitx:4 )
32	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )	35	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
		36	ibus? ( app-i18n/ibus )
33	jack? ( virtual/jack[${MULTILIB_USEDEP}] )	37	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
34	kms? (	38	kms? (
35	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]	39	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
Lines 65-70 CDEPEND=" Link Here
65	RDEPEND="${CDEPEND}	69	RDEPEND="${CDEPEND}
66	vulkan? ( media-libs/vulkan-loader )"	70	vulkan? ( media-libs/vulkan-loader )"
67	DEPEND="${CDEPEND}	71	DEPEND="${CDEPEND}
		72	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
68	vulkan? ( dev-util/vulkan-headers )	73	vulkan? ( dev-util/vulkan-headers )
69	X? ( x11-base/xorg-proto )	74	X? ( x11-base/xorg-proto )
70	"	75	"
Lines 92-98 src_prepare() { Link Here
92		97
93	# Unbundle some headers.	98	# Unbundle some headers.
94	rm -r src/video/khronos \|\| die	99	rm -r src/video/khronos \|\| die
95	ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos \|\| die	100	ln -s "${ESYSROOT}/usr/include" src/video/khronos \|\| die
96		101
97	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf	102	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
98	}	103	}
Lines 100-105 src_prepare() { Link Here
100	multilib_src_configure() {	105	multilib_src_configure() {
101	use custom-cflags \|\| strip-flags	106	use custom-cflags \|\| strip-flags
102		107
		108	if use ibus; then
		109	local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
		110	fi
		111
103	# sorted by `./configure --help`	112	# sorted by `./configure --help`
104	local myeconfargs=(	113	local myeconfargs=(
105	$(use_enable static-libs static)	114	$(use_enable static-libs static)
Lines 166-172 multilib_src_configure() { Link Here
166	$(use_enable vulkan video-vulkan)	175	$(use_enable vulkan video-vulkan)
167	$(use_enable udev libudev)	176	$(use_enable udev libudev)
168	$(use_enable dbus)	177	$(use_enable dbus)
169	--disable-ibus	178	$(use_enable fcitx4 fcitx)
		179	$(use_enable ibus)
170	$(use_enable tslib input-tslib)	180	$(use_enable tslib input-tslib)
171	--disable-directx	181	--disable-directx
172	--disable-rpath	182	--disable-rpath