diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /games-emulation/generator | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'games-emulation/generator')
| -rw-r--r-- | games-emulation/generator/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/generator/files/generator-0.35_p4-gcc-9.patch | 22 | ||||
| -rw-r--r-- | games-emulation/generator/generator-0.35_p4-r1.ebuild | 20 |
3 files changed, 33 insertions, 12 deletions
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest index 95dc701335c6..fdc7077ee71a 100644 --- a/games-emulation/generator/Manifest +++ b/games-emulation/generator/Manifest @@ -1,6 +1,7 @@ AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed +AUX generator-0.35_p4-gcc-9.patch 910 BLAKE2B 3ce9f860d426eec544d15661009b163a3987007faacbc94f336442d46217559b0f427494a08a0cda7e4390f005f9d1f7f4cde0917c41535f5ac6a5344d501d6e SHA512 407adae63334745dce89d8432a2b3142ebc7ca57b040fc104bfe1bdd6e03bdd3b82c9605ddb247e7b4ce1102ce71486b463e7ec92eb4b4c40fe9527198a280ca AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620 -EBUILD generator-0.35_p4-r1.ebuild 1092 BLAKE2B de4360b80c7109f3c8c0925a67f53a113bb2c48aa50ebdde7c3ade30363eff0ee2b007819936aab0ff8783c292158af9a699bc0cc70503365c7d040ef131240f SHA512 f54d48b13d10a30529a946a44f1a35ecb7dfcf032a578ceda75404affb15058def9ddadc3b2cf40b5b2f2a9922c926f978d108f63fbcc5cd34d410485ddb30e1 +EBUILD generator-0.35_p4-r1.ebuild 1052 BLAKE2B 5e25180dbdb16d8299ba76c919b9c4c53a4ba3aff09de9099f6145e8aaf79c69f3cfcbacf554d71744690bb76ddddb1bef5b5341d6d04c33ccd241dfd59ed0f7 SHA512 855734a1f005384237080a1692dcfa4c1ebce956fbd0482f9680b77e17076e9c044624fdd919ed07f224ec44e0b204e14a9f108af09adb7425d507830edd6714 MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67 diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch new file mode 100644 index 000000000000..7b8eeafb7154 --- /dev/null +++ b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/698944 + +--- a/main/vdp.c ++++ b/main/vdp.c +@@ -87,7 +87,7 @@ void vdp_describe(void); + void vdp_eventinit(void); + void vdp_layer_simple(unsigned int layer, unsigned int priority, + uint8 *fielddata, unsigned int lineoffset); +-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, ++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, + uint8 *cellloc, unsigned int lineoffset); + void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata); + int vdp_sprite_simple(unsigned int priority, uint8 *framedata, +@@ -1733,7 +1733,7 @@ void vdp_endfield(void) + vdp_event_endline); */ + } + +-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, ++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, + uint8 *cellloc, unsigned int lineoffset) + { + int y, x; diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild index 14ef210d58a8..54614d750d78 100644 --- a/games-emulation/generator/generator-0.35_p4-r1.ebuild +++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+sdlaudio" -RDEPEND=" +DEPEND=" virtual/jpeg:0 media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[sound] ) @@ -23,12 +23,15 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${P}-configure.patch + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-inline.patch + "${FILESDIR}"/${P}-gcc-9.patch +) + src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-configure.patch \ - "${FILESDIR}"/${P}-underlink.patch \ - "${FILESDIR}"/${P}-inline.patch sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die eautoreconf @@ -43,11 +46,6 @@ src_configure() { $(use_with sdlaudio sdl-audio) } -src_compile() { - [[ -f Makefile ]] && emake clean - emake -j1 -} - src_install() { dobin main/generator-sdl dodoc AUTHORS ChangeLog NEWS README TODO docs/* |