From d0c8b301a41d952762d00ce31f77bcc9e1e7bf35 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 4 Nov 2018 06:51:48 +0000 Subject: [PATCH] media-libs/libsdl2: Support app-i18n/fcitx and app-i18n/ibus. Closes: https://bugs.gentoo.org/670248 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild | 17 ++++++++++++++--- media-libs/libsdl2/metadata.xml | 2 ++ profiles/arch/alpha/package.use.mask | 4 ++++ profiles/arch/arm/package.use.mask | 4 ++++ profiles/arch/arm64/package.use.stable.mask | 4 ++++ profiles/arch/ia64/package.use.mask | 4 ++++ profiles/arch/sparc/package.use.mask | 4 ++++ 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild index 5ba649b5a7b..6c94a98ca50 100644 --- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild @@ -13,10 +13,12 @@ LICENSE="ZLIB" 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 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" +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 ) @@ -29,7 +31,9 @@ REQUIRED_USE=" 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}] @@ -65,6 +69,7 @@ CDEPEND=" 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 ) " @@ -92,7 +97,7 @@ src_prepare() { # Unbundle some headers. rm -r src/video/khronos || die - ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die + ln -s "${ESYSROOT}/usr/include" src/video/khronos || die AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf } @@ -100,6 +105,11 @@ src_prepare() { multilib_src_configure() { use custom-cflags || strip-flags + local CPPFLAGS="${CPPFLAGS}" + if use ibus; then + append-cppflags -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) @@ -166,7 +176,8 @@ multilib_src_configure() { $(use_enable vulkan video-vulkan) $(use_enable udev libudev) $(use_enable dbus) - --disable-ibus + $(use_enable ibus) + $(use_enable fcitx4 fcitx) $(use_enable tslib input-tslib) --disable-directx --disable-rpath diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index ec21c0415ca..fb417beddc0 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -24,8 +24,10 @@ Perl, PHP, Pike, Python, and Ruby. + Enable support for app-i18n/fcitx 4 include OpenGL ES 2.0 support Enable the haptic (force feedback) subsystem + Enable support for app-i18n/ibus Control joystick support (disable at your own risk) Build the KMSDRM video driver Control audio support (disable at your own risk) diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 8102c07d8c0..6aafb54f206 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arfrever Frehtes Taifersar Arahesis (2020-10-01) +# app-i18n/fcitx:4 not keyworded. +media-libs/libsdl2 fcitx4 + # Sergei Trofimovich (2020-09-18) # media-libs/libilbc is not ported to alpha net-analyzer/wireshark ilbc diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index e1ce17fcd49..614a8b394f7 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arfrever Frehtes Taifersar Arahesis (2020-10-01) +# app-i18n/fcitx:4 not keyworded. +media-libs/libsdl2 fcitx4 + # Adam Feldman (2020-09-05) # dev-util/dogtail is not keyworded for arm app-text/atril test diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask index 0b6250de5a4..4b164e2ce3c 100644 --- a/profiles/arch/arm64/package.use.stable.mask +++ b/profiles/arch/arm64/package.use.stable.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arfrever Frehtes Taifersar Arahesis (2020-10-01) +# app-i18n/fcitx:4 not stable. +media-libs/libsdl2 fcitx4 + # Sam James (2020-08-19) # Unstable dependencies for qemu # bug #738056 diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index 6fbce4a6d58..f513b2314c9 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arfrever Frehtes Taifersar Arahesis (2020-10-01) +# app-i18n/fcitx:4 not keyworded. +media-libs/libsdl2 fcitx4 + # Sergei Trofimovich (2020-09-18) # media-libs/libilbc is not ported to ia64 net-analyzer/wireshark ilbc diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 4f6382988e6..2a8311ebd44 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arfrever Frehtes Taifersar Arahesis (2020-10-01) +# app-i18n/fcitx:4 not keyworded. +media-libs/libsdl2 fcitx4 + # Matt Turner (2020-08-11) # No drivers on this architecture support Vulkan media-libs/mesa vulkan vulkan-overlay zink -- 2.28.0