diff options
5 files changed, 0 insertions, 306 deletions
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 1c14b64fd996..6b0c0502dc33 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 ceb7dd94a0d0..000000000000 --- 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 57b2a2563b16..000000000000 --- 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 5afc73e6b930..000000000000 --- 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) -- 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/vbam-2.0.0_beta2_p20161211-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild deleted file mode 100644 index 21315294a29e..000000000000 --- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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/libsdl2[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? ( virtual/imagemagick-tools ) - 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() { - use wxwidgets && setup-wxwidgets - 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 -} |