diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
tree | 132dd60828854db4f65f30f9230f43d9602507ff /games-emulation/vbam | |
parent | 8be70107efbb417f839292165ee39d07a062046f (diff) |
gentoo resync : 16.01.2018
Diffstat (limited to 'games-emulation/vbam')
-rw-r--r-- | games-emulation/vbam/Manifest | 6 | ||||
-rw-r--r-- | games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch | 98 | ||||
-rw-r--r-- | games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch | 76 | ||||
-rw-r--r-- | games-emulation/vbam/vbam-2.0.1.ebuild | 105 | ||||
-rw-r--r-- | games-emulation/vbam/vbam-9999.ebuild | 31 |
5 files changed, 296 insertions, 20 deletions
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 10ff55ad63e1..3c730fd5c90d 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,7 +1,11 @@ AUX vbam-2.0.0_beta2-fix-install-path-bin.patch 475 BLAKE2B a08a94cf0db76d7e70e89c5c1b19b226a167db2925c92d6df7f1f6b0c8f115f1f2c4a1a1d1e413c678bde458742e601ae7b5aa65e0e041575e8beaff10a877a8 SHA512 70a4dd2473a7156d1fdf5322f96827835423c615d83abe5ca7b7538f303f9f0d8daa2e8da153460939ed98883c77d26f288a00eaca8e94c73410247059879d8e AUX vbam-2.0.0_beta2-fix-zlib-macros.patch 238 BLAKE2B 777accae17b4ad82b62c23ce1683bafb7b8a7ed72914a1cc539e55a3092791b309e02bf79b8ab0d9e9172c7288162e902ec3e73d025d9f5995eca40395375eaf SHA512 ea591ea9d3a5a766a4f5345b54af2e8d8406e2854d2769449568d1355af333d11d95fbc8351202d7673adad89e31b4427a10a39f2361d679d8fbf3e88ffbb29c AUX vbam-2.0.0_beta2-remove-hardcoded-flags.patch 6368 BLAKE2B 491238ca2c2e45c73a4a2fef951df289274ffbf06e8bd0fb33c9650c3c3a550581a6acd0d8662b0aa6770b93c9d4d04a070c55408b0ea4ee96cc239ce958bd67 SHA512 b51c54e543b3a3fe0d3a66e1219aeefcc1ee58eac65a9df12a4a5a7ef14c702d47b3cdfeb8d7903444afe12d531a5b2ed77bd36ab2277960ef8af6faea2a40d4 +AUX vbam-2.0.1-changelog-update.patch 3547 BLAKE2B cd9c3aaab79e4342d7bdbc903331ef0d7fd54b63422715e8d0dfe27cbbfcc729804ec018beb434faa9b89ca5bce417f382debfc74b111a5dae4e8974e2cec38f SHA512 792ad5848a373a0a5040132417e7a9eb4cccf3155e31beda61b6236edc80ce74018ad8d7bd67829c981b60a8940904629c64b3d392ca25d0bb58461d64e228e3 +AUX vbam-2.0.1-read-version-from-changelog.patch 2701 BLAKE2B cf9c826bc75fb956becb99decadc36e41a1944b64095729826e732341c36aef1df9ef73b424501e9d0dcb9e8146d50c0b91641237b2b3c83e13d2bb2ab375311 SHA512 2a1793c8c4f0dff020337eccc9ff94c357b8f1ce2dde8aab612c4a06b5adbfbf3261b91643bfdab958ddf77f2e5f751997840cdcd89dd4d77744de8caf1f4285 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 EBUILD vbam-2.0.0_beta2_p20161211-r1.ebuild 2580 BLAKE2B e2e69c1c1906088b1eff9bed1a9ff8a26082ed4cf8e90188cbb11a3f2e64fd79de7aa2ad87a3d1cdb9f04965adc0d74e075f1bfb33807dce091a0d5aeb00ec16 SHA512 feb01ee124b29500b73e44da4b319572fe8a6ac7fe1f2e66bb072007bf786a2b0d7f9b2a447817ef665d95ce68219020ed7538400c741485dcc8c167db7e5cd8 -EBUILD vbam-9999.ebuild 2456 BLAKE2B 10684733cb5dad8d9391d3e6e86afc76a788500d551ac8e2089f1676a6103ca2d089df71c151e6d7900511c8f2a75dbf72ca5f65a1bafaa140f4d60d580f4d8e SHA512 75b2f006494b40c56c500f7298eab9cbfe7840a8bd2045ceff92e1846273ab4c3a547b776f2e4bfd0e12d056bb6d4600e5c6854609d66a3307c346c2b369d61c +EBUILD vbam-2.0.1.ebuild 2366 BLAKE2B 33bda59f7558d59101cf34cf74d445fc56e73f3bb299e364eddf982f6a37628dd4b23d316172b9ee6d564901b40a11a6d32847f9c7eadfca62104cf9815c41c4 SHA512 afd5b1028b4fc9adbe75100a25f93ab5596b155f52926c78bc4e78ab9e62a9a29162aeb210a81c1742d85872431dd1fd844a8ef781e4692b866211a4d72f825f +EBUILD vbam-9999.ebuild 2177 BLAKE2B f37220942362e8e0e74095924a5235eb27b49342b52a8b9a3558eebb0ae2f35f049518bb43bf444663a870907e969a2c66e61f7913a2590b6ab73125fedacf61 SHA512 7f2b286d17ec25edcb3e0b2c2d9ef1500d973bf19afa514a7fc8fba7c976e72806fd1e070dff4e6cf68b03beb54c8582cb4000292f5899733d9d71dac1dd9a2c MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0 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 000000000000..6d4f87f2d772 --- /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 <zachbacon@budgiemedia.rocks> +Date: Thu, 12 Oct 2017 00:49:05 +0000 +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 00000000..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 <cmath> 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 for sdl binary ++- default LTO to off on 64bit MinGW ++- minor code cleanup ++- deps: dont check result of apt-get update ++- read version and subversion info from Git ++- fix error and version info in shallow git clones ++- refactor/cleanup GitTagVersion.cmake ++ ++### Removed ++- Cairo Renderer: it never performed well to begin with ++ ++ ++ ++[2.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/throttle...v2.0.1 ++ diff --git a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch new file mode 100644 index 000000000000..5dce58395343 --- /dev/null +++ b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch @@ -0,0 +1,76 @@ +From 46486381f0c18110002ec62108969be957b419be Mon Sep 17 00:00:00 2001 +From: Rafael Kitover <rkitover@gmail.com> +Date: Wed, 11 Oct 2017 19:17:25 -0700 +Subject: [PATCH] read version info from CHANGELOG.md if no git + +If git tags are not available, set the version and revision by finding +the first version tag in `CHANGELOG.md` of the form + +``` +``` + +Where N.N.N is the number version (number of components can vary) and +the revision (as speicified by -REV) is optional. + +TODO: support named revision without a version number of the form +`[REV]`. +--- + CMakeLists.txt | 9 +++------ + cmake/ChangeLogVersion.cmake | 25 +++++++++++++++++++++++++ + 2 files changed, 28 insertions(+), 6 deletions(-) + create mode 100644 cmake/ChangeLogVersion.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd09527d..4ad859b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,15 +112,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") + # of files that depend on version.h + include(GetGitRevisionDescription) + get_git_head_revision(REFSPEC COMMITHASH) +-else() +- message(WARNING "Git not found, cannot set version info") + endif() + +-# no git or no tags ++# no git or no tags, use ChangeLog + if(NOT VERSION) +- set(VERSION 2.0.0) +- set(REVISION "unknown") +- set(VERSION_RELEASE 0) ++ include(ChangeLogVersion) ++ changelog_version(VERSION REVISION VERSION_RELEASE) + endif() + + # generate version.h +diff --git a/cmake/ChangeLogVersion.cmake b/cmake/ChangeLogVersion.cmake +new file mode 100644 +index 00000000..101d23bd +--- /dev/null ++++ b/cmake/ChangeLogVersion.cmake +@@ -0,0 +1,25 @@ ++function(changelog_version version revision version_release) ++ set(${version} "" CACHE STRING "Latest ChangeLog Version" FORCE) ++ set(${revision} "" CACHE STRING "Latest ChangeLog Revision" FORCE) ++ set(${version_release} 0 CACHE STRING "Is this a versioned release without revision" FORCE) ++ ++ file(READ CHANGELOG.md changelog_file) ++ ++ if(NOT changelog_file) ++ return() ++ endif() ++ ++ string(REGEX MATCH "\n## +\\[([0-9.]+)(-([^] ]+))?\\] +- +[0-9][0-9]?/" match_out "${changelog_file}") ++ ++ set(changelog_version "${CMAKE_MATCH_1}") ++ ++ set(is_version_release 0) ++ set(changelog_revision "${CMAKE_MATCH_3}") ++ if(NOT changelog_revision) ++ set(is_version_release 1) ++ endif() ++ ++ set(${version} "${changelog_version}" CACHE STRING "Latest ChangeLog Version" FORCE) ++ set(${revision} "${changelog_revision}" CACHE STRING "Latest ChangeLog Revision" FORCE) ++ set(${version_release} "${is_version_release}" CACHE STRING "Is this a versioned release without revision" FORCE) ++endfunction() diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1.ebuild new file mode 100644 index 000000000000..c564e02df5d5 --- /dev/null +++ b/games-emulation/vbam/vbam-2.0.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2018 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 eutils xdg-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? ( virtual/ffmpeg[-libav] ) + lirc? ( app-misc/lirc ) + nls? ( virtual/libintl ) + wxwidgets? ( + 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=( + "${FILESDIR}/${P}-changelog-update.patch" + "${FILESDIR}/${P}-read-version-from-changelog.patch" +) + +src_prepare() { + default + + # fix desktop file QA warnings + edos2unix src/wx/wxvbam.desktop +} + +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_compile() { + cmake-utils_src_compile +} + +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 +} diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index 0af06c4e2c8c..357c94893101 100644 --- a/games-emulation/vbam/vbam-9999.ebuild +++ b/games-emulation/vbam/vbam-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 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 eutils +inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git" @@ -18,8 +18,8 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m" LICENSE="GPL-2" SLOT="0" -IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" -REQUIRED_USE="|| ( sdl gtk wxwidgets )" +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] @@ -28,13 +28,9 @@ RDEPEND=">=media-libs/libpng-1.4:0= virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) - 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] )" @@ -48,15 +44,13 @@ src_prepare() { default # fix desktop file QA warnings - edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop + edos2unix src/wx/wxvbam.desktop } 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) @@ -79,28 +73,27 @@ src_install() { if use sdl ; then dodoc doc/ReadMe.SDL.txt - doman src/debian/vbam.1 + doman src/debian/vbam.6 fi - use wxwidgets && doman src/debian/wxvbam.1 - use gtk && doman src/debian/gvbam.1 + use wxwidgets && doman src/debian/visualboyadvance-m.6 } pkg_preinst() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_savelist fi } pkg_postinst() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_cache_update + xdg_desktop_database_update fi - use gtk && fdo-mime_desktop_database_update } pkg_postrm() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_cache_update + xdg_desktop_database_update fi - use gtk && fdo-mime_desktop_database_update } |