summaryrefslogtreecommitdiff
path: root/games-emulation
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-07 21:26:27 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-07 21:26:27 +0000
commit6c8694a707151d59555b0e4e48235f085ce166c3 (patch)
tree55a5daf0d84be7644afa7725018b5589f3369bcd /games-emulation
parent54ef05621701a320a71e56f68a0a942bc53ae0e9 (diff)
gentoo auto-resync : 07:02:2023 - 21:26:27
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/Manifest.gzbin11694 -> 11692 bytes
-rw-r--r--games-emulation/vbam/Manifest5
-rw-r--r--games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch33
-rw-r--r--games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch163
-rw-r--r--games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch27
-rw-r--r--games-emulation/vbam/vbam-2.1.4.ebuild109
6 files changed, 0 insertions, 337 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 77b007930cfc..348e248c9561 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
Binary files differ
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 74644c6ac3e8..bb0557bdb4f5 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,9 +1,4 @@
-AUX vbam-2.1.4-arm-asm.patch 1288 BLAKE2B cee8723a05887cef699864e90a5cc14db826721a4c65adc12058fdfc0c84d5b59fa8053f923edb9914147117f4fab327e7cd72498e78342123f89b66885be6d6 SHA512 3ac82dfa44c228fafadbb2cc67a6ef634eb79c8ef6bac31b1f76c6707af03a136c6ec16a1cb5b800a2232cee44e9db9ea76b2a88bdf44fb1d2c74b1dc3940a6d
-AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
-AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c
-DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
-EBUILD vbam-2.1.4.ebuild 2251 BLAKE2B 9bb3ca90cfd3bec44a598002ad917dcc6b7a8312e538bc25ca2f59cbd7f532c7fa513fa6c5771d731da7971df50c02891829cfc77f3430bff9d2daa12ea4c4cd SHA512 1fa521b6579892189ed9046785de17a4a68575f95ffe35ef86ac92c92224ec45a109124befba9709c421b2e4b5d46342c5847fd9f6fa1a171547d1d3ead69512
EBUILD vbam-2.1.5.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
EBUILD vbam-9999.ebuild 2236 BLAKE2B 7434145a698f17d1cab6f79e5679d55527af61495e530428fe3b01719e744a9da735161158e5116201dae8a709c5c404948e7ac750a4965637ce5760a5b2d1f3 SHA512 f08b26797919fd4e051f1710597b2f5e2c71f19363708a4278fdf17fe48a1d48d22f7f615b4acbd68cf51cc483413ae4c2b98a98f1a6463ac56c32983fbebeee
MISC metadata.xml 480 BLAKE2B 43f103fa39cc5a54114a29e5a4d9f317a4cb05233dbeccd74a99218d22f1b93916873756c688fecb09f14d8b84772623d9e66fa64009a014f90cc95329d38d27 SHA512 f9a74a97be6da5686189baa7c5fcb05d9742e41611383b97d071f09fd36944b37d6dbf94309de661d7cd6e17349084f0cdb25ba2b761b44064504ad28f20a76a
diff --git a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
deleted file mode 100644
index bf6e2bd70e9e..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877.patch
-https://bugs.gentoo.org/799362
-
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Fri, 4 Oct 2019 07:35:49 +0000
-Subject: [PATCH] xbrz: fix inline asm check
-
-Use correct cpp code to detect x86/amd64 architecture to use inline asm.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---- a/src/filters/xBRZ/xbrz.cpp
-+++ b/src/filters/xBRZ/xbrz.cpp
-@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
-
- inline double fastSqrt(double n)
- {
--#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION
-+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
- __asm__ ("fsqrt" : "+t" (n));
- return n;
--#elif _MSC_VER && _M_IX86
-+#elif defined(_MSC_VER) && defined(_M_IX86)
- // speeds up xBRZ by about 9% compared to std::sqrt which internally uses
- // the same assembler instructions but adds some "fluff"
- __asm {
- fld n
- fsqrt
- }
--#else // _MSC_VER && _M_X64 OR other platforms
-+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms
- // VisualStudio x86_64 does not allow inline ASM
- return std::sqrt(n);
- #endif
diff --git a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
deleted file mode 100644
index d801b08317a3..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From ae7349b06f86ff60b0d14dfa01b3fe2163dcfbab Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Wed, 13 Nov 2019 02:56:06 +0000
-Subject: [PATCH] cmake: Use list var VBAM_LIBS for link libs.
-
-Accumulate link libraries for wxvbam in the VBAM_LIBS list variable
-instead of listing every possible library variable in the
-target_link_libraries() call.
-
-This fixes the issue with trying to use OPENAL_LIBRARIES when it's set
-to NOTFOUND which generates a cmake error.
-
-Fix #563.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- src/wx/CMakeLists.txt | 43 ++++++++++++++++++++++---------------------
- 1 file changed, 22 insertions(+), 21 deletions(-)
-
-diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
-index 13e0cea7..d37c1cdd 100644
---- a/src/wx/CMakeLists.txt
-+++ b/src/wx/CMakeLists.txt
-@@ -15,6 +15,8 @@ endif()
-
- include(VbamFunctions)
-
-+set(VBAM_LIBS ${VBAMCORE_LIBS})
-+
- if(WIN32)
- # not yet implemented
- option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
-@@ -46,6 +48,8 @@ if(ENABLE_OPENAL)
- if(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
- add_definitions(-DAL_LIBTYPE_STATIC)
- endif()
-+
-+ list(APPEND VBAM_LIBS ${OPENAL_LIBRARY})
- else()
- add_definitions(-DNO_OAL)
- endif()
-@@ -58,18 +62,15 @@ if(NOT ENABLE_XAUDIO2)
- add_definitions(-DNO_XAUDIO2)
- endif()
-
--if(NOT ENABLE_FAUDIO)
-- add_definitions(-DNO_FAUDIO)
--endif()
--
- if(NOT ENABLE_DIRECT3D)
- add_definitions(-DNO_D3D)
- endif()
-
--unset(FAUDIO_LIBS)
- if(ENABLE_FAUDIO)
- find_package(FAudio REQUIRED)
-- set(FAUDIO_LIBS FAudio)
-+ list(APPEND VBAM_LIBS FAudio)
-+else()
-+ add_definitions(-DNO_FAUDIO)
- endif()
-
- # on unix we have to check for X11 before we overwrite all the compile/link
-@@ -79,7 +80,7 @@ if(NOT WIN32 AND NOT APPLE)
-
- if(X11_X11_LIB AND X11_Xscreensaver_LIB)
- include_directories(${X11_INCLUDE_DIR})
-- set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
-+ list(APPEND VBAM_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
- add_definitions(-DHAVE_XSS)
- endif()
- endif()
-@@ -419,7 +420,7 @@ int main(int argc, char** argv) {
- include_directories(${GTK4_INCLUDE_DIRS})
- link_directories(${GTK4_LIBRARY_DIRS})
- add_compile_options(${GTK4_CFLAGS_OTHER})
-- set(GTK_LIBRARIES ${GTK4_LIBRARIES})
-+ list(APPEND VBAM_LIBS ${GTK4_LIBRARIES})
- elseif(WX_USING_GTK3)
- pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
- if(NOT GTK3_INCLUDE_DIRS)
-@@ -428,7 +429,7 @@ int main(int argc, char** argv) {
- include_directories(${GTK3_INCLUDE_DIRS})
- link_directories(${GTK3_LIBRARY_DIRS})
- add_compile_options(${GTK3_CFLAGS_OTHER})
-- set(GTK_LIBRARIES ${GTK3_LIBRARIES})
-+ list(APPEND VBAM_LIBS ${GTK3_LIBRARIES})
- else()
- check_cxx_symbol_exists(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2)
- if(WX_USING_GTK2)
-@@ -438,7 +439,7 @@ int main(int argc, char** argv) {
- include_directories(${GTK2_INCLUDE_DIRS})
- link_directories(${GTK2_LIBRARY_DIRS})
- add_compile_options(${GTK2_CFLAGS_OTHER})
-- set(GTK_LIBRARIES ${GTK2_LIBRARIES})
-+ list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
- else()
- # and if that fails, use the cmake module
- find_package(GTK2 REQUIRED gtk)
-@@ -447,7 +448,7 @@ int main(int argc, char** argv) {
- endif()
- include_directories(${GTK2_INCLUDE_DIRS})
- add_compile_options(${GTK2_DEFINITIONS})
-- set(GTK_LIBRARIES ${GTK2_LIBRARIES})
-+ list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
- endif()
- else()
- find_package(GTK REQUIRED gtk)
-@@ -456,6 +457,7 @@ int main(int argc, char** argv) {
- endif()
- include_directories(${GTK_INCLUDE_DIRS})
- add_compile_options(${GTK_DEFINITIONS})
-+ list(APPEND VBAM_LIBS ${GTK_LIBRARIES})
- endif()
- endif()
- endif()
-@@ -729,14 +731,14 @@ endif()
-
- if(WIN32)
- set(SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp)
-- set(DIRECTX_LIBRARIES dxguid dsound ws2_32)
-+ list(APPEND VBAM_LIBS dxguid dsound ws2_32)
- if(MSVC)
- # workaround for some symbols needed by static SDL2.lib
-- set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version)
-+ list(APPEND VBAM_LIBS imm32 version)
- endif()
- # not strictly directx, but win32-related
- if(ENABLE_DEBUGGER)
-- set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32)
-+ list(APPEND VBAM_LIBS wsock32)
- endif()
- endif()
-
-@@ -783,19 +785,18 @@ endif()
-
- target_link_libraries(
- visualboyadvance-m
-- ${VBAMCORE_LIBS}
- ${wxWidgets_LIBRARIES}
-- ${FFMPEG_LIBRARIES}
-- ${DIRECTX_LIBRARIES}
-- ${GTK_LIBRARIES}
-- ${OPENAL_LIBRARY}
-- ${FAUDIO_LIBS}
-- ${EXTRA_X11_LIBS}
-+ ${VBAM_LIBS}
- )
-
- if(ENABLE_FFMPEG)
- join("${FFMPEG_LDFLAGS}" " " FFMPEG_LDFLAGS_STR)
-
-+ target_link_libraries(
-+ visualboyadvance-m
-+ ${FFMPEG_LIBRARIES}
-+ )
-+
- set_target_properties(
- visualboyadvance-m
- PROPERTIES LINK_FLAGS ${FFMPEG_LDFLAGS_STR}
---
-2.24.0
-
diff --git a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
deleted file mode 100644
index a528a22e506e..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
-Date: Thu, 31 Dec 2020 00:22:21 +0100
-Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum
-
-Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value:
-https://hg.libsdl.org/SDL/rev/15a0bc9612e9
-
-So this code broke as the enum value doesn't satisfy `defined()`.
----
- src/sdl/SDL.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
-index ee8ae50a3..082b47c0c 100644
---- a/src/sdl/SDL.cpp
-+++ b/src/sdl/SDL.cpp
-@@ -878,7 +878,8 @@ void sdlInitVideo()
-
- sdlResizeVideo();
- }
--#if defined(KMOD_GUI)
-+
-+#ifndef KMOD_META
- #define KMOD_META KMOD_GUI
- #endif
-
diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
deleted file mode 100644
index 8fe87b4e1480..000000000000
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg cmake
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-
-REQUIRED_USE="
- ffmpeg? ( wxwidgets )
- openal? ( wxwidgets )
- || ( sdl wxwidgets )
-"
-
-RDEPEND="
- >=media-libs/libpng-1.4:0=
- media-libs/libsdl2[joystick]
- link? ( >=media-libs/libsfml-2.0:= )
- sys-libs/zlib:=
- virtual/glu
- virtual/opengl
- lirc? ( app-misc/lirc )
- nls? ( virtual/libintl )
- wxwidgets? (
- ffmpeg? ( media-video/ffmpeg:= )
- openal? ( media-libs/openal )
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
- )
-"
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- app-arch/zip
- wxwidgets? ( virtual/imagemagick-tools )
- x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cmake_fix.patch
- "${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
- "${FILESDIR}"/${P}-arm-asm.patch
-)
-
-src_configure() {
- use wxwidgets && setup-wxwidgets
- local mycmakeargs=(
- -DENABLE_FFMPEG=$(usex ffmpeg)
- -DENABLE_LINK=$(usex link)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_NLS=$(usex nls)
- -DENABLE_SDL=$(usex sdl)
- -DENABLE_WX=$(usex wxwidgets)
- -DENABLE_ASM_CORE=$(usex x86)
- -DENABLE_ASM_SCALERS=$(usex x86)
- -DCMAKE_SKIP_RPATH=ON
- -DENABLE_LTO=OFF
- )
- if use wxwidgets; then
- mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
- fi
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use sdl ; then
- dodoc doc/ReadMe.SDL.txt
- doman src/debian/vbam.6
- fi
- use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
- if use wxwidgets ; then
- xdg_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- if use wxwidgets ; then
- xdg_pkg_postinst
- fi
-}
-
-pkg_postrm() {
- if use wxwidgets ; then
- xdg_pkg_postrm
- fi
-}