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