[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2021-03-09 Thread Lars Wendler 
commit: 117f6634d01f2c89e614561de47351c9bdfef37a
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar  9 08:46:17 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar  9 08:46:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117f6634

games-emulation/vbam: Fixed build against libsdl2-2.0.14

Closes: https://bugs.gentoo.org/762208
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 .../vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch | 27 ++
 games-emulation/vbam/vbam-2.1.4.ebuild |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..a528a22e506
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch
@@ -0,0 +1,27 @@
+From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= 
+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
index b9fd01b61bd..21f3c2cf4a2 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${P}-cmake_fix.patch
+   "${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2019-12-06 Thread Lars Wendler 
commit: e4658a559cc8782d012c43cfefdaaac1d335974d
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  6 11:04:21 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  6 11:04:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4658a55

games-emulation/vbam: Bump to version 2.1.4

Thanks-to: Witcher 7  a2.topaz.ne.jp>
Closes: https://bugs.gentoo.org/699606
Package-Manager: Portage-2.3.81, Repoman-2.3.19
Signed-off-by: Lars Wendler  gentoo.org>

 games-emulation/vbam/Manifest  |   1 +
 .../vbam/files/vbam-2.1.4-cmake_fix.patch  | 163 +
 games-emulation/vbam/vbam-2.1.4.ebuild |  94 
 3 files changed, 258 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 03eb7c47000..63f0ffb5f7b 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1,3 @@
 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 
79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272
 SHA512 
9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
 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.4-cmake_fix.patch 
b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
new file mode 100644
index 000..d801b08317a
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
@@ -0,0 +1,163 @@
+From ae7349b06f86ff60b0d14dfa01b3fe2163dcfbab Mon Sep 17 00:00:00 2001
+From: Rafael Kitover 
+Date: Wed, 13 Nov 2019 02:56:06 +
+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 
+---
+ 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})
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2018-11-06 Thread Lars Wendler 
commit: 2d146a595a2db14073fa48561d3620b4dbdd701f
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov  6 21:15:48 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov  6 21:15:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d146a59

games-emulation/vbam: Security bump to version 2.1.0

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler  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 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 6376ae4ae7d..03eb7c47000 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 
79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272
 SHA512 
9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
+DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 
48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd
 SHA512 
e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321

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
new file mode 100644
index 000..c99f829bdc0
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
@@ -0,0 +1,43 @@
+From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
+From: Rafael Kitover 
+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
new file mode 100644
index 000..3d0c2496b2e
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.1.0.ebuild
@@ -0,0 +1,96 @@
+# 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} ==  ]]; 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 )
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2018-08-29 Thread James Le Cuirot 
commit: 66333b63c40ec4015873d9d9789ba705b57310e6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Aug 29 21:16:04 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Aug 29 21:22:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66333b63

games-emulation/vbam: Drop old 2.0.1-r1

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 games-emulation/vbam/Manifest  |  1 -
 .../vbam/files/vbam-2.0.1-changelog-update.patch   | 98 --
 .../vbam-2.0.1-read-version-from-changelog.patch   | 76 -
 games-emulation/vbam/vbam-2.0.1-r1.ebuild  | 97 -
 4 files changed, 272 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 08ad2c375b5..6376ae4ae7d 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1 @@
-DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 
3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752
 SHA512 
d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 
79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272
 SHA512 
9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910

diff --git a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch 
b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
deleted file mode 100644
index 6d4f87f2d77..000
--- a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
-From: Zach Bacon 
-Date: Thu, 12 Oct 2017 00:49:05 +
-Subject: [PATCH] Add a changelog
-
-Gonna try and keep this up to date as often as possible.

- CHANGELOG.md | 81 
- 1 file changed, 81 insertions(+)
- create mode 100644 CHANGELOG.md
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-new file mode 100644
-index ..c24ac560
 /dev/null
-+++ b/CHANGELOG.md
-@@ -0,0 +1,81 @@
-+# Changelog
-+All notable changes to this project will be documented in this file.
-+
-+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-+and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.html).
-+
-+## [Unreleased]
-+
-+## [2.0.1] - 10/11/2017
-+### Added
-+- initial installer script
-+- gitter.im badge in readme
-+- 32bit cross compiling support on 64bit linux
-+- added support for GNUInstallDirs to cmake
-+- Include new translations from transifex
-+- Added WxWidgets ABI compiler check
-+- Add linux Joystick reference to issue template
-+- Add #ubckyde  fir std::cell()
-+- 
-+
-+### Changed
-+- Fix 2xSaImmx.asm linking issue
-+- cmake: default to ENABLE_ASM_CORE=OFF
-+- libretro merging from upstream libretro fork.
-+- better fix for clipped video in GL Fullscreen.
-+- Fix flibc crash: add log message on fopen failure
-+- fix gameboy header-detection in libretro interface
-+- hotfix for potential buffer-overflow
-+- delete memory in common/array.h on destruction
-+- SDL: improve error msg for unwritable config
-+- SDL: fix deflt bat saving, improve dir checking
-+- fix portability issue with strerror_r()
-+- Windows doesn't have sterror_r
-+- wx/wxvbam: fix GetAbsolutePath 
-+- fix a memory leak due to wrong syntax
-+- regenerate translation files
-+- fix errors reported by SUSE's post build linter
-+- SUSE Lint: fix a few classes of warnings
-+- let cmake escape -D preproc. definitions
-+- fix memory viewer xrc on wx 3.1+
-+- Improving README
-+- SoundSDL: lock conditional code cleanup
-+- remove the default F11 keybinding for save state
-+- hopefully fix resize artifacts on game panel
-+- soundSDL: write silence when paused
-+- cleanup SoundSDL  #139 #130 #97 #67 #65 #46 #47
-+- document how to provice symbolic backtraces
-+- "no throttle" fixes/cleanup
-+- only use -mtune=generic on x86/amd64
-+- installdeps: use -j$(nproc) not -j8 in info
-+- use -fabi-version=2 for GCC turn off LTO
-+- installdeps: minor refactoring/cleanup
-+- improve Wx GCC ABI check
-+- minor improvements for Wx Compile tests
-+- fix wx ABI check for Win32/MinGW
-+- installdeps: fedora fixes, including m32
-+- cmake: wx and cross compiling fixes
-+- restore wx 2.7 compat, improve string processing
-+- rename CMakeScripts/ to cmake/
-+- work around gcc lto wrappers bug with gcc 7.x
-+- update README.md
-+- remove doctoc title from README.md TOC
-+- improve win32 dependencies git submodule handling
-+- use num cpu cores to parallelize LTO link with gcc
-+- fix huge app icon in Win volume settings
-+- fix deadlock in SoundSDL:deinit()
-+- added executable extension

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2018-01-20 Thread David Seifert 
commit: 6487a19351577cfffd1152e28426781cd6899fa8
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 20 19:53:23 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 20 19:53:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6487a193

games-emulation/vbam: Remove old

Closes: https://bugs.gentoo.org/632515
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 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/vbam-2.0.0_beta2_p20161211-r1.ebuild  | 101 ---
 5 files changed, 306 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 1c14b64fd99..6b0c0502dc3 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1 @@
-DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 BLAKE2B 
69b1272f5e048fe96a7a6798a3f934395a607439ba3ede992f8d49557a4ea8ea64ed512f11440200548eb039d3b1f4b4129603e5a897f3e04fac48d4d39906f1
 SHA512 
1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40
 DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 
3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752
 SHA512 
d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb

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
deleted file mode 100644
index ceb7dd94a0d..000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 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
deleted file mode 100644
index 57b2a2563b1..000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch
+++ /dev/null
@@ -1,7 +0,0 @@
 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
deleted file mode 100644
index 5afc73e6b93..000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-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)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2018-01-13 Thread David Seifert 
commit: 6ff56fec80e5fa45650f938e3397ee73da6eeba3
Author: Nado  troglodyte  be>
AuthorDate: Sat Jan 13 10:15:27 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 22:17:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff56fec

games-emulation/vbam: add 2.0.1 with upstream's suggested patches

See
https://github.com/visualboyadvance-m/visualboyadvance-m/releases/tag/v2.0.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-emulation/vbam/Manifest  |   1 +
 .../vbam/files/vbam-2.0.1-changelog-update.patch   |  98 +++
 .../vbam-2.0.1-read-version-from-changelog.patch   |  76 +++
 games-emulation/vbam/vbam-2.0.1.ebuild | 105 +
 4 files changed, 280 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 63bffba3238..1c14b64fd99 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 BLAKE2B 
69b1272f5e048fe96a7a6798a3f934395a607439ba3ede992f8d49557a4ea8ea64ed512f11440200548eb039d3b1f4b4129603e5a897f3e04fac48d4d39906f1
 SHA512 
1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40
+DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 
3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752
 SHA512 
d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb

diff --git a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch 
b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
new file mode 100644
index 000..6d4f87f2d77
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
@@ -0,0 +1,98 @@
+From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
+From: Zach Bacon 
+Date: Thu, 12 Oct 2017 00:49:05 +
+Subject: [PATCH] Add a changelog
+
+Gonna try and keep this up to date as often as possible.
+---
+ CHANGELOG.md | 81 
+ 1 file changed, 81 insertions(+)
+ create mode 100644 CHANGELOG.md
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+new file mode 100644
+index ..c24ac560
+--- /dev/null
 b/CHANGELOG.md
+@@ -0,0 +1,81 @@
++# Changelog
++All notable changes to this project will be documented in this file.
++
++The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
++and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.html).
++
++## [Unreleased]
++
++## [2.0.1] - 10/11/2017
++### Added
++- initial installer script
++- gitter.im badge in readme
++- 32bit cross compiling support on 64bit linux
++- added support for GNUInstallDirs to cmake
++- Include new translations from transifex
++- Added WxWidgets ABI compiler check
++- Add linux Joystick reference to issue template
++- Add #ubckyde  fir std::cell()
++- 
++
++### Changed
++- Fix 2xSaImmx.asm linking issue
++- cmake: default to ENABLE_ASM_CORE=OFF
++- libretro merging from upstream libretro fork.
++- better fix for clipped video in GL Fullscreen.
++- Fix flibc crash: add log message on fopen failure
++- fix gameboy header-detection in libretro interface
++- hotfix for potential buffer-overflow
++- delete memory in common/array.h on destruction
++- SDL: improve error msg for unwritable config
++- SDL: fix deflt bat saving, improve dir checking
++- fix portability issue with strerror_r()
++- Windows doesn't have sterror_r
++- wx/wxvbam: fix GetAbsolutePath 
++- fix a memory leak due to wrong syntax
++- regenerate translation files
++- fix errors reported by SUSE's post build linter
++- SUSE Lint: fix a few classes of warnings
++- let cmake escape -D preproc. definitions
++- fix memory viewer xrc on wx 3.1+
++- Improving README
++- SoundSDL: lock conditional code cleanup
++- remove the default F11 keybinding for save state
++- hopefully fix resize artifacts on game panel
++- soundSDL: write silence when paused
++- cleanup SoundSDL  #139 #130 #97 #67 #65 #46 #47
++- document how to provice symbolic backtraces
++- "no throttle" fixes/cleanup
++- only use -mtune=generic on x86/amd64
++- installdeps: use -j$(nproc) not -j8 in info
++- use -fabi-version=2 for GCC turn off LTO
++- installdeps: minor refactoring/cleanup
++- improve Wx GCC ABI check
++- minor improvements for Wx Compile tests
++- fix wx ABI check for Win32/MinGW
++- installdeps: fedora fixes, including m32
++- cmake: wx and cross compiling fixes
++- restore wx 2.7 compat, improve string processing
++- rename CMakeScripts/ to cmake/
++- work around gcc lto wrappers bug with gcc 7.x
++- update README.md
++- remove doctoc title from README.md TOC
++- improve win32 dependencies git submodule handling
++- use num cpu cores to

[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/

2015-11-04 Thread Michael Sterrett 
commit: f300b4d9bd9d5fab9346efba04b0a895fbb69f67
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Nov  5 05:26:35 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Nov  5 05:27:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f300b4d9

touchups; better libsdl use deps; add mmx use flag support

Package-Manager: portage-2.2.20.1

 .../vbam/files/vbam-2.0.0_pre1507-man.patch| 13 
 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 37 ++
 2 files changed, 29 insertions(+), 21 deletions(-)

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
new file mode 100644
index 000..6ace060
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig2015-11-03 20:19:34.092188350 -0500
 CMakeLists.txt 2015-11-03 20:20:17.176302442 -0500
+@@ -384,7 +384,9 @@
+ 
+ # manual pages
+ IF( UNIX )
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/man/man1)
++IF( ENABLE_SDL )
++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
++ENDIF( ENABLE_SDL )
+ IF( ENABLE_GTK )
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.1 
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+ ENDIF( ENABLE_GTK )

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild 
b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 5ddac33..0e0e07b 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -17,30 +17,33 @@ fi
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+IUSE="cairo cpu_flags_x86_mmx ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
-   media-libs/libsdl[joystick]
-   link? ( >=media-libs/libsfml-2.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 )
-   lirc? ( app-misc/lirc )
-   nls? ( virtual/libintl )
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] ) )
+   wxwidgets? ( || (
+   media-gfx/imagemagick
+   media-gfx/graphicsmagick[imagemagick] ) )
x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
nls? ( sys-devel/gettext )
virtual/pkgconfig"
@@ -52,10 +55,8 @@ src_prepare() {
sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
-   CMakeLists.txt src/wx/CMakeLists.txt || die
-
-   # fix desktop file QA warnings
-   edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
+   CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
+   epatch "${FILESDIR}"/${P}-man.patch
 }
 
 src_configure() {
@@ -71,6 +72,7 @@ src_configure() {
$(cmake-utils_use_enable wxwidgets WX)
$(cmake-utils_use_enable x86 ASM_CORE)
$(cmake-utils_use_enable x86 ASM_SCALERS)
+   $(cmake-utils_use_enable cpu_flags_x86_mmx MMX)
-DCMAKE_SKIP_RPATH=ON
-DDATA_INSTALL_DIR=share/games/${PN}
)
@@ -83,14 +85,7 @@ src_compile() {
 
 src_install() {
cmake-utils_src_install
-
-   if use sdl ; then
-   dodoc doc/ReadMe.SDL.txt
-   doman src/debian/vbam.1
-   fi
-   use wxwidgets && doman src/debian/wxvbam.1
-   use gtk && doman src/debian/gvbam.1
-
+   use sdl && dodoc doc/ReadMe.SDL.txt
prepgamesdirs
 }
 
@@ -107,13 +102,13 @@ pkg_postinst() {
games_pkg_postinst
if use gtk || use wxwidgets ; then
gnome2_icon_cache_update
+   use gtk && fdo-mime_desktop_database_update
fi
-   use gtk && fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
if use gtk || use wxwidgets ; then
gnome2_icon_cache_update
+   use gtk && fdo-mime_desktop_database_update
fi
-   use gtk && fdo-mime_desktop_database_update
 }