* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/files/, games-emulation/mgba/
@ 2020-02-01 3:11 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2020-02-01 3:11 UTC (permalink / raw
To: gentoo-commits
commit: 8136abfbeda3d5b792d2b8a388c466a1da4f7ad0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 03:03:56 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 03:11:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8136abfb
games-emulation/mgba: Fixed build with USE="qt -sdl"
Thanks-to: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Closes: https://bugs.gentoo.org/707578
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch | 50 ++++++++++++++++++++++
games-emulation/mgba/mgba-0.8.0.ebuild | 4 ++
2 files changed, 54 insertions(+)
diff --git a/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch b/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
new file mode 100644
index 00000000000..d89828976cd
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
@@ -0,0 +1,50 @@
+From aa3403401bfb7259795313603929586bee91ce1b Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+Date: Fri, 31 Jan 2020 18:09:58 -0800
+Subject: [PATCH] Qt: Fix non-SDL build (fixes #1656)
+
+---
+ CHANGES | 3 +++
+ src/platform/qt/InputController.cpp | 12 ++++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/CHANGES b/CHANGES
+index 7aac48d6..6418b059 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -1,3 +1,6 @@
++Misc:
++ - Qt: Fix non-SDL build (fixes mgba.io/i/1656)
++
+ 0.8.0: (2020-01-21)
+ Features:
+ - Improved logging configuration
+diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
+index 77ee0704..c6a598ce 100644
+--- a/src/platform/qt/InputController.cpp
++++ b/src/platform/qt/InputController.cpp
+@@ -271,9 +271,21 @@ void InputController::setPreferredGamepad(uint32_t type, int index) {
+ if (!m_config) {
+ return;
+ }
++#ifdef BUILD_SDL
+ char name[34] = {0};
++#if SDL_VERSION_ATLEAST(2, 0, 0)
+ SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick), name, sizeof(name));
++#else
++ const char* name = SDL_JoystickName(SDL_JoystickIndex(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick));
++ if (!name) {
++ return;
++ }
++#endif
+ mInputSetPreferredDevice(m_config->input(), "gba", type, m_playerId, name);
++#else
++ UNUSED(type);
++ UNUSED(index);
++#endif
+ }
+
+ mRumble* InputController::rumble() {
+--
+2.25.0
+
diff --git a/games-emulation/mgba/mgba-0.8.0.ebuild b/games-emulation/mgba/mgba-0.8.0.ebuild
index 3543aa68ebf..cc49129ae05 100644
--- a/games-emulation/mgba/mgba-0.8.0.ebuild
+++ b/games-emulation/mgba/mgba-0.8.0.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-no_sdl.patch" #707578
+)
+
src_prepare() {
xdg_environment_reset
cmake_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/files/, games-emulation/mgba/
@ 2022-10-12 13:47 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-10-12 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 90cba4bfd9f0be33fb8bf3346aee1d623e2816e2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 11:22:02 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:43:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cba4bf
games-emulation/mgba: add 0.10.0
ebuild updates:
- require sqlite with USE=gui and enable by default (segfaults without)
- enable opengl by default for non-desktop profiles, sdl build is not
very useful without this or gles2
- check for gles2 on libsdl2 too (gles3 only seem to work with Qt)
- patch to disable Qt's updater, not only is it not needed but it has
incompatible pointer type issues (broken with clang16)
- drop || ( gui sdl ) required use (allows library-only build,
albeit no in-tree consumers for this currently)
- change subslot to 0/$(ver_cut 1-2) rather than 0/10 (matches SONAME).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/mgba/Manifest | 1 +
.../mgba/files/mgba-0.10.0-optional-updater.patch | 7 ++
games-emulation/mgba/mgba-0.10.0.ebuild | 106 +++++++++++++++++++++
3 files changed, 114 insertions(+)
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 04860f9d3a06..b7b04e1c2f88 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1 +1,2 @@
+DIST mgba-0.10.0.tar.gz 14302653 BLAKE2B 0ebfa8a3de5db61452f070116fcf2d6312ce96f5d08b1b1e70ba8f7e50235fecff2a0f6a5a32860b7e95e55a6ab5bbf2227d483bad7eb25d6c7e471424bcf0dd SHA512 05939f94bc00906d999b955091e8e8059cc13a5b822048f6e002062c2e74069337d947d2cde2f8c1be96e3353a361743d752811c214fa9da31ed6a4893b4d7e8
DIST mgba-0.9.3.tar.gz 12763090 BLAKE2B 7d9ff6fc7bdff5d734540b74893a888d400b4bb6e1ce5b3b2a856239db8798ac76b8535dc770330d0451e2568a6d402558eeef27d643c0d5d3454441f45cf09b SHA512 da65b3c7ec32d732163f129c4fd38949ae2da2980beb3257bf6def5e35534a27b6d30309bb3c9a8d651642f99e1a45db7a8577c8dbf5472153d4551167471b3a
diff --git a/games-emulation/mgba/files/mgba-0.10.0-optional-updater.patch b/games-emulation/mgba/files/mgba-0.10.0-optional-updater.patch
new file mode 100644
index 000000000000..5a8f84beaa07
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.10.0-optional-updater.patch
@@ -0,0 +1,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -980,3 +980,3 @@
+ if(BUILD_QT AND (WIN32 OR APPLE OR CMAKE_SYSTEM_NAME STREQUAL "Linux"))
+- set(BUILD_UPDATER ON)
++ set(BUILD_UPDATER ON CACHE BOOL "")
+ endif()
diff --git a/games-emulation/mgba/mgba-0.10.0.ebuild b/games-emulation/mgba/mgba-0.10.0.ebuild
new file mode 100644
index 000000000000..a2fb0f2ce948
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.10.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3..4} )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
+else
+ SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Game Boy Advance Emulator"
+HOMEPAGE="https://mgba.io/"
+
+LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro lua +opengl +sdl +sqlite test"
+REQUIRED_USE="
+ gui? ( || ( gles2 gles3 opengl ) sqlite )
+ lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libpng:=
+ sys-libs/zlib:=[minizip]
+ debug? ( dev-libs/libedit )
+ elf? ( dev-libs/elfutils )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gles2? ( media-libs/libglvnd )
+ gles3? ( media-libs/libglvnd )
+ lua? ( ${LUA_DEPS} )
+ opengl? ( media-libs/libglvnd )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ )
+ sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
+ sqlite? ( dev-db/sqlite:3 )"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="lua? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
+)
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CINEMA=$(usex test)
+ -DBUILD_GL=$(usex opengl)
+ -DBUILD_GLES2=$(usex gles2)
+ -DBUILD_GLES3=$(usex gles3)
+ -DBUILD_LIBRETRO=$(usex libretro)
+ -DBUILD_QT=$(usex gui)
+ -DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
+ -DBUILD_SUITE=$(usex test)
+ -DBUILD_UPDATER=OFF
+ -DENABLE_SCRIPTING=$(usex lua)
+ -DMARKDOWN=OFF #752048
+ -DUSE_DEBUGGERS=$(usex debug)
+ -DUSE_DISCORD_RPC=$(usex discord)
+ -DUSE_EDITLINE=$(usex debug)
+ -DUSE_ELF=$(usex elf)
+ -DUSE_EPOXY=OFF
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_GDB_STUB=$(usex debug)
+ -DUSE_LIBZIP=OFF
+ -DUSE_LZMA=ON
+ -DUSE_MINIZIP=ON
+ -DUSE_PNG=ON
+ -DUSE_SQLITE3=$(usex sqlite)
+ -DUSE_ZLIB=ON
+ $(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
+ )
+ use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+ local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ use !test || rm "${ED}"/usr/bin/mgba-cinema || die
+
+ rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-12 13:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-01 3:11 [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/files/, games-emulation/mgba/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-10-12 13:47 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox