public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
@ 2016-12-11 13:49 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2016-12-11 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6600eb6642e3f67d15edb73522aa406caad8f7f9
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 19 15:10:43 2015 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 13:48:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6600eb66

games-emulation/vbam: Add new snapshot

Gentoo-bug: 568802, 592098, 601838
* [QA] Remove games.eclass
* EAPI=6
* Respect user flags

Package-Manager: portage-2.2.26
Closes: https://github.com/gentoo/gentoo/pull/3076

 games-emulation/vbam/Manifest                      |   1 +
 .../vbam-2.0.0_beta2-fix-install-path-bin.patch    |  10 ++
 .../files/vbam-2.0.0_beta2-fix-zlib-macros.patch   |   7 +
 .../vbam-2.0.0_beta2-remove-hardcoded-flags.patch  | 187 +++++++++++++++++++++
 .../vbam/files/vbam-2.0.0_pre1507-man.patch        |   4 +-
 .../vbam/vbam-2.0.0_beta2_pre20161211.ebuild       | 103 ++++++++++++
 6 files changed, 310 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index ba7e08e..eebfa6a 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,3 +1,4 @@
+DIST vbam-2.0.0_beta2_pre20161211.tar.gz 3075570 SHA256 32902dd418446ed8150098e776eecb0e8567cb39c36037eb0d19d0973e071043 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40 WHIRLPOOL 06ec3273abf1454b908a24825cb1db9d32d4ce2c9ac417066809174ae82e74b3b7477bdcac711aabe0540e8e3ef706453bb6cfbfc4c7a19267658440a632e39e
 DIST vbam-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch 3205 SHA256 88ddcf60842fb0156277ef2533d3b0e4f6a6a5266ec33176c390c89d4819e17e SHA512 c9a1545967d1ee2fa6510f69183e491df7800639c995ad8f9259daac698471ac02097610008181a045d280d6d3b5a472e7b900bf99f61db1f30c0759e216f6ea WHIRLPOOL 1f40ea9fbc10a95a3dad7e7805e6687f59b21d274d328f7310997d8230d61958df834791289fa54333d1bfaf1cef4cb3492a717ebe30b1ba86171721f742ea33
 DIST vbam-2.0.0_pre1507-ffmpeg3_defines.patch 1848 SHA256 03f3d7e1c73ef63fe8710e60711b4c1c0e5881d6bdd02bdfc38d71d7730d22f5 SHA512 fb2b2ab6ae4a07b3509da4ba366c422f1cb0dda8669ad23a4cd312398c73598a47654bba5ff5450d4cf0f553adf917a9549ded5e8b4da806eefb468c4dbdfb38 WHIRLPOOL 6f632bc8ed402565c81c95a769568b006e99720c1569bfd0f3a03b9a1466b75e0a4b350dc930b079017085fecf1b02df6a84d2a1ab14e3035a4f6b6096f6838f
 DIST vbam-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch 1552 SHA256 56060f51079a7beb51c0d519110799ae1eae164a01db5ada4383d2f11cec6ef7 SHA512 61623cbcdf77114c371b6add7d86579c262e573c6aa4515f12b2a6e01b9aa83f8330cf9aec5ffde1cac66eeb3e66418687d16811bbaea6d148202a5a9083328c WHIRLPOOL 75a5d268ce55f989e1cfef92062d0d6e911a27186e12d2964516d1ce5d1054005eb2f8433689b2e431b4852e55d0ba5bbcba3be7dedff34a18da344d39f3d5c7

diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch
new file mode 100644
index 00000000..ceb7dd9
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch
@@ -0,0 +1,10 @@
+--- a/src/wx/CMakeLists.txt
++++ b/src/wx/CMakeLists.txt
+@@ -247,6 +247,7 @@
+     INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})
+ ENDIF(WIN32)
+ IF(NOT WIN32 AND NOT APPLE)
++    INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
+ ENDIF(NOT WIN32 AND NOT APPLE)
+ 

diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch
new file mode 100644
index 00000000..57b2a25
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch
@@ -0,0 +1,7 @@
+--- a/src/common/memgzio.c
++++ b/src/common/memgzio.c
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /* gzio.c -- IO on .gz files
+  * Copyright (C) 1995-2002 Jean-loup Gailly.
+  * For conditions of distribution and use, see copyright notice in zlib.h

diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch
new file mode 100644
index 00000000..5afc73e
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch
@@ -0,0 +1,187 @@
+Remove hardcoded flags. This inhibits user flags, which is required by QA.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,10 +3,6 @@
+ 
+ cmake_minimum_required( VERSION 3.3.2 )
+ 
+-IF(CMAKE_BUILD_TYPE STREQUAL "")
+-    SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
+-ENDIF()
+-
+ SET(ALL_TARGETS fex gvbam visualboyadvance-m vbamcore vbam)
+ 
+ if( COMMAND cmake_policy )
+@@ -28,6 +24,11 @@
+ SET(ASM_SCALERS_DEFAULT OFF)
+ SET(MMX_DEFAULT OFF)
+ 
++# Require C++11 support
++SET(CMAKE_CXX_STANDARD 11)
++SET(CMAKE_CXX_STANDARD_REQUIRED ON)
++SET(CMAKE_CXX_EXTENSIONS OFF)
++
+ # turn asm on by default on 32bit x86
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|[aA][mM][dD]64|[xX]64")
+     IF(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
+@@ -101,12 +102,6 @@
+     endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+ ENDIF( NOT VERSION )
+ 
+-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-    ADD_DEFINITIONS(-DDEBUG)
+-ELSE()
+-    ADD_DEFINITIONS(-DNDEBUG)
+-ENDIF()
+-
+ # Add support for Homebrew, MacPorts and Fink on OS X
+ IF(APPLE)
+     INCLUDE(MacPackageManagers)
+@@ -261,96 +256,9 @@
+     INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/include")
+ ENDIF()
+ 
+-# Compiler flags
+-
+-IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    SET(LTO_FLAG "")
+-    IF(ENABLE_LTO)
+-        IF(CMAKE_COMPILER_IS_GNUCXX)
+-            SET(LTO_FLAG -flto=10)
+-        ELSE()
+-            SET(LTO_FLAG -flto)
+-        ENDIF()
+-    ENDIF(ENABLE_LTO)
+-
+-    # common optimization flags
+-    SET(MY_C_AND_CXX_OPT_FLAGS -O2 -mtune=generic -fomit-frame-pointer ${LTO_FLAG})
+-
+-    # common debug flags
+-    IF(CMAKE_COMPILER_IS_GNUCXX)
+-        SET(MY_C_AND_CXX_DBG_FLAGS -ggdb3 -Og)
+-    ELSE()
+-        SET(MY_C_AND_CXX_DBG_FLAGS -g)
+-    ENDIF()
+-
+-    # common flags
+-    SET(MY_C_AND_CXX_FLAGS -pipe -fPIC -Wformat -Wformat-security -fstack-protector-strong --param ssp-buffer-size=4 -fexceptions -D_FORTIFY_SOURCE=2 -feliminate-unused-debug-types)
+-
+-    SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_FLAGS})
+-    SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_FLAGS})
+-
+-    IF(MINGW)
+-        SET(MY_C_FLAGS   ${MY_C_FLAGS}   -static-libgcc)
+-        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} -static-libgcc -static-libstdc++)
+-    ENDIF(MINGW)
+-
+-    IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+-        SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
+-        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
+-    ELSE()
+-        SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
+-        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
+-    ENDIF()
+-
+-    FOREACH(C_COMPILE_FLAG ${MY_C_FLAGS})
+-        ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C>:${C_COMPILE_FLAG}>)
+-    ENDFOREACH()
+-
+-    FOREACH(CXX_COMPILE_FLAG ${MY_CXX_FLAGS})
+-        ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:${CXX_COMPILE_FLAG}>)
+-    ENDFOREACH()
+-
+-    # make a string of compile options to add to link flags
+-    UNSET(C_COMPILE_FLAGS_STR)
+-    UNSET(CXX_COMPILE_FLAGS_STR)
+-
+-    FOREACH(ARG ${MY_C_FLAGS})
+-        SET(C_COMPILE_FLAGS_STR "${C_COMPILE_FLAGS_STR} ${ARG}")
+-    ENDFOREACH()
+-
+-    FOREACH(ARG ${MY_CXX_FLAGS})
+-        SET(CXX_COMPILE_FLAGS_STR "${CXX_COMPILE_FLAGS_STR} ${ARG}")
+-    ENDFOREACH()
+-
+-    # need all flags for linking, because of -flto etc.
+-    SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   ${C_COMPILE_FLAGS_STR}")
+-    SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${CXX_COMPILE_FLAGS_STR}")
+-
+-    # for the gcc -fstack-protector* flags we need libssp
+-    # we also have to use the gcc- binutils for LTO to work
+-    IF(CMAKE_COMPILER_IS_GNUCXX)
+-        INCLUDE(UseGCCBinUtilsWrappers)
+-
+-        IF(WIN32)
+-            SET(SSP_STATIC ON)
+-        ENDIF(WIN32)
+-
+-        FIND_PACKAGE(SSP)
+-
+-        IF(SSP_LIBRARY)
+-            SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   ${SSP_LIBRARY}")
+-            SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${SSP_LIBRARY}")
+-        ENDIF(SSP_LIBRARY)
+-
+-        SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   -Wl,-allow-multiple-definition")
+-        SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,-allow-multiple-definition")
+-    ENDIF()
+-ENDIF()
+-
+ # Assembler flags
+-
+ IF(ASM_ENABLED)
+-    FOREACH(ASM_FLAG -I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -O1 -w-orphan-labels)
++    FOREACH(ASM_FLAG -I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -w-orphan-labels)
+         ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:ASM_NASM>:${ASM_FLAG}>)
+     ENDFOREACH()
+ ENDIF(ASM_ENABLED)
+--- a/src/gtk/CMakeLists.txt
++++ b/src/gtk/CMakeLists.txt
+@@ -1,6 +1,3 @@
+-#Do not use this file directly.  Always use the top level CMakeLists.txt file
+-SET( CMAKE_CXX_FLAGS -std=gnu++11 )
+-
+ #GTK dependencies
+ FIND_PACKAGE ( PkgConfig REQUIRED )
+ FIND_PACKAGE ( Gettext REQUIRED )
+--- a/src/wx/CMakeLists.txt
++++ b/src/wx/CMakeLists.txt
+@@ -1,7 +1,3 @@
+-#Do not use this file directly.  Always use the top level CMakeLists.txt file
+-# This build is much easier if we just do it here.
+-SET( CMAKE_CXX_FLAGS -std=gnu++11 )
+-
+ # not yet implemented
+ SET(CAIRO_DEFAULT OFF)
+ 
+@@ -46,15 +42,6 @@
+     ADD_DEFINITIONS (-DNO_OAL)
+ endif(ENABLE_OPENAL)
+ 
+-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-    SET(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
+-
+-    # and if this is the case, we can't set debug level without link failing
+-    IF(NOT wxWidgets_DEFINITIONS MATCHES "-DwxDEBUG_LEVEL=0")
+-        ADD_DEFINITIONS(-DwxDEBUG_LEVEL=1)
+-    ENDIF()
+-ENDIF()
+-
+ IF(APPLE)
+     SET(wxWidgets_USE_STATIC ON)
+ ENDIF(APPLE)
+@@ -256,13 +243,6 @@
+     SET_PROPERTY(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
+     SET(MACOSX_BUNDLE_ICON_FILE ${VBAM_ICON})
+     SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+-
+-    # budle dylibs and relink them for releasing .app
+-    # but only in Release mode
+-    IF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+-        ADD_CUSTOM_COMMAND(TARGET visualboyadvance-m POST_BUILD
+-            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/osx/third_party_libs_tool "$<TARGET_FILE_DIR:visualboyadvance-m>/../..")
+-    ENDIF()
+ endif(APPLE)
+ 
+ SET(WX_EXE_NAME visualboyadvance-m-wx${CMAKE_EXECUTABLE_SUFFIX})

diff --git a/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch b/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
index 6ace060..bd4afb2 100644
--- a/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
+++ b/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2015-11-03 20:19:34.092188350 -0500
-+++ CMakeLists.txt	2015-11-03 20:20:17.176302442 -0500
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -384,7 +384,9 @@
  
  # manual pages

diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild
new file mode 100644
index 00000000..59f55d9
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime
+
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/c2165287938aea2306a75f0714744a6d23ba7dab.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	inherit vcs-snapshot
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="http://vba-m.com/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+
+RDEPEND="media-libs/libpng:0=
+	media-libs/libsdl[sound]
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0 )
+	ffmpeg? ( virtual/ffmpeg[-libav] )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	sdl? ( media-libs/libsdl[joystick,opengl] )
+	gtk? ( >=dev-cpp/glibmm-2.4.0:2
+		>=dev-cpp/gtkmm-2.4.0:2.4
+		>=dev-cpp/gtkglextmm-1.2.0 )
+	wxwidgets? (
+		cairo? ( x11-libs/cairo )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	wxwidgets? ( || (
+		media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+PATCHES=(
+	# fix issue with zlib-1.2.5.1 macros (bug #383179)
+	"${FILESDIR}"/${PN}-2.0.0_beta2-fix-zlib-macros.patch
+	"${FILESDIR}"/${PN}-2.0.0_beta2-fix-install-path-bin.patch
+	"${FILESDIR}"/${PN}-2.0.0_beta2-remove-hardcoded-flags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+		-DDATA_INSTALL_DIR=share/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use sdl && dodoc doc/ReadMe.SDL.txt
+}
+
+pkg_preinst() {
+	[[ ${PV} == *9999 ]] && subversion_pkg_preinst
+
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
@ 2020-02-06  4:02 Tim Harder
  0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2020-02-06  4:02 UTC (permalink / raw
  To: gentoo-commits

commit:     be5ec2798f9674ca0d90792681f1509891cbd0b3
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 03:49:44 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 03:49:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5ec279

games-emulation/vbam: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 games-emulation/vbam/Manifest                      |  1 -
 .../vbam/files/vbam-2.1.0-performance_fixup.patch  | 43 ----------
 games-emulation/vbam/vbam-2.1.0.ebuild             | 96 ----------------------
 3 files changed, 140 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index fe54a9b045c..cce742bd3f1 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1 @@
-DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896

diff --git a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
deleted file mode 100644
index c99f829bdc0..00000000000
--- a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Mon, 2 Jul 2018 18:32:18 -0700
-Subject: [PATCH] use GetWindow()->Refresh() in Wayland only
-
-Some people are reporting stuttering, and @retro-wertz tested both
-DrawArea() and Refresh() on wxgtk3 under xorg and found that the
-Refresh() method produces more stuttering.
-
-Change the compile check for wxgtk2 to a runtime check for wayland, and
-use Refresh() under Wayland only.
----
- src/wx/panel.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
-index e4b86301..faaf6e4d 100644
---- a/src/wx/panel.cpp
-+++ b/src/wx/panel.cpp
-@@ -1817,19 +1817,16 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
-     }
- 
-     // next, draw the frame (queue a PaintEv) Refresh must be used under
--    // Wayland or nothing is drawn, however it causes high CPU usage with GTK2,
--    // so use the old method in that case
--#if !defined(__WXGTK__) || defined(__WXGTK3__)
--    GetWindow()->Refresh();
--#else
--    {
-+    // Wayland or nothing is drawn.
-+    if (wxGetApp().UsingWayland())
-+        GetWindow()->Refresh();
-+    else {
-         DrawingPanelBase* panel = wxGetApp().frame->GetPanel()->panel;
-         if (panel) {
-             wxClientDC dc(panel->GetWindow());
-             panel->DrawArea(dc);
-         }
-     }
--#endif
- 
-     // finally, draw on-screen text using wx method, if possible
-     // this method flickers too much right now

diff --git a/games-emulation/vbam/vbam-2.1.0.ebuild b/games-emulation/vbam/vbam-2.1.0.ebuild
deleted file mode 100644
index 3d0c2496b2e..00000000000
--- a/games-emulation/vbam/vbam-2.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-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="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
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-performance_fixup.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_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
@ 2021-11-07  2:51 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-11-07  2:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d9c52de97ac8da18f8ec9f7863950582aee3e71c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 02:50:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 02:50:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c52de9

games-emulation/vbam: fix build on arm(64)

Closes: https://bugs.gentoo.org/799362
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../vbam/files/vbam-2.1.4-arm-asm.patch            | 33 ++++++++++++++++++++++
 games-emulation/vbam/vbam-2.1.4.ebuild             |  1 +
 2 files changed, 34 insertions(+)

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
new file mode 100644
index 00000000000..bf6e2bd70e9
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
@@ -0,0 +1,33 @@
+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/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index 21f3c2cf4a2..8fe87b4e148 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -57,6 +57,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake_fix.patch
 	"${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
+	"${FILESDIR}"/${P}-arm-asm.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
@ 2023-02-07 17:25 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-02-07 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0df89699667d83e4db2c81bf5fdb6f51ab5bace0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 15:10:43 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 17:25:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df89699

games-emulation/vbam: drop 2.1.4

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/vbam/Manifest                      |   1 -
 .../vbam/files/vbam-2.1.4-arm-asm.patch            |  33 -----
 .../vbam/files/vbam-2.1.4-cmake_fix.patch          | 163 ---------------------
 .../vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch     |  27 ----
 games-emulation/vbam/vbam-2.1.4.ebuild             | 109 --------------
 5 files changed, 333 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index dc89a1dadd98..b5f28a98042b 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1 @@
-DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
 DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7

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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-02-07 17:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-07  2:51 [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-02-07 17:25 Andreas Sturmlechner
2020-02-06  4:02 Tim Harder
2016-12-11 13:49 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox