Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
Date: Wed, 29 Aug 2018 21:22:21
Message-Id: 1535577724.66333b63c40ec4015873d9d9789ba705b57310e6.chewi@gentoo
1 commit: 66333b63c40ec4015873d9d9789ba705b57310e6
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 29 21:16:04 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 29 21:22:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66333b63
7
8 games-emulation/vbam: Drop old 2.0.1-r1
9
10 Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12 games-emulation/vbam/Manifest | 1 -
13 .../vbam/files/vbam-2.0.1-changelog-update.patch | 98 ----------------------
14 .../vbam-2.0.1-read-version-from-changelog.patch | 76 -----------------
15 games-emulation/vbam/vbam-2.0.1-r1.ebuild | 97 ---------------------
16 4 files changed, 272 deletions(-)
17
18 diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
19 index 08ad2c375b5..6376ae4ae7d 100644
20 --- a/games-emulation/vbam/Manifest
21 +++ b/games-emulation/vbam/Manifest
22 @@ -1,2 +1 @@
23 -DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
24 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
25
26 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
27 deleted file mode 100644
28 index 6d4f87f2d77..00000000000
29 --- a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
30 +++ /dev/null
31 @@ -1,98 +0,0 @@
32 -From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
33 -From: Zach Bacon <zachbacon@×××××××××××.rocks>
34 -Date: Thu, 12 Oct 2017 00:49:05 +0000
35 -Subject: [PATCH] Add a changelog
36 -
37 -Gonna try and keep this up to date as often as possible.
38 ----
39 - CHANGELOG.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
40 - 1 file changed, 81 insertions(+)
41 - create mode 100644 CHANGELOG.md
42 -
43 -diff --git a/CHANGELOG.md b/CHANGELOG.md
44 -new file mode 100644
45 -index 00000000..c24ac560
46 ---- /dev/null
47 -+++ b/CHANGELOG.md
48 -@@ -0,0 +1,81 @@
49 -+# Changelog
50 -+All notable changes to this project will be documented in this file.
51 -+
52 -+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
53 -+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
54 -+
55 -+## [Unreleased]
56 -+
57 -+## [2.0.1] - 10/11/2017
58 -+### Added
59 -+- initial installer script
60 -+- gitter.im badge in readme
61 -+- 32bit cross compiling support on 64bit linux
62 -+- added support for GNUInstallDirs to cmake
63 -+- Include new translations from transifex
64 -+- Added WxWidgets ABI compiler check
65 -+- Add linux Joystick reference to issue template
66 -+- Add #ubckyde <cmath> fir std::cell()
67 -+-
68 -+
69 -+### Changed
70 -+- Fix 2xSaImmx.asm linking issue
71 -+- cmake: default to ENABLE_ASM_CORE=OFF
72 -+- libretro merging from upstream libretro fork.
73 -+- better fix for clipped video in GL Fullscreen.
74 -+- Fix flibc crash: add log message on fopen failure
75 -+- fix gameboy header-detection in libretro interface
76 -+- hotfix for potential buffer-overflow
77 -+- delete memory in common/array.h on destruction
78 -+- SDL: improve error msg for unwritable config
79 -+- SDL: fix deflt bat saving, improve dir checking
80 -+- fix portability issue with strerror_r()
81 -+- Windows doesn't have sterror_r
82 -+- wx/wxvbam: fix GetAbsolutePath
83 -+- fix a memory leak due to wrong syntax
84 -+- regenerate translation files
85 -+- fix errors reported by SUSE's post build linter
86 -+- SUSE Lint: fix a few classes of warnings
87 -+- let cmake escape -D preproc. definitions
88 -+- fix memory viewer xrc on wx 3.1+
89 -+- Improving README
90 -+- SoundSDL: lock conditional code cleanup
91 -+- remove the default F11 keybinding for save state
92 -+- hopefully fix resize artifacts on game panel
93 -+- soundSDL: write silence when paused
94 -+- cleanup SoundSDL #139 #130 #97 #67 #65 #46 #47
95 -+- document how to provice symbolic backtraces
96 -+- "no throttle" fixes/cleanup
97 -+- only use -mtune=generic on x86/amd64
98 -+- installdeps: use -j$(nproc) not -j8 in info
99 -+- use -fabi-version=2 for GCC turn off LTO
100 -+- installdeps: minor refactoring/cleanup
101 -+- improve Wx GCC ABI check
102 -+- minor improvements for Wx Compile tests
103 -+- fix wx ABI check for Win32/MinGW
104 -+- installdeps: fedora fixes, including m32
105 -+- cmake: wx and cross compiling fixes
106 -+- restore wx 2.7 compat, improve string processing
107 -+- rename CMakeScripts/ to cmake/
108 -+- work around gcc lto wrappers bug with gcc 7.x
109 -+- update README.md
110 -+- remove doctoc title from README.md TOC
111 -+- improve win32 dependencies git submodule handling
112 -+- use num cpu cores to parallelize LTO link with gcc
113 -+- fix huge app icon in Win volume settings
114 -+- fix deadlock in SoundSDL:deinit()
115 -+- added executable extension for sdl binary
116 -+- default LTO to off on 64bit MinGW
117 -+- minor code cleanup
118 -+- deps: dont check result of apt-get update
119 -+- read version and subversion info from Git
120 -+- fix error and version info in shallow git clones
121 -+- refactor/cleanup GitTagVersion.cmake
122 -+
123 -+### Removed
124 -+- Cairo Renderer: it never performed well to begin with
125 -+
126 -+
127 -+
128 -+[2.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/throttle...v2.0.1
129 -+
130
131 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
132 deleted file mode 100644
133 index 5dce5839534..00000000000
134 --- a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
135 +++ /dev/null
136 @@ -1,76 +0,0 @@
137 -From 46486381f0c18110002ec62108969be957b419be Mon Sep 17 00:00:00 2001
138 -From: Rafael Kitover <rkitover@×××××.com>
139 -Date: Wed, 11 Oct 2017 19:17:25 -0700
140 -Subject: [PATCH] read version info from CHANGELOG.md if no git
141 -
142 -If git tags are not available, set the version and revision by finding
143 -the first version tag in `CHANGELOG.md` of the form
144 -
145 -```
146 -```
147 -
148 -Where N.N.N is the number version (number of components can vary) and
149 -the revision (as speicified by -REV) is optional.
150 -
151 -TODO: support named revision without a version number of the form
152 -`[REV]`.
153 ----
154 - CMakeLists.txt | 9 +++------
155 - cmake/ChangeLogVersion.cmake | 25 +++++++++++++++++++++++++
156 - 2 files changed, 28 insertions(+), 6 deletions(-)
157 - create mode 100644 cmake/ChangeLogVersion.cmake
158 -
159 -diff --git a/CMakeLists.txt b/CMakeLists.txt
160 -index bd09527d..4ad859b2 100644
161 ---- a/CMakeLists.txt
162 -+++ b/CMakeLists.txt
163 -@@ -112,15 +112,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
164 - # of files that depend on version.h
165 - include(GetGitRevisionDescription)
166 - get_git_head_revision(REFSPEC COMMITHASH)
167 --else()
168 -- message(WARNING "Git not found, cannot set version info")
169 - endif()
170 -
171 --# no git or no tags
172 -+# no git or no tags, use ChangeLog
173 - if(NOT VERSION)
174 -- set(VERSION 2.0.0)
175 -- set(REVISION "unknown")
176 -- set(VERSION_RELEASE 0)
177 -+ include(ChangeLogVersion)
178 -+ changelog_version(VERSION REVISION VERSION_RELEASE)
179 - endif()
180 -
181 - # generate version.h
182 -diff --git a/cmake/ChangeLogVersion.cmake b/cmake/ChangeLogVersion.cmake
183 -new file mode 100644
184 -index 00000000..101d23bd
185 ---- /dev/null
186 -+++ b/cmake/ChangeLogVersion.cmake
187 -@@ -0,0 +1,25 @@
188 -+function(changelog_version version revision version_release)
189 -+ set(${version} "" CACHE STRING "Latest ChangeLog Version" FORCE)
190 -+ set(${revision} "" CACHE STRING "Latest ChangeLog Revision" FORCE)
191 -+ set(${version_release} 0 CACHE STRING "Is this a versioned release without revision" FORCE)
192 -+
193 -+ file(READ CHANGELOG.md changelog_file)
194 -+
195 -+ if(NOT changelog_file)
196 -+ return()
197 -+ endif()
198 -+
199 -+ string(REGEX MATCH "\n## +\\[([0-9.]+)(-([^] ]+))?\\] +- +[0-9][0-9]?/" match_out "${changelog_file}")
200 -+
201 -+ set(changelog_version "${CMAKE_MATCH_1}")
202 -+
203 -+ set(is_version_release 0)
204 -+ set(changelog_revision "${CMAKE_MATCH_3}")
205 -+ if(NOT changelog_revision)
206 -+ set(is_version_release 1)
207 -+ endif()
208 -+
209 -+ set(${version} "${changelog_version}" CACHE STRING "Latest ChangeLog Version" FORCE)
210 -+ set(${revision} "${changelog_revision}" CACHE STRING "Latest ChangeLog Revision" FORCE)
211 -+ set(${version_release} "${is_version_release}" CACHE STRING "Is this a versioned release without revision" FORCE)
212 -+endfunction()
213
214 diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
215 deleted file mode 100644
216 index 7895e9c087d..00000000000
217 --- a/games-emulation/vbam/vbam-2.0.1-r1.ebuild
218 +++ /dev/null
219 @@ -1,97 +0,0 @@
220 -# Copyright 1999-2018 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=6
224 -
225 -WX_GTK_VER="3.0-gtk3"
226 -inherit gnome2-utils wxwidgets xdg-utils cmake-utils
227 -
228 -if [[ ${PV} == 9999 ]]; then
229 - EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
230 - inherit git-r3
231 -else
232 - SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
233 - KEYWORDS="~amd64 ~x86"
234 - S="${WORKDIR}/visualboyadvance-m-${PV}"
235 -fi
236 -
237 -DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
238 -HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
239 -
240 -LICENSE="GPL-2"
241 -SLOT="0"
242 -IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
243 -REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
244 -
245 -RDEPEND="
246 - >=media-libs/libpng-1.4:0=
247 - media-libs/libsdl2[joystick]
248 - link? ( >=media-libs/libsfml-2.0:= )
249 - sys-libs/zlib:=
250 - virtual/glu
251 - virtual/opengl
252 - ffmpeg? ( media-video/ffmpeg:= )
253 - lirc? ( app-misc/lirc )
254 - nls? ( virtual/libintl )
255 - wxwidgets? (
256 - openal? ( media-libs/openal )
257 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
258 - )"
259 -DEPEND="${RDEPEND}
260 - app-arch/zip
261 - wxwidgets? ( virtual/imagemagick-tools )
262 - x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
263 - nls? ( sys-devel/gettext )
264 - virtual/pkgconfig"
265 -
266 -PATCHES=(
267 - "${FILESDIR}"/${P}-changelog-update.patch
268 - "${FILESDIR}"/${P}-read-version-from-changelog.patch
269 -)
270 -
271 -src_configure() {
272 - use wxwidgets && setup-wxwidgets
273 - local mycmakeargs=(
274 - -DENABLE_FFMPEG=$(usex ffmpeg)
275 - -DENABLE_LINK=$(usex link)
276 - -DENABLE_LIRC=$(usex lirc)
277 - -DENABLE_NLS=$(usex nls)
278 - -DENABLE_OPENAL=$(usex openal)
279 - -DENABLE_SDL=$(usex sdl)
280 - -DENABLE_WX=$(usex wxwidgets)
281 - -DENABLE_ASM_CORE=$(usex x86)
282 - -DENABLE_ASM_SCALERS=$(usex x86)
283 - -DCMAKE_SKIP_RPATH=ON
284 - )
285 - cmake-utils_src_configure
286 -}
287 -
288 -src_install() {
289 - cmake-utils_src_install
290 -
291 - if use sdl ; then
292 - dodoc doc/ReadMe.SDL.txt
293 - doman src/debian/vbam.6
294 - fi
295 - use wxwidgets && doman src/debian/visualboyadvance-m.6
296 -}
297 -
298 -pkg_preinst() {
299 - if use wxwidgets ; then
300 - gnome2_icon_savelist
301 - fi
302 -}
303 -
304 -pkg_postinst() {
305 - if use wxwidgets ; then
306 - gnome2_icon_cache_update
307 - xdg_desktop_database_update
308 - fi
309 -}
310 -
311 -pkg_postrm() {
312 - if use wxwidgets ; then
313 - gnome2_icon_cache_update
314 - xdg_desktop_database_update
315 - fi
316 -}