Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/zsnes/files/, games-emulation/zsnes/
Date: Mon, 28 Oct 2019 21:39:01
Message-Id: 1572298710.b696a4232de0de1fad8e77c642e2b506e2433ff4.chewi@gentoo
1 commit: b696a4232de0de1fad8e77c642e2b506e2433ff4
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 28 21:27:51 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 28 21:38:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b696a423
7
8 games-emulation/zsnes: Drop old 1.51-r6
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 .../zsnes/files/zsnes-1.51-stack-align.patch | 15 ---
14 games-emulation/zsnes/zsnes-1.51-r6.ebuild | 117 ---------------------
15 2 files changed, 132 deletions(-)
16
17 diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
18 deleted file mode 100644
19 index 5dcbf3ad9eb..00000000000
20 --- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
21 +++ /dev/null
22 @@ -1,15 +0,0 @@
23 ---- src/linux/sdllink.c.old
24 -+++ src/linux/sdllink.c
25 -@@ -773,11 +773,11 @@ BOOL InitInput()
26 - {
27 - InitJoystickInput();
28 - return TRUE;
29 - }
30 -
31 --int startgame()
32 -+int __attribute__((force_align_arg_pointer)) startgame()
33 - {
34 - static bool ranonce = false;
35 - int status;
36 -
37 - if (!ranonce)
38
39 diff --git a/games-emulation/zsnes/zsnes-1.51-r6.ebuild b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
40 deleted file mode 100644
41 index 288fa85dff1..00000000000
42 --- a/games-emulation/zsnes/zsnes-1.51-r6.ebuild
43 +++ /dev/null
44 @@ -1,117 +0,0 @@
45 -# Copyright 1999-2018 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -
48 -EAPI=6
49 -inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
50 -
51 -DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
52 -HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
53 -SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
54 -
55 -LICENSE="GPL-2"
56 -SLOT="0"
57 -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
58 -IUSE="ao custom-cflags +debug opengl pax_kernel png"
59 -
60 -RDEPEND="
61 - media-libs/libsdl[sound,video,abi_x86_32(-)]
62 - >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
63 - ao? ( media-libs/libao[abi_x86_32(-)] )
64 - debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
65 - opengl? ( virtual/opengl[abi_x86_32(-)] )
66 - png? ( media-libs/libpng:0=[abi_x86_32(-)] )
67 -"
68 -DEPEND="${RDEPEND}
69 - dev-lang/nasm
70 - debug? ( virtual/pkgconfig )
71 -"
72 -
73 -S="${WORKDIR}/${PN}_${PV//./_}/src"
74 -
75 -src_prepare() {
76 - default
77 -
78 - # Fixing compilation without libpng installed
79 - # Fix bug #186111
80 - # Fix bug #214697
81 - # Fix bug #170108
82 - # Fix bug #260247
83 - # Fix compability with libpng15 wrt #378735
84 - # Fix buffer overwrite #257963
85 - # Fix gcc47 compile #419635
86 - # Fix stack alignment issue #503138
87 - eapply \
88 - "${FILESDIR}"/${P}-libpng.patch \
89 - "${FILESDIR}"/${P}-archopt-july-23-update.patch \
90 - "${FILESDIR}"/${P}-gcc43.patch \
91 - "${FILESDIR}"/${P}-libao-thread.patch \
92 - "${FILESDIR}"/${P}-depbuild.patch \
93 - "${FILESDIR}"/${P}-CC-quotes.patch \
94 - "${FILESDIR}"/${P}-libpng15.patch \
95 - "${FILESDIR}"/${P}-buffer.patch \
96 - "${FILESDIR}"/${P}-gcc47.patch \
97 - "${FILESDIR}"/${P}-stack-align.patch \
98 - "${FILESDIR}"/${P}-cross-compile.patch \
99 - "${FILESDIR}"/${P}-arch.patch
100 -
101 - # The sdl detection logic uses AC_PROG_PATH instead of
102 - # AC_PROG_TOOL, so force the var to get set the way we
103 - # need for things to work correctly.
104 - tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
105 -
106 - sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
107 -
108 - # Remove hardcoded CFLAGS and LDFLAGS
109 - sed -i \
110 - -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
111 - -e '/^LDFLAGS=.*local/d' \
112 - -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
113 - -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
114 - -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
115 - configure.in || die
116 - sed -i \
117 - -e 's/configure.in/configure.ac/' \
118 - Makefile.in || die
119 - mv configure.in configure.ac || die
120 - eautoreconf
121 -}
122 -
123 -src_configure() {
124 - tc-export CC
125 - export BUILD_CXX=$(tc-getBUILD_CXX)
126 - export NFLAGS=-O1
127 - use amd64 && multilib_toolchain_setup x86
128 - use custom-cflags || strip-flags
129 -
130 - append-cppflags -U_FORTIFY_SOURCE #257963
131 -
132 - econf \
133 - $(use_enable ao libao) \
134 - $(use_enable debug debugger) \
135 - $(use_enable png libpng) \
136 - $(use_enable opengl) \
137 - --disable-debug \
138 - --disable-cpucheck
139 -}
140 -
141 -src_compile() {
142 - emake makefile.dep
143 - emake
144 -}
145 -
146 -src_install() {
147 - dobin zsnes
148 - if use pax_kernel; then
149 - pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
150 - fi
151 -
152 - newman linux/zsnes.1 zsnes.6
153 -
154 - dodoc \
155 - ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
156 - ../docs/readme.txt/*
157 - HTML_DOCS="../docs/readme.htm/*" einstalldocs
158 -
159 - make_desktop_entry zsnes ZSNES
160 - newicon icons/48x48x32.png ${PN}.png
161 -}