Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
merged:

  flora: b3ee5e5ca00773c409161d51eadf02cab8817164
  faustoo: bf1fce712f3a88c9d8ae11b0e5cfacb55c419ba5
  fusion809: cbb54e575c82ed11962c62e140de1bad900c752b
  gentoo-staging: 78d62d926646ab1a4932f848fa06b966e57cafd9
  kit-fixups: afcb31da31948a6711d46c88b9dd2be947a73405
  • Loading branch information
danielrobbins committed Nov 11, 2018
1 parent 7e72eb8 commit 829b8cd
Show file tree
Hide file tree
Showing 7 changed files with 267 additions and 4 deletions.
99 changes: 99 additions & 0 deletions games-board/freedoko/freedoko-0.7.16-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
inherit eutils flag-o-matic gnome2-utils

DESCRIPTION="FreeDoko is a Doppelkopf-game"
HOMEPAGE="http://free-doko.sourceforge.net"
SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
!xskatcards? (
!kdecards? (
!gnomecards? (
!openclipartcards? (
!pysolcards? (
mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"

LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds"

RDEPEND=">=dev-cpp/gtkmm-2.4:2.4"
DEPEND="${RDEPEND}
app-arch/unzip
virtual/pkgconfig"

S=${WORKDIR}/FreeDoko_${PV}

src_unpack() {
local cards=0

unpack_cards() {
use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
}
unpack FreeDoko_${PV}.src.zip
cp /dev/null "${S}"/src/Makefile.local || die

cd "${S}"/data/cardsets || die

unpack_cards xskatcards xskat.zip
unpack_cards kdecards kdecarddecks.zip
unpack_cards pysolcards pysol.zip
unpack_cards gnomecards gnome-games.zip
unpack_cards openclipartcards openclipart.zip
[ $cards ] || unpack xskat.zip # fall back to xskat

if use backgrounds ; then
cd "${S}"/data/backgrounds || die
unpack ${PN}-backgrounds.zip
fi
}

PATCHES=(
"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
)

src_prepare() {
default
export VARTEXFONTS="${T}/fonts" #652028
append-cxxflags -std=c++14
}

src_compile() {
export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
export OSTYPE=Linux
export USE_NETWORK=false
export USE_SOUND_ALUT=false # still marked experimental
emake Version
emake -C src FreeDoko
}

src_install() {
newbin src/FreeDoko freedoko
insinto /usr/share/${PN}/
doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
find "${D}/usr/share/${PN}" -name Makefile -delete
dodoc AUTHORS README ChangeLog
newicon -s 32 src/FreeDoko.png ${PN}.png
make_desktop_entry ${PN} FreeDoko
}

pkg_preinst() {
gnome2_icon_savelist
}

pkg_postinst() {
gnome2_icon_cache_update
}

pkg_postrm() {
gnome2_icon_cache_update
}
1 change: 1 addition & 0 deletions games-emulation/vbam/Manifest
Original file line number Diff line number Diff line change
@@ -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
43 changes: 43 additions & 0 deletions games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
From: Rafael Kitover <[email protected]>
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
96 changes: 96 additions & 0 deletions games-emulation/vbam/vbam-2.1.0.ebuild
Original file line number Diff line number Diff line change
@@ -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} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
inherit git-r3
else
SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/visualboyadvance-m-${PV}"
fi

DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"

LICENSE="GPL-2"
SLOT="0"
IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"

RDEPEND="
>=media-libs/libpng-1.4:0=
media-libs/libsdl2[joystick]
link? ( >=media-libs/libsfml-2.0:= )
sys-libs/zlib:=
virtual/glu
virtual/opengl
ffmpeg? ( =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}-performance_fixup.patch"
)

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
}
5 changes: 1 addition & 4 deletions games-misc/doge/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>[email protected]</email>
<name>Vikraman Choudhury</name>
</maintainer>
<!--maintainer-needed-->
<longdescription lang="en">
doge is a simple motd script based on the slightly stupid but very funny doge meme. It prints random grammatically incorrect statements that are sometimes based on things from your computer.
</longdescription>
Expand Down
13 changes: 13 additions & 0 deletions metadata/md5-cache/games-board/freedoko-0.7.16-r1
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
DEPEND=>=dev-cpp/gtkmm-2.4:2.4 app-arch/unzip virtual/pkgconfig >=sys-apps/sed-4
DESCRIPTION=FreeDoko is a Doppelkopf-game
EAPI=6
HOMEPAGE=http://free-doko.sourceforge.net
IUSE=+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-cpp/gtkmm-2.4:2.4
SLOT=0
SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.16.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils 1fb064d93b3ffd05c2fb19ef430a4aa1 flag-o-matic 02908f00f002f0f07c5b74783d778325 gnome2-utils 22ebae0b986793be079d9d93fa16a8ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee xdg-utils 9ef13b5c5bcf0c50d6aa53692d8e441c
_md5_=b483eace101c2a260ea825686508af0e
14 changes: 14 additions & 0 deletions metadata/md5-cache/games-emulation/vbam-2.1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
DEPEND=>=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:3.0-gtk3[X,opengl] ) app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2
DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
EAPI=6
HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
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:3.0-gtk3[X,opengl] )
REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
SLOT=0
SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.0.tar.gz -> vbam-2.1.0.tar.gz
_eclasses_=cmake-utils 1878df07fb7968266bdbcfcd576fea4b epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils 1fb064d93b3ffd05c2fb19ef430a4aa1 flag-o-matic 02908f00f002f0f07c5b74783d778325 gnome2-utils 22ebae0b986793be079d9d93fa16a8ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 2e13cdcb950cddcb1f52c92c9712a675 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 wxwidgets c13f16b67f5a1378ff9ac6dcf57fc9b1 xdg-utils 9ef13b5c5bcf0c50d6aa53692d8e441c
_md5_=a0b20bfab2bdbbf2a501770b31899084

0 comments on commit 829b8cd

Please sign in to comment.