[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 9fe2f294f33f40349b63ecfd67402464023ffa9e Author: Pacho Ramos gentoo org> AuthorDate: Sun Jun 16 09:35:16 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jun 16 09:35:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe2f294 games-emulation/vbam: drop 2.1.5 Signed-off-by: Pacho Ramos gentoo.org> games-emulation/vbam/Manifest | 1 - games-emulation/vbam/vbam-2.1.5.ebuild | 110 - 2 files changed, 111 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 9e943d8af8db..38cb879a1546 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,3 +1,2 @@ -DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88 DIST vbam-2.1.9.tar.gz 3641821 BLAKE2B 83f303741636f0c32d24c58fdd1b93c483ad82da17764ff3a7f1283f649f540452658693bd27febac3a8afc5871ffee6d8fff2e00f62fc23a211602244b64318 SHA512 de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6 diff --git a/games-emulation/vbam/vbam-2.1.5.ebuild b/games-emulation/vbam/vbam-2.1.5.ebuild deleted file mode 100644 index e5c66f3e0817.. --- a/games-emulation/vbam/vbam-2.1.5.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" -inherit wxwidgets xdg cmake - -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=" - ffmpeg? ( wxwidgets ) - openal? ( wxwidgets ) - || ( sdl wxwidgets ) -" - -RDEPEND=" - >=media-libs/libpng-1.4:= - media-libs/libsdl2[joystick] - sys-libs/zlib:= - virtual/glu - virtual/opengl - link? ( >=media-libs/libsfml-2.0:= ) - lirc? ( app-misc/lirc ) - nls? ( virtual/libintl ) - wxwidgets? ( - ffmpeg? ( media-video/ffmpeg:= ) - openal? ( media-libs/openal ) - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - app-arch/zip - virtual/pkgconfig - wxwidgets? ( virtual/imagemagick-tools ) - amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) - x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) - nls? ( sys-devel/gettext ) -" - -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_SDL=$(usex sdl) - -DENABLE_WX=$(usex wxwidgets) - -DENABLE_ASM_CORE=$(usex x86) - -DENABLE_ASM_SCALERS=$(usex x86) - -DCMAKE_SKIP_RPATH=ON - -DENABLE_LTO=OFF - -DENABLE_ONLINEUPDATES=OFF - -DDISABLE_MACOS_PACKAGE_MANAGERS=ON - ) - - if use wxwidgets; then - mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) - fi - - cmake_src_configure -} - -src_install() { - cmake_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 - xdg_pkg_preinst - fi -} - -pkg_postinst() { - if use wxwidgets ; then - xdg_pkg_postinst - fi -} - -pkg_postrm() { - if use wxwidgets ; then - xdg_pkg_postrm - fi -}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 4fe20ba10f43be2938c934c8922fb536420049f6 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jun 16 09:31:59 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jun 16 09:31:59 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe20ba1 games-emulation/vbam: add 2.1.9 Signed-off-by: Pacho Ramos gentoo.org> games-emulation/vbam/Manifest | 1 + games-emulation/vbam/vbam-2.1.9.ebuild | 115 + 2 files changed, 116 insertions(+) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 7002ed329ec3..9e943d8af8db 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,2 +1,3 @@ DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88 +DIST vbam-2.1.9.tar.gz 3641821 BLAKE2B 83f303741636f0c32d24c58fdd1b93c483ad82da17764ff3a7f1283f649f540452658693bd27febac3a8afc5871ffee6d8fff2e00f62fc23a211602244b64318 SHA512 de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6 diff --git a/games-emulation/vbam/vbam-2.1.9.ebuild b/games-emulation/vbam/vbam-2.1.9.ebuild new file mode 100644 index ..ab5f40c41f2f --- /dev/null +++ b/games-emulation/vbam/vbam-2.1.9.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit flag-o-matic wxwidgets xdg cmake + +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 +sdl wxwidgets" + +REQUIRED_USE=" + ffmpeg? ( wxwidgets ) + || ( sdl wxwidgets ) +" + +RDEPEND=" + >=media-libs/libpng-1.4:= + media-libs/libsdl2[joystick] + sys-libs/zlib:= + virtual/glu + virtual/opengl + link? ( >=media-libs/libsfml-2.0:= ) + lirc? ( app-misc/lirc ) + nls? ( virtual/libintl ) + wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) + media-libs/openal + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + app-arch/zip + virtual/pkgconfig + wxwidgets? ( virtual/imagemagick-tools ) + amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) + x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) + nls? ( sys-devel/gettext ) +" + +src_prepare() { + cmake_src_prepare + sed -i 's/ -mtune=generic//g' CMakeLists.txt || die +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/926080 + # https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1260 + filter-lto + + use wxwidgets && setup-wxwidgets + + local mycmakeargs=( + -DENABLE_FFMPEG=$(usex ffmpeg) + -DENABLE_LINK=$(usex link) + -DENABLE_LIRC=$(usex lirc) + -DENABLE_NLS=$(usex nls) + -DENABLE_SDL=$(usex sdl) + -DENABLE_WX=$(usex wxwidgets) + -DENABLE_ASM_CORE=$(usex x86) + -DENABLE_ASM_SCALERS=$(usex x86) + -DCMAKE_SKIP_RPATH=ON + -DENABLE_LTO=OFF + -DENABLE_ONLINEUPDATES=OFF + -DDISABLE_MACOS_PACKAGE_MANAGERS=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_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 + xdg_pkg_preinst + fi +} + +pkg_postinst() { + if use wxwidgets ; then + xdg_pkg_postinst + fi +} + +pkg_postrm() { + if use wxwidgets ; then + xdg_pkg_postrm + fi +}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 2a52ce00f4f2be7e623f89cba01799f75e8fed9a Author: Pacho Ramos gentoo org> AuthorDate: Thu Apr 18 16:55:20 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Apr 18 16:55:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a52ce00 games-emulation/vbam: support wxGTK 3.2 Signed-off-by: Pacho Ramos gentoo.org> games-emulation/vbam/vbam-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index e5c66f3e0817..cae4118aaf8e 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit wxwidgets xdg cmake if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 85fc56aec46c02a6c5ea1d46f940398e12022e34 Author: Eli Schwartz gmail com> AuthorDate: Fri Mar 22 02:57:33 2024 + Commit: Sam James gentoo org> CommitDate: Fri Mar 22 05:31:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fc56ae games-emulation/vbam: mark as LTO-unsafe Closes: https://bugs.gentoo.org/926080 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> games-emulation/vbam/vbam-2.1.7.ebuild | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-2.1.7.ebuild b/games-emulation/vbam/vbam-2.1.7.ebuild index c18685667d58..8208b7e893c4 100644 --- a/games-emulation/vbam/vbam-2.1.7.ebuild +++ b/games-emulation/vbam/vbam-2.1.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit wxwidgets xdg cmake +inherit flag-o-matic wxwidgets xdg cmake if [[ ${PV} == ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; @@ -61,6 +61,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/926080 + # https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1260 + filter-lto + use wxwidgets && setup-wxwidgets local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 2e808adf1da655e9bac4dca1772cd38ad109f152 Author: Pacho Ramos gentoo org> AuthorDate: Fri Nov 24 12:59:29 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Nov 24 12:59:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e808adf games-emulation/vbam: add 2.1.7 Closes: https://bugs.gentoo.org/899948 Closes: https://bugs.gentoo.org/903966 Closes: https://bugs.gentoo.org/916450 Signed-off-by: Pacho Ramos gentoo.org> games-emulation/vbam/Manifest | 1 + games-emulation/vbam/vbam-2.1.7.ebuild | 115 + 2 files changed, 116 insertions(+) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index b5f28a98042b..7002ed329ec3 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1 +1,2 @@ DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 +DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88 diff --git a/games-emulation/vbam/vbam-2.1.7.ebuild b/games-emulation/vbam/vbam-2.1.7.ebuild new file mode 100644 index ..c18685667d58 --- /dev/null +++ b/games-emulation/vbam/vbam-2.1.7.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit wxwidgets xdg cmake + +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=" + ffmpeg? ( wxwidgets ) + openal? ( wxwidgets ) + || ( sdl wxwidgets ) +" + +RDEPEND=" + >=media-libs/libpng-1.4:= + media-libs/libsdl2[joystick] + sys-libs/zlib:= + virtual/glu + virtual/opengl + link? ( >=media-libs/libsfml-2.0:= ) + lirc? ( app-misc/lirc ) + nls? ( virtual/libintl ) + wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) + openal? ( media-libs/openal ) + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + app-arch/zip + virtual/pkgconfig + wxwidgets? ( virtual/imagemagick-tools ) + amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) + x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) + nls? ( sys-devel/gettext ) +" + +src_prepare() { + cmake_src_prepare + sed -i 's/ -mtune=generic//g' CMakeLists.txt || die +} + +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_SDL=$(usex sdl) + -DENABLE_WX=$(usex wxwidgets) + -DENABLE_ASM_CORE=$(usex x86) + -DENABLE_ASM_SCALERS=$(usex x86) + -DCMAKE_SKIP_RPATH=ON + -DENABLE_LTO=OFF + -DENABLE_ONLINEUPDATES=OFF + -DDISABLE_MACOS_PACKAGE_MANAGERS=ON + ) + + if use wxwidgets; then + mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) + fi + + cmake_src_configure +} + +src_install() { + cmake_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 + xdg_pkg_preinst + fi +} + +pkg_postinst() { + if use wxwidgets ; then + xdg_pkg_postinst + fi +} + +pkg_postrm() { + if use wxwidgets ; then + xdg_pkg_postrm + fi +}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
commit: 0df89699667d83e4db2c81bf5fdb6f51ab5bace0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 7 15:10:43 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 7 17:25:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df89699 games-emulation/vbam: drop 2.1.4 Signed-off-by: Andreas Sturmlechner gentoo.org> games-emulation/vbam/Manifest | 1 - .../vbam/files/vbam-2.1.4-arm-asm.patch| 33 - .../vbam/files/vbam-2.1.4-cmake_fix.patch | 163 - .../vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch | 27 games-emulation/vbam/vbam-2.1.4.ebuild | 109 -- 5 files changed, 333 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index dc89a1dadd98..b5f28a98042b 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,2 +1 @@ -DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 diff --git a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch deleted file mode 100644 index bf6e2bd70e9e.. --- a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877.patch -https://bugs.gentoo.org/799362 - -From: Rafael Kitover -Date: Fri, 4 Oct 2019 07:35:49 + -Subject: [PATCH] xbrz: fix inline asm check - -Use correct cpp code to detect x86/amd64 architecture to use inline asm. - -Signed-off-by: Rafael Kitover a/src/filters/xBRZ/xbrz.cpp -+++ b/src/filters/xBRZ/xbrz.cpp -@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c - - inline double fastSqrt(double n) - { --#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION -+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__)) - __asm__ ("fsqrt" : "+t" (n)); - return n; --#elif _MSC_VER && _M_IX86 -+#elif defined(_MSC_VER) && defined(_M_IX86) - // speeds up xBRZ by about 9% compared to std::sqrt which internally uses - // the same assembler instructions but adds some "fluff" - __asm { - fld n - fsqrt - } --#else // _MSC_VER && _M_X64 OR other platforms -+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms - // VisualStudio x86_64 does not allow inline ASM - return std::sqrt(n); - #endif 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 deleted file mode 100644 index d801b08317a3.. --- a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch +++ /dev/null @@ -1,163 +0,0 @@ -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(FA
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: ff864f5fc9ea92617ffd9ce13352158250d9c512 Author: Sam James gentoo org> AuthorDate: Fri Jan 20 03:32:52 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 03:54:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff864f5f games-emulation/vbam: add 2.1.5 Closes: https://bugs.gentoo.org/834377 Signed-off-by: Sam James gentoo.org> games-emulation/vbam/Manifest | 1 + .../vbam/{vbam-.ebuild => vbam-2.1.5.ebuild}| 17 - games-emulation/vbam/vbam-.ebuild | 17 - 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index cce742bd3f1b..dc89a1dadd98 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1 +1,2 @@ DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 +DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-2.1.5.ebuild similarity index 91% copy from games-emulation/vbam/vbam-.ebuild copy to games-emulation/vbam/vbam-2.1.5.ebuild index 7cd76d64a0ef..e5c66f3e0817 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-2.1.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.0-gtk3" inherit wxwidgets xdg cmake @@ -29,12 +29,12 @@ REQUIRED_USE=" " RDEPEND=" - >=media-libs/libpng-1.4:0= + >=media-libs/libpng-1.4:= media-libs/libsdl2[joystick] - link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl + link? ( >=media-libs/libsfml-2.0:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( @@ -48,14 +48,16 @@ DEPEND=" " BDEPEND=" app-arch/zip + virtual/pkgconfig wxwidgets? ( virtual/imagemagick-tools ) + amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig " src_configure() { use wxwidgets && setup-wxwidgets + local mycmakeargs=( -DENABLE_FFMPEG=$(usex ffmpeg) -DENABLE_LINK=$(usex link) @@ -67,10 +69,14 @@ src_configure() { -DENABLE_ASM_SCALERS=$(usex x86) -DCMAKE_SKIP_RPATH=ON -DENABLE_LTO=OFF + -DENABLE_ONLINEUPDATES=OFF + -DDISABLE_MACOS_PACKAGE_MANAGERS=ON ) + if use wxwidgets; then mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) fi + cmake_src_configure } @@ -81,6 +87,7 @@ src_install() { dodoc doc/ReadMe.SDL.txt doman src/debian/vbam.6 fi + use wxwidgets && doman src/debian/visualboyadvance-m.6 } diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 7cd76d64a0ef..e5c66f3e0817 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.0-gtk3" inherit wxwidgets xdg cmake @@ -29,12 +29,12 @@ REQUIRED_USE=" " RDEPEND=" - >=media-libs/libpng-1.4:0= + >=media-libs/libpng-1.4:= media-libs/libsdl2[joystick] - link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl + link? ( >=media-libs/libsfml-2.0:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( @@ -48,14 +48,16 @@ DEPEND=" " BDEPEND=" app-arch/zip + virtual/pkgconfig wxwidgets? ( virtual/imagemagick-tools ) + amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig " src_configure() { use wxwidgets && setup-wxwidgets + local mycmakeargs=( -DENABLE_FFMPEG=$(usex ffmpeg) -DENABLE_LINK=$(usex link) @@ -67,10 +69,14 @@ src_configure() { -DENABLE_ASM_SCALERS=$(usex x86)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
commit: d9c52de97ac8da18f8ec9f7863950582aee3e71c Author: Sam James gentoo org> AuthorDate: Sun Nov 7 02:50:55 2021 + Commit: Sam James gentoo org> CommitDate: Sun Nov 7 02:50:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c52de9 games-emulation/vbam: fix build on arm(64) Closes: https://bugs.gentoo.org/799362 Signed-off-by: Sam James gentoo.org> .../vbam/files/vbam-2.1.4-arm-asm.patch| 33 ++ games-emulation/vbam/vbam-2.1.4.ebuild | 1 + 2 files changed, 34 insertions(+) diff --git a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch new file mode 100644 index 000..bf6e2bd70e9 --- /dev/null +++ b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch @@ -0,0 +1,33 @@ +https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877.patch +https://bugs.gentoo.org/799362 + +From: Rafael Kitover +Date: Fri, 4 Oct 2019 07:35:49 + +Subject: [PATCH] xbrz: fix inline asm check + +Use correct cpp code to detect x86/amd64 architecture to use inline asm. + +Signed-off-by: Rafael Kitover +--- a/src/filters/xBRZ/xbrz.cpp b/src/filters/xBRZ/xbrz.cpp +@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c + + inline double fastSqrt(double n) + { +-#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION ++#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__)) + __asm__ ("fsqrt" : "+t" (n)); + return n; +-#elif _MSC_VER && _M_IX86 ++#elif defined(_MSC_VER) && defined(_M_IX86) + // speeds up xBRZ by about 9% compared to std::sqrt which internally uses + // the same assembler instructions but adds some "fluff" + __asm { + fld n + fsqrt + } +-#else // _MSC_VER && _M_X64 OR other platforms ++#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms + // VisualStudio x86_64 does not allow inline ASM + return std::sqrt(n); + #endif diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index 21f3c2cf4a2..8fe87b4e148 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -57,6 +57,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-cmake_fix.patch "${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208 + "${FILESDIR}"/${P}-arm-asm.patch ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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/
commit: 4170d8bfd1daa58c8738c6a61db1e52187641a1d Author: Alexey Sokolov google com> AuthorDate: Thu Oct 29 01:42:09 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Nov 7 22:42:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4170d8bf games-emulation/vbam: don't override CMAKE_AR Closes: https://bugs.gentoo.org/733938 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/18064 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/vbam/vbam-2.1.4.ebuild | 1 + games-emulation/vbam/vbam-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index f006bb998fa..b9fd01b61bd 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -70,6 +70,7 @@ src_configure() { -DENABLE_ASM_CORE=$(usex x86) -DENABLE_ASM_SCALERS=$(usex x86) -DCMAKE_SKIP_RPATH=ON + -DENABLE_LTO=OFF ) if use wxwidgets; then mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 31465821c5d..7cd76d64a0e 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -66,6 +66,7 @@ src_configure() { -DENABLE_ASM_CORE=$(usex x86) -DENABLE_ASM_SCALERS=$(usex x86) -DCMAKE_SKIP_RPATH=ON + -DENABLE_LTO=OFF ) if use wxwidgets; then mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: f8a520bdece570707a9d584afed5a7fe10f6c02e Author: James Le Cuirot gentoo org> AuthorDate: Sat Jul 25 20:24:25 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jul 25 20:24:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a520bd games-emulation/vbam: Now build against ffmpeg-4, fix dependencies Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/vbam/vbam-2.1.4.ebuild | 20 +++- games-emulation/vbam/vbam-.ebuild | 20 +++- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index 4cddf8bc249..f006bb998fa 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -21,7 +21,12 @@ 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 )" + +REQUIRED_USE=" + ffmpeg? ( wxwidgets ) + openal? ( wxwidgets ) + || ( sdl wxwidgets ) +" RDEPEND=" >=media-libs/libpng-1.4:0= @@ -30,19 +35,24 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - )" -DEPEND="${RDEPEND} + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${P}-cmake_fix.patch diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index fa211e451c1..31465821c5d 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -21,7 +21,12 @@ 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 )" + +REQUIRED_USE=" + ffmpeg? ( wxwidgets ) + openal? ( wxwidgets ) + || ( sdl wxwidgets ) +" RDEPEND=" >=media-libs/libpng-1.4:0= @@ -30,19 +35,24 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - )" -DEPEND="${RDEPEND} + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig" + virtual/pkgconfig +" src_configure() { use wxwidgets && setup-wxwidgets
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 6f849e8dbdc837366fdcb39ebcf764be06bb9d52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jun 5 22:55:33 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jun 5 22:55:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f849e8d games-emulation/vbam: -DENABLE_OPENAL depends on IUSE=wxpython Closes: https://bugs.gentoo.org/660538 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> games-emulation/vbam/vbam-2.1.4.ebuild | 4 +++- games-emulation/vbam/vbam-.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index c469223e11d..4cddf8bc249 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -55,13 +55,15 @@ src_configure() { -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 ) + if use wxwidgets; then + mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) + fi cmake_src_configure } diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index dd9bfdfa90c..fa211e451c1 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -51,13 +51,15 @@ src_configure() { -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 ) + if use wxwidgets; then + mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) ) + fi cmake_src_configure }
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
commit: be5ec2798f9674ca0d90792681f1509891cbd0b3 Author: Tim Harder gentoo org> AuthorDate: Thu Feb 6 03:49:44 2020 + Commit: Tim Harder gentoo org> CommitDate: Thu Feb 6 03:49:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5ec279 games-emulation/vbam: remove old Signed-off-by: Tim Harder 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 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index fe54a9b045c..cce742bd3f1 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,2 +1 @@ -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.0-performance_fixup.patch b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch deleted file mode 100644 index c99f829bdc0..000 --- a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 3d0c2496b2e..000 --- a/games-emulation/vbam/vbam-2.1.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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 ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-perform
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 3d950cd83851795eb3513c0d4c306fc94e28f9e6 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 6 11:05:35 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 6 11:05:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d950cd8 games-emulation/vbam: Synced live ebuild Package-Manager: Portage-2.3.81, Repoman-2.3.19 Signed-off-by: Lars Wendler gentoo.org> games-emulation/vbam/vbam-.ebuild | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 507362bca85..f8607c8a0a0 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit gnome2-utils wxwidgets xdg-utils cmake-utils +inherit wxwidgets xdg cmake-utils if [[ ${PV} == ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; @@ -73,20 +73,18 @@ src_install() { pkg_preinst() { if use wxwidgets ; then - gnome2_icon_savelist + xdg_pkg_preinst fi } pkg_postinst() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst fi } pkg_postrm() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm fi }
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: c52fce4fb9838ec0d96d067cb2089c1b12f8dca4 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 6 11:07:40 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 6 11:07:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52fce4f games-emulation/vbam: Removed old Package-Manager: Portage-2.3.81, Repoman-2.3.19 Signed-off-by: Lars Wendler gentoo.org> games-emulation/vbam/Manifest | 1 - games-emulation/vbam/vbam-2.0.2.ebuild | 92 -- 2 files changed, 93 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 63f0ffb5f7b..fe54a9b045c 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,3 +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 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild deleted file mode 100644 index 507362bca85..000 --- a/games-emulation/vbam/vbam-2.0.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 ) - virtual/pkgconfig" - -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_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 -}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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}) + add_compile_opti
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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/
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/
commit: ef9f6bf56e2a038da4cdda33020cf9d8decf1e85 Author: James Le Cuirot gentoo org> AuthorDate: Wed Aug 29 21:21:24 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Aug 29 21:22:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9f6bf5 games-emulation/vbam: Pin ffmpeg back to version 3 It doesn't build with ffmpeg 4, the dependency is optional, and upstream don't appear to be in a hurry to fix it. Closes: https://bugs.gentoo.org/654176 Package-Manager: Portage-2.3.48, Repoman-2.3.10 games-emulation/vbam/vbam-2.0.2.ebuild | 2 +- games-emulation/vbam/vbam-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild index 53f480e326e..507362bca85 100644 --- a/games-emulation/vbam/vbam-2.0.2.ebuild +++ b/games-emulation/vbam/vbam-2.0.2.ebuild @@ -30,7 +30,7 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( media-video/ffmpeg:= ) + ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 53f480e326e..507362bca85 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -30,7 +30,7 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( media-video/ffmpeg:= ) + ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? (
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: c67ca2a173bf8cf325fb792fdc5a7afcde77a0cc Author: Tim Harder gentoo org> AuthorDate: Sun Mar 18 04:43:21 2018 + Commit: Tim Harder gentoo org> CommitDate: Sun Mar 18 04:44:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67ca2a1 games-emulation/vbam: version bump to 2.0.2 games-emulation/vbam/Manifest | 1 + games-emulation/vbam/vbam-2.0.2.ebuild | 92 ++ 2 files changed, 93 insertions(+) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 6b0c0502dc3..08ad2c375b5 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1 +1,2 @@ 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/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild new file mode 100644 index 000..53f480e326e --- /dev/null +++ b/games-emulation/vbam/vbam-2.0.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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:= ) + 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 ) + virtual/pkgconfig" + +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_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 +}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 9e90026294df8a59b74630511b1f8e30ba6881e9 Author: David Seifert gentoo org> AuthorDate: Sun Jan 21 10:19:23 2018 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 21 10:19:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e900262 games-emulation/vbam: Remove obsolete calls to 'edos2unix' * edos2unix is not required anymore Package-Manager: Portage-2.3.19, Repoman-2.3.6 games-emulation/vbam/vbam-2.0.1-r1.ebuild | 9 + games-emulation/vbam/vbam-.ebuild | 9 + 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild index 8185bd80ace..7895e9c087d 100644 --- a/games-emulation/vbam/vbam-2.0.1-r1.ebuild +++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 WX_GTK_VER="3.0-gtk3" -inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils +inherit gnome2-utils wxwidgets xdg-utils cmake-utils if [[ ${PV} == ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; @@ -49,13 +49,6 @@ PATCHES=( "${FILESDIR}"/${P}-read-version-from-changelog.patch ) -src_prepare() { - cmake-utils_src_prepare - - # fix desktop file QA warnings - edos2unix src/wx/wxvbam.desktop -} - src_configure() { use wxwidgets && setup-wxwidgets local mycmakeargs=( diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index a030b6e4a4d..53f480e326e 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -4,7 +4,7 @@ EAPI=6 WX_GTK_VER="3.0-gtk3" -inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils +inherit gnome2-utils wxwidgets xdg-utils cmake-utils if [[ ${PV} == ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; @@ -44,13 +44,6 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) virtual/pkgconfig" -src_prepare() { - cmake-utils_src_prepare - - # fix desktop file QA warnings - edos2unix src/wx/wxvbam.desktop -} - src_configure() { use wxwidgets && setup-wxwidgets local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: b226cc20961b7f3f5c091eaf02b30ecc2b503a93 Author: David Seifert gentoo org> AuthorDate: Sat Jan 20 19:53:26 2018 + Commit: David Seifert gentoo org> CommitDate: Sat Jan 20 19:53:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b226cc20 games-emulation/vbam: Modernise * Use GTK3 wxwidgets * Call cmake-utils_src_prepare * Remove redundant calls to src_compile * Add missing app-arch/zip DEPEND * Use proper ffmpeg/libav construct Closes: https://bugs.gentoo.org/642742 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../{vbam-2.0.1.ebuild => vbam-2.0.1-r1.ebuild}| 23 +++--- games-emulation/vbam/vbam-.ebuild | 22 ++--- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild similarity index 86% rename from games-emulation/vbam/vbam-2.0.1.ebuild rename to games-emulation/vbam/vbam-2.0.1-r1.ebuild index c564e02df5d..8185bd80ace 100644 --- a/games-emulation/vbam/vbam-2.0.1.ebuild +++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild @@ -2,8 +2,9 @@ # 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 + +WX_GTK_VER="3.0-gtk3" +inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils if [[ ${PV} == ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; @@ -22,13 +23,14 @@ SLOT="0" IUSE="ffmpeg link lirc nls openal +sdl wxwidgets" REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )" -RDEPEND=">=media-libs/libpng-1.4:0= +RDEPEND=" + >=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) - sys-libs/zlib + sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( virtual/ffmpeg[-libav] ) + ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( @@ -36,18 +38,19 @@ RDEPEND=">=media-libs/libpng-1.4:0= 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 ) virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-changelog-update.patch" - "${FILESDIR}/${P}-read-version-from-changelog.patch" + "${FILESDIR}"/${P}-changelog-update.patch + "${FILESDIR}"/${P}-read-version-from-changelog.patch ) src_prepare() { - default + cmake-utils_src_prepare # fix desktop file QA warnings edos2unix src/wx/wxvbam.desktop @@ -70,10 +73,6 @@ src_configure() { cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { cmake-utils_src_install diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 357c9489310..a030b6e4a4d 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -2,15 +2,17 @@ # 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 + +WX_GTK_VER="3.0-gtk3" +inherit eutils 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://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; + 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" @@ -21,13 +23,14 @@ SLOT="0" IUSE="ffmpeg link lirc nls openal +sdl wxwidgets" REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )" -RDEPEND=">=media-libs/libpng-1.4:0= +RDEPEND=" + >=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) - sys-libs/zlib + sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( virtual/ffmpeg[-libav] ) + ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( @@ -35,13 +38,14 @@ RDEPEND=">=media-libs/libpng-1.4:0= 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 ) virtual/pkgconfig" src_prepare() { - default + cmake-utils_src_prepare # fix desktop file QA warnings edos2unix src/wx/wxvbam.desktop @@ -6
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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/
commit: 9da917d8e4fdf15ddae409534ea7c4bc29e6115c Author: Nado troglodyte be> AuthorDate: Fri Jan 12 22:36:25 2018 + Commit: David Seifert gentoo org> CommitDate: Sat Jan 13 22:17:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da917d8 games-emulation/vbam: update to new requirements from upstream * switch from fdo-mime to xdg-utils * add missing REQUIRED_USE constraints * remove gtk port as it is no longer supported by upstream * remove cairo support for the same reason Closes: https://bugs.gentoo.org/638300 Package-Manager: Portage-2.3.19, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6847 games-emulation/vbam/vbam-.ebuild | 31 --- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 0af06c4e2c8..357c9489310 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.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} == ]]; 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 }
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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 parallelize LTO link with gcc ++- f
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: a5aa5029aa649637c91bd8d2188cbfc52679441e Author: Alexander Tsoy tsoy me> AuthorDate: Sat Dec 30 15:22:20 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Dec 30 21:40:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5aa5029 games-emulation/vbam: add missing setup-wxwidgets() setup-wxwidgets() is required in EAPI 6 ebuilds. Probably it was forgotten with EAPI bump. Closes: https://bugs.gentoo.org/604244 Closes: https://github.com/gentoo/gentoo/pull/6690 games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild | 1 + games-emulation/vbam/vbam-.ebuild | 1 + 2 files changed, 2 insertions(+) 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 index 055ea0f7ff4..21315294a29 100644 --- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild @@ -54,6 +54,7 @@ PATCHES=( ) src_configure() { + use wxwidgets && setup-wxwidgets local mycmakeargs=( -DENABLE_CAIRO=$(usex cairo) -DENABLE_FFMPEG=$(usex ffmpeg) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 5fe89033daf..0af06c4e2c8 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -52,6 +52,7 @@ src_prepare() { } src_configure() { + use wxwidgets && setup-wxwidgets local mycmakeargs=( -DENABLE_CAIRO=$(usex cairo) -DENABLE_FFMPEG=$(usex ffmpeg)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/
commit: f2ae55efabc369978f202029aa169ddafe67a9cb Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Dec 22 15:23:49 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Dec 23 13:10:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ae55ef games-emulation/vbam: remove unused patch games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch | 13 - 1 file changed, 13 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 deleted file mode 100644 index bd4afb2f33a..000 --- a/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch +++ /dev/null @@ -1,13 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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 )
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 58d54220598f5301b4e65e0e19a938f0bb037149 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Dec 16 10:29:43 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Dec 16 10:31:17 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d54220 games-emulation/vbam-2.0.0_beta2_p20161211-r1: amd64 stable Gentoo-Bug: http://bugs.gentoo.org/632515 games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 72f32af3fea..055ea0f7ff4 100644 --- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]]; then inherit git else SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/c2165287938aea2306a75f0714744a6d23ba7dab.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" inherit vcs-snapshot fi
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: a29d1de907adef50e5c0db7b9b06b00dfa36c6d8 Author: Lars Wendler gentoo org> AuthorDate: Tue Dec 27 05:42:43 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue Dec 27 05:42:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29d1de9 games-emulation/vbam: package RDEPENDs on media-libs/libsdl2 (bug #603808). Thanks to Daniel M. Weeks for reporting this. Package-Manager: Portage-2.3.3, Repoman-2.3.1 games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild | 2 +- games-emulation/vbam/vbam-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild index 59f55d9..6ad0a84 100644 --- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild @@ -24,7 +24,7 @@ IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" REQUIRED_USE="|| ( sdl gtk wxwidgets )" RDEPEND="media-libs/libpng:0= - media-libs/libsdl[sound] + media-libs/libsdl2[sound] sys-libs/zlib virtual/glu virtual/opengl diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index e198f37..031fcad 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -23,7 +23,7 @@ IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" REQUIRED_USE="|| ( sdl gtk wxwidgets )" RDEPEND=">=media-libs/libpng-1.4:0= - media-libs/libsdl[joystick] + media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 9afbc342b8b48d0bbf2416a3fc583db9c1a54ddd Author: Nicholas Vinson gmail com> AuthorDate: Sun Dec 11 17:51:30 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 11 18:10:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9afbc342 games-emulation/vbam: Correct Vbam ebuild name Rename vbam-2.0.0_beta2_pre20161211.tar.gz to vbam-2.0.0_beta2_p20161211.tar.gz. The ebuild points to a version that came out after v2.0.0_beta2. Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3088 games-emulation/vbam/Manifest | 2 +- ...2.0.0_beta2_pre20161211.ebuild => vbam-2.0.0_beta2_p20161211.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index eebfa6a..b68ed3f 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,4 +1,4 @@ -DIST vbam-2.0.0_beta2_pre20161211.tar.gz 3075570 SHA256 32902dd418446ed8150098e776eecb0e8567cb39c36037eb0d19d0973e071043 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40 WHIRLPOOL 06ec3273abf1454b908a24825cb1db9d32d4ce2c9ac417066809174ae82e74b3b7477bdcac711aabe0540e8e3ef706453bb6cfbfc4c7a19267658440a632e39e +DIST vbam-2.0.0_beta2_p20161211.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/vbam-2.0.0_beta2_pre20161211.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild similarity index 100% rename from games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild rename to games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/, games-emulation/vbam/files/
commit: 6600eb6642e3f67d15edb73522aa406caad8f7f9 Author: Nicholas Vinson gmail com> AuthorDate: Sat Dec 19 15:10:43 2015 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 11 13:48:42 2016 + 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 ..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 ..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 ..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_STA
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: dd706ea0be38d3b6582534c585db797a292beaf0 Author: Nicholas Vinson gmail com> AuthorDate: Sun Dec 11 10:55:52 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 11 13:48:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd706ea0 games-emulation/vbam: rename vbam-2.0.0_pre1507.ebuild Rename vbam-2.0.0_pre1507.ebuild to vbam-2.0.0_beta2_pre1507.ebuild. This ensures the new version (vbam-2.0.0_beta2_pre20161211.ebuild) to be favored over the older pre version. Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3076 0_pre1507.ebuild => vbam-2.0.0_beta2_pre1507.ebuild} | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild similarity index 90% rename from games-emulation/vbam/vbam-2.0.0_pre1507.ebuild rename to games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild index 1c1d406..5bd487a 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild @@ -7,11 +7,13 @@ WX_GTK_VER="3.0" CMAKE_MAKEFILE_GENERATOR=emake inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games +MY_P=${P//_beta2/} + if [[ ${PV} == ]]; then ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; inherit subversion else - SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; + SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${MY_P}.tar.xz"; KEYWORDS="amd64 x86" # upstream patches @@ -55,6 +57,8 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) virtual/pkgconfig" +S="${WORKDIR}"/${MY_P} + src_prepare() { [[ ${PV} == ]] && subversion_src_prepare @@ -63,13 +67,13 @@ src_prepare() { sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \ CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die - epatch "${FILESDIR}"/${P}-man.patch + epatch "${FILESDIR}"/${MY_P}-man.patch epatch \ - "${DISTDIR}/${P}-ffmpeg3_defines.patch" \ - "${DISTDIR}/${P}-ffmpeg3_audio_recording_kludge.patch" \ - "${DISTDIR}/${P}-ffmpeg3_encoders_no_s16.patch" \ - "${DISTDIR}/${P}-ffmpeg3_nonfunc_video_encoding.patch" + "${DISTDIR}/${MY_P}-ffmpeg3_defines.patch" \ + "${DISTDIR}/${MY_P}-ffmpeg3_audio_recording_kludge.patch" \ + "${DISTDIR}/${MY_P}-ffmpeg3_encoders_no_s16.patch" \ + "${DISTDIR}/${MY_P}-ffmpeg3_nonfunc_video_encoding.patch" } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 97e7760baefab27351eda33af87d674a673fbe1d Author: Pacho Ramos gentoo org> AuthorDate: Tue Dec 6 09:11:30 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Dec 6 09:13:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e7760b games-emulation/vbam: Fix compat with ffmpeg-3 (#574894 by Lars Wendler (Polynomial-C)). Package-Manager: portage-2.3.2 games-emulation/vbam/Manifest | 4 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 12 2 files changed, 16 insertions(+) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 7415663..ba7e08e 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1 +1,5 @@ +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 +DIST vbam-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch 1810 SHA256 49f969a4b6e11b06cd2f1c26849e8f13dd0e9b610345888abd44f9fe6c146d60 SHA512 923851a8ace4d1f65eeb2cc3384abc2886fb22460eae2a583b82e19dfd9a3a5fcb4ed044d3a1b1b14d29d83d289daff7690b2511596a4f163bd407c452f7776c WHIRLPOOL ed95f7477c0ae1fa5a42635942a18b5f6bd87b0e5450b2615af50f95bf37e6d15c8117810850a3f99a3949109dc64d2bf73d679ae42fce9ebc7129d0399c411c DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200 diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index 186e685..1c1d406 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -13,6 +13,12 @@ if [[ ${PV} == ]]; then else SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; KEYWORDS="amd64 x86" + + # upstream patches + SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/3f3c3859c1c5f92937bef5d3398a37605e9c16ec.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_defines.patch" + SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/029a5fc14b8e5d6f6ce724e66564f9ef89c6a809.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch" + SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/a3a07d2f565756771e9c4f0b9574dcffe51c2fa4.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch" + SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/502de18456ee272c4bf264f2db9bea73a6b0bfd0.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch" fi DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" @@ -58,6 +64,12 @@ src_prepare() { sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \ CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die epatch "${FILESDIR}"/${P}-man.patch + + epatch \ + "${DISTDIR}/${P}-ffmpeg3_defines.patch" \ + "${DISTDIR}/${P}-ffmpeg3_audio_recording_kludge.patch" \ + "${DISTDIR}/${P}-ffmpeg3_encoders_no_s16.patch" \ + "${DISTDIR}/${P}-ffmpeg3_nonfunc_video_encoding.patch" } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 0ca8f58344643b381c0ec900b73960c75226c5c4 Author: Tim Harder gentoo org> AuthorDate: Fri Aug 26 05:10:17 2016 + Commit: Tim Harder gentoo org> CommitDate: Fri Aug 26 05:17:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca8f583 games-emulation/vbam: update to EAPI 6 and drop games eclass usage games-emulation/vbam/vbam-.ebuild | 51 +-- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index acb9bda..e198f37 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets gnome2-utils fdo-mime games +inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils if [[ ${PV} == ]]; then - ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; - inherit subversion + EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"; + inherit git-r3 else SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" -HOMEPAGE="https://sourceforge.net/projects/vbam/"; +HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"; LICENSE="GPL-2" SLOT="0" @@ -24,7 +24,7 @@ REQUIRED_USE="|| ( sdl gtk wxwidgets )" RDEPEND=">=media-libs/libpng-1.4:0= media-libs/libsdl[joystick] - link? ( >=media-libs/libsfml-2.0 ) + link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl @@ -46,13 +46,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - [[ ${PV} == ]] && subversion_src_prepare - - # fix issue with zlib-1.2.5.1 macros (bug #383179) - 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 + default # fix desktop file QA warnings edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop @@ -60,19 +54,18 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake-utils_use_enable cairo CAIRO) - $(cmake-utils_use_enable ffmpeg FFMPEG) - $(cmake-utils_use_enable gtk GTK) - $(cmake-utils_use_enable link LINK) - $(cmake-utils_use_enable lirc LIRC) - $(cmake-utils_use_enable nls NLS) - $(cmake-utils_use_enable openal OPENAL) - $(cmake-utils_use_enable sdl SDL) - $(cmake-utils_use_enable wxwidgets WX) - $(cmake-utils_use_enable x86 ASM_CORE) - $(cmake-utils_use_enable x86 ASM_SCALERS) + -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/games/${PN} ) cmake-utils_src_configure } @@ -90,21 +83,15 @@ src_install() { fi use wxwidgets && doman src/debian/wxvbam.1 use gtk && doman src/debian/gvbam.1 - - prepgamesdirs } pkg_preinst() { - [[ ${PV} == ]] && subversion_pkg_preinst - - games_pkg_preinst if use gtk || use wxwidgets ; then gnome2_icon_savelist fi } pkg_postinst() { - games_pkg_postinst if use gtk || use wxwidgets ; then gnome2_icon_cache_update fi
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 1a0e98ed2a7193305a752a66256b9c2a983f4a75 Author: Tim Harder gentoo org> AuthorDate: Fri Aug 26 05:12:34 2016 + Commit: Tim Harder gentoo org> CommitDate: Fri Aug 26 05:17:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0e98ed games-emulation/vbam: add github upstream metadata games-emulation/vbam/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml index caad129..0211d21 100644 --- a/games-emulation/vbam/metadata.xml +++ b/games-emulation/vbam/metadata.xml @@ -9,6 +9,6 @@ Enable GBA linking functionality - vbam + visualboyadvance-m/visualboyadvance-m
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 32f8d90649164ca4a2674273ba961fa283b47607 Author: Michael Sterrett gentoo org> AuthorDate: Sun Apr 3 03:07:41 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sun Apr 3 03:08:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f8d906 games-emulation/vbam: explicitly set the makefile ganerator (bug #562540) Package-Manager: portage-2.2.26 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index f9c8f35..b65ee28 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 WX_GTK_VER="3.0" +CMAKE_MAKEFILE_GENERATOR=emake inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 13416e8e5b771305ceab90d018877106abcd96ed Author: Michael Sterrett gentoo org> AuthorDate: Fri Jan 1 07:20:05 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Fri Jan 1 07:20:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13416e8e games-emulation/vbam: fix building with libsigc++-2.6 (bug #568792) Package-Manager: portage-2.2.24 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index f907be2..f9c8f35 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -4,7 +4,7 @@ EAPI=5 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets gnome2-utils fdo-mime games +inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games if [[ ${PV} == ]]; then ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; @@ -60,6 +60,8 @@ src_prepare() { } src_configure() { + # Bug #568792 + append-cxxflags -std=c++11 -fpermissive local mycmakeargs=( $(cmake-utils_use_enable cairo CAIRO) $(cmake-utils_use_enable ffmpeg FFMPEG)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 13b92a8ca5ab2d5905c17df4f232ab0cdbd036c9 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Dec 11 10:06:09 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Dec 11 10:06:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b92a8c games-emulation/vbam: amd64 stable wrt bug #567948 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index 146aafb..5321a2c 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == ]]; then inherit subversion else SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: dd1cf30dd5baef5f827d55fee88cc1c54d6a921c Author: Michael Sterrett gentoo org> AuthorDate: Tue Nov 10 16:57:16 2015 + Commit: Michael Sterrett gentoo org> CommitDate: Tue Nov 10 16:57:43 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1cf30d drop attempt at enabling mmx support since it doesn't work on amd64 (bug #564980) Package-Manager: portage-2.2.20.1 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index 0e0e07b..146aafb 100644 --- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://sourceforge.net/projects/vbam/"; LICENSE="GPL-2+" SLOT="0" -IUSE="cairo cpu_flags_x86_mmx ffmpeg gtk link lirc nls openal +sdl wxwidgets" +IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" REQUIRED_USE="|| ( sdl gtk wxwidgets )" RDEPEND=">=media-libs/libpng-1.4:0= @@ -72,7 +72,6 @@ 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} )
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/
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 }
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 74e69c90edb6e8a5989417b85d0fe647fa842a96 Author: Tim Harder gentoo org> AuthorDate: Sat Aug 29 20:22:35 2015 + Commit: Tim Harder gentoo org> CommitDate: Sat Aug 29 20:23:54 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e69c90 games-emulation/vbam: version bump to new snapshot Also merge the live and snapshot ebuilds. games-emulation/vbam/Manifest | 1 + .../{vbam-.ebuild => vbam-2.0.0_pre1507.ebuild} | 21 - games-emulation/vbam/vbam-.ebuild | 21 - 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index d5dd232..1978f16 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1 +1,2 @@ DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a +DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200 diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild similarity index 87% copy from games-emulation/vbam/vbam-.ebuild copy to games-emulation/vbam/vbam-2.0.0_pre1507.ebuild index 12b7eb2..5ddac33 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild @@ -4,16 +4,21 @@ EAPI=5 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games +inherit cmake-utils wxwidgets gnome2-utils fdo-mime games -ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; +if [[ ${PV} == ]]; then + ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; + inherit subversion +else + SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" HOMEPAGE="http://sourceforge.net/projects/vbam/"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" REQUIRED_USE="|| ( sdl gtk wxwidgets )" @@ -40,12 +45,9 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) virtual/pkgconfig" -src_unpack() { - subversion_src_unpack -} - src_prepare() { - subversion_src_prepare + [[ ${PV} == ]] && subversion_src_prepare + # fix issue with zlib-1.2.5.1 macros (bug #383179) sed -i '1i#define OF(x) x' src/common/memgzio.c || die @@ -93,7 +95,8 @@ src_install() { } pkg_preinst() { - subversion_pkg_preinst + [[ ${PV} == ]] && subversion_pkg_preinst + games_pkg_preinst if use gtk || use wxwidgets ; then gnome2_icon_savelist diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 12b7eb2..5ddac33 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -4,16 +4,21 @@ EAPI=5 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games +inherit cmake-utils wxwidgets gnome2-utils fdo-mime games -ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; +if [[ ${PV} == ]]; then + ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; + inherit subversion +else + SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"; + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" HOMEPAGE="http://sourceforge.net/projects/vbam/"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" REQUIRED_USE="|| ( sdl gtk wxwidgets )" @@ -40,12 +45,9 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) virtual/pkgconfig" -src_unpack() { - subversion_src_unpack -} - src_prepare() { - subversion_src_prepare + [[ ${PV} == ]] && subversion_src_prepare + # fix issue with zlib-1.2.5.1 macros (bug #383179) sed -i '1i#define OF(x) x' src/common/memgzio.c || die @@ -93,7 +95,8 @@ src_install() { } pkg_preinst() { - subversion_pkg_preinst + [[ ${PV} == ]] && subversion_pkg_preinst + games_pkg_preinst if use gtk || use wxwidgets ; then gnome2_icon_savelist
[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
commit: 1dd5c1f6f3d337ed32af8f64e172432ea01fbeb9 Author: Tim Harder gentoo org> AuthorDate: Sat Aug 29 20:07:54 2015 + Commit: Tim Harder gentoo org> CommitDate: Sat Aug 29 20:23:54 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd5c1f6 games-emulation/vbam: update repo and libsfml dep for live ebuild games-emulation/vbam/vbam-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/vbam/vbam-.ebuild b/games-emulation/vbam/vbam-.ebuild index 2ac6f5d..12b7eb2 100644 --- a/games-emulation/vbam/vbam-.ebuild +++ b/games-emulation/vbam/vbam-.ebuild @@ -6,7 +6,7 @@ EAPI=5 WX_GTK_VER="3.0" inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games -ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"; +ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"; DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" HOMEPAGE="http://sourceforge.net/projects/vbam/"; @@ -19,7 +19,7 @@ REQUIRED_USE="|| ( sdl gtk wxwidgets )" RDEPEND=">=media-libs/libpng-1.4:0= media-libs/libsdl[joystick] - link? ( =media-libs/libsfml-2.0 ) sys-libs/zlib virtual/glu virtual/opengl