diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
| commit | 2d446203bcf1a0db08e99abca43513d246dfa73d (patch) | |
| tree | ec623bb5f1f389976977e375342ec59ff441eab7 /games-emulation/desmume | |
| parent | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (diff) | |
gentoo resync : 05.04.2018
Diffstat (limited to 'games-emulation/desmume')
| -rw-r--r-- | games-emulation/desmume/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/desmume/desmume-0.9.11-r1.ebuild | 22 | ||||
| -rw-r--r-- | games-emulation/desmume/files/desmume-0.9.11-gcc7.patch | 21 |
3 files changed, 36 insertions, 10 deletions
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest index 981f8dd0f18a..377ab85a7308 100644 --- a/games-emulation/desmume/Manifest +++ b/games-emulation/desmume/Manifest @@ -1,5 +1,6 @@ AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b3669166f1ee04d26e6538a392e494d356b2eeabd43ac69fe9489ddeda146054ab5d1f821b3a52719d58ae493ca870f46461eacaab26ffb9eba1 SHA512 f7d5f4ac4d96f244aa6ee81a90f64e754aceebf075f1c4ff84dde2d1d2beaf617631569c5aa9a8afb40ae4499067e2233ba00a4b9d606a9608915714766d0bff AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd +AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c -EBUILD desmume-0.9.11-r1.ebuild 754 BLAKE2B f0d9f22299807ecbdd0f8ad2181dddadb21b78eaca6ba4689c9a3d0792e6c63e8b5727d322bf91bdd55fd819c795d43ab6da4a6e8b75dfceaed4206186442b07 SHA512 dd0b758b2d8ff5baf3bad5fd6497c8cd2d5f0421726cf1d80326cb5919d271b404be3e79b6cc373ef593e4b9ccc8f0967c3d77997bf01780cdb40786e7fca82e +EBUILD desmume-0.9.11-r1.ebuild 800 BLAKE2B 5cf60a8343d47e2e7adce5697fe8904bc733f503d9d56a37515708def52dd403ae52bec61b20bb6183335266e61916b2d0591e6f89ca20ce5cdbff76c565cbd6 SHA512 91fc616b3935e92f6b1f88346a47b6683835d02a2a35f32fc2b2d127971546fe45ef3af8d1d690f9e39b595f51c405664cf29ae9b62e63f024e8c98214786e7d MISC metadata.xml 407 BLAKE2B a64ba166734f13f34fec0ca394d4d51bc70f2cb9539981e068e544f3139584ee3ec2da89a02ef9203008cb73213213adb148c978311ae36d95749e553d10605b SHA512 89d3a5b608525bfa1f05503017619520d82c663241668c3d5fa5602e625cbfe02564b04d7bac0e97bbe53ff8eba08a6895fb0e8cd519d0d88efd29a0ca64ac4b diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild index cddcc940a314..e98e0846012b 100644 --- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild +++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 +inherit xdg + DESCRIPTION="Nintendo DS emulator" HOMEPAGE="http://desmume.org/" SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" @@ -12,17 +14,18 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=x11-libs/gtk+-2.8.0:2 - gnome-base/libglade - x11-libs/gtkglext - virtual/opengl - sys-libs/zlib +RDEPEND=" dev-libs/zziplib + gnome-base/libglade media-libs/libsdl[joystick,opengl,video] - x11-libs/agg" + sys-libs/zlib + virtual/opengl + x11-libs/agg + >=x11-libs/gtk+-2.8.0:2 + x11-libs/gtkglext" DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool" + dev-util/intltool + virtual/pkgconfig" DOCS=( AUTHORS ChangeLog README README.LIN ) @@ -31,4 +34,5 @@ DOCS=( AUTHORS ChangeLog README README.LIN ) PATCHES=( "${FILESDIR}/${P}-fix-pointer-conversion-warning.diff" "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-gcc7.patch" ) diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch new file mode 100644 index 000000000000..8b8a67f2291a --- /dev/null +++ b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch @@ -0,0 +1,21 @@ +Bug: https://bugs.gentoo.org/646352 +Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch + +From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 +From: rogerman <rogerman@users.sf.net> +Date: Mon, 17 Aug 2015 21:15:04 +0000 +Subject: Fix bug with libfat string handling. + +diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp +index 765d7ae5..b6d7f01f 100644 +--- a/src/utils/libfat/directory.cpp ++++ b/src/utils/libfat/directory.cpp +@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len + int bytes; + size_t count = 0; + +- while (count < len-1 && src != '\0') { ++ while (count < len-1 && *src != '\0') { + bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); + if (bytes > 0) { + *dst = (ucs2_t)tempChar; |