diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:20:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:20:16 +0100 |
commit | 1726f32a4bf939c045d35db6e95ab327213ecf8a (patch) | |
tree | a23a87e7968403fa317c9b9e39e5f355509407e9 /games-emulation/hatari | |
parent | 06e58a0fcb900034d35485fe961fee1875f3a6b0 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-emulation/hatari')
-rw-r--r-- | games-emulation/hatari/Manifest | 8 | ||||
-rw-r--r-- | games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch | 13 | ||||
-rw-r--r-- | games-emulation/hatari/files/hatari-1.8.0-gentoo.patch | 112 | ||||
-rw-r--r-- | games-emulation/hatari/hatari-1.8.0.ebuild | 89 | ||||
-rw-r--r-- | games-emulation/hatari/hatari-2.1.0.ebuild | 76 | ||||
-rw-r--r-- | games-emulation/hatari/metadata.xml | 3 |
6 files changed, 82 insertions, 219 deletions
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index 6c8229c4a34b..b004751ca1f6 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,5 +1,3 @@ -AUX hatari-1.8.0-gentoo-docdir.patch 583 BLAKE2B e7af3be7d340228970f255109f6e4b7c0cbbe7132c7c8d1162ca2f87acc923e7c0f9c810d0d1485ec5959e3b9fe46ba9e356d4bed2ccd6a2f3a1525a141b9035 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 -AUX hatari-1.8.0-gentoo.patch 3174 BLAKE2B 7c2db291a8315c712e43dea6b9608edb0813bd466579b67f279d52de702aeb22de9825512f13a0023b4d49d3f432ea31a22a80455b89ec64312b7c86ace544e3 SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e -DIST hatari-1.8.0.tar.bz2 1985358 BLAKE2B 12fc000dd04c0f0dcead0b6713837a0d4c02df5ecdab9c2d4d2d91bd4cf6f8657acf2d97649a5704b646fae4fefe0626300e297b9e8698e7b8b72854d37b7097 SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0 -EBUILD hatari-1.8.0.ebuild 2427 BLAKE2B aaf6631792687d508cc00f03c94c876bfad511bc1f2f3e15adba7330665d7d420e995c4bcc21be131ddddcabc95921b0d889176f8bd67bf89659fc935aa19330 SHA512 f6241cbc74cb1293994d51a38e32fe945186ade50b006eadcabaafea740b0422dfc6a3d847ca4a4c2c286594b11ec29cdf017d4166bdbf4e5c9d65dda86ffd10 -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 +DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753 +EBUILD hatari-2.1.0.ebuild 1951 BLAKE2B 256870db02e0c0cb6402157af5dc1a108f9dba4b3dbb414a7fa7d0ab3692877dd9baf0462f6a044e027a5d92d313fa479cee7251da75c8a87ed38d140897462b SHA512 7d6b881dfe3d1fbffb800b5ae866699891ee3cdfdbc88dc9633a755b1361d003ef1617648b8b30d1c72b709dc700fb9db4e3b3a5abc030270598b0035cad90d3 +MISC metadata.xml 318 BLAKE2B be4d8512e3f8fe751fc03aeae422216c9a366fc4cea3a49e4b8050f2a8280054fcc335f820718743fdf49cdb9a1fb73633e596ac8bf989b22f0f5a5fa33bd93b SHA512 2e304611622c91d0bd54f986ac3f02fc504bbd28e5ce03e5b958100b8567012ea0fe2a46884d29dfa18c6a4408fd0283679eb4a4f62c80a40ad748f5c811d943 diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch deleted file mode 100644 index 715fb189143f..000000000000 --- a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- hatari-1.6.1/python-ui/uihelpers.py -+++ hatari-1.6.1/python-ui/uihelpers.py -@@ -97,9 +97,7 @@ - # first try whether there are local Hatari docs in standard place - # for this Hatari/UI version - sep = os.sep -- path = self.get_binary_path("hatari") -- path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari" -- path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep -+ path = "@DOCDIR@" - if os.path.exists(path + "manual.html"): - return path - # if not, point to latest Hatari HG version docs diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch deleted file mode 100644 index 4f10d6d9e3ce..000000000000 --- a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- hatari-1.4.0.orig/src/paths.c -+++ hatari-1.4.0/src/paths.c -@@ -109,71 +109,6 @@ - free(pTmpName); - } - -- --/** -- * Locate the directory where the hatari executable resides -- */ --static char *Paths_InitExecDir(const char *argv0) --{ -- char *psExecDir; /* Path string where the hatari executable can be found */ -- -- /* Allocate memory for storing the path string of the executable */ -- psExecDir = malloc(FILENAME_MAX); -- if (!psExecDir) -- { -- fprintf(stderr, "Out of memory (Paths_Init)\n"); -- exit(-1); -- } -- -- /* Determine the bindir... -- * Start with empty string, then try to use OS specific functions, -- * and finally analyze the PATH variable if it has not been found yet. */ -- psExecDir[0] = '\0'; -- --#if defined(__linux__) -- { -- int i; -- /* On Linux, we can analyze the symlink /proc/self/exe */ -- i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX); -- if (i > 0) -- { -- char *p; -- psExecDir[i] = '\0'; -- p = strrchr(psExecDir, '/'); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } --//#elif defined(WIN32) || defined(__CEGCC__) --// /* On Windows we can use GetModuleFileName for getting the exe path */ --// GetModuleFileName(NULL, psExecDir, FILENAME_MAX); --#endif -- -- /* If we do not have the execdir yet, analyze argv[0] and the PATH: */ -- if (psExecDir[0] == 0) -- { -- if (strchr(argv0, PATHSEP) == 0) -- { -- /* No separator in argv[0], we have to explore PATH... */ -- Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX); -- } -- else -- { -- /* There was a path separator in argv[0], so let's assume a -- * relative or absolute path to the current directory in argv[0] */ -- char *p; -- strncpy(psExecDir, argv0, FILENAME_MAX); -- psExecDir[FILENAME_MAX-1] = 0; -- p = strrchr(psExecDir, PATHSEP); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } -- -- return psExecDir; --} -- -- - /** - * Initialize the users home directory string - * and Hatari's home directory (~/.hatari) -@@ -226,8 +161,6 @@ - */ - void Paths_Init(const char *argv0) - { -- char *psExecDir; /* Path string where the hatari executable can be found */ -- - /* Init working directory string */ - if (getcwd(sWorkingDir, FILENAME_MAX) == NULL) - { -@@ -238,27 +171,11 @@ - /* Init the user's home directory string */ - Paths_InitHomeDirs(); - -- /* Get the directory where the executable resides */ -- psExecDir = Paths_InitExecDir(argv0); -- -- /* Now create the datadir path name from the bindir path name: */ -- if (psExecDir && strlen(psExecDir) > 0) -- { -- snprintf(sDataDir, sizeof(sDataDir), "%s%c%s", -- psExecDir, PATHSEP, BIN2DATADIR); -- } -- else -- { -- /* bindir could not be determined, let's assume datadir is relative -- * to current working directory... */ -- strcpy(sDataDir, BIN2DATADIR); -- } -+ strcpy(sDataDir, BIN2DATADIR); - - /* And finally make a proper absolute path out of datadir: */ - File_MakeAbsoluteName(sDataDir); - -- free(psExecDir); -- - /* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n", - sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */ - } diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild deleted file mode 100644 index 0ec9601e1835..000000000000 --- a/games-emulation/hatari/hatari-1.8.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils toolchain-funcs cmake-utils python-single-r1 games - -DESCRIPTION="Atari ST emulator" -HOMEPAGE="http://hatari.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - media-libs/libsdl[X,sound,video] - sys-libs/readline:0 - media-libs/libpng:0 - sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - dev-python/pygtk[${PYTHON_USEDEP}] - games-emulation/emutos" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-gentoo-docdir.patch -) - -pkg_setup() { - games_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # build with newer zlib (bug #387829) - sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die - sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die - sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die - sed -i \ - -e "s%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \ - -e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \ - python-ui/hatariui || die - sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die - rm -f doc/CMakeLists.txt -} - -src_configure() { - mycmakeargs=( - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DCMAKE_BUILD_TYPE:STRING=Release" - "-DDATADIR=${GAMES_DATADIR}/${PN}" - "-DBIN2DATADIR=${GAMES_DATADIR}/${PN}" - "-DBINDIR=${GAMES_BINDIR}" - "-DICONDIR=/usr/share/pixmaps" - "-DDESKTOPDIR=/usr/share/applications" - "-DMANDIR=/usr/share/man/man1" - "-DDOCDIR=/usr/share/doc/${PF}" - ) - cmake-utils_src_configure -} - -src_install() { - DOCS="readme.txt doc/*.txt" cmake-utils_src_install - dohtml -r doc/ - python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/ - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation," - elog "has been installed in $(games_get_libdir) with a .img extension (there" - elog "are several from which to choose)." - elog - elog "Another option is to go to http://www.atari.st/ and get a real TOS:" - elog " http://www.atari.st/" - elog - elog "The first time you run hatari, you should configure it to find the" - elog "TOS you prefer to use. Be sure to save your settings." - echo -} diff --git a/games-emulation/hatari/hatari-2.1.0.ebuild b/games-emulation/hatari/hatari-2.1.0.ebuild new file mode 100644 index 000000000000..92eba857519e --- /dev/null +++ b/games-emulation/hatari/hatari-2.1.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit toolchain-funcs cmake-utils python-single-r1 + +DESCRIPTION="Atari ST emulator" +HOMEPAGE="http://hatari.tuxfamily.org/" +SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+sdl2" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + games-emulation/caps + sdl2? ( media-libs/libsdl2[X,sound,video] ) + !sdl2? ( media-libs/libsdl[X,sound,video] ) + media-libs/portaudio + media-libs/portmidi + sys-libs/readline:0= + media-libs/libpng:0= + sys-libs/zlib:0=" +DEPEND="${RDEPEND} + virtual/pkgconfig" +PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}] + >=games-emulation/emutos-0.9.9.1" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation, +has been installed in /usr/lib*/hatari with a .img extension (there +are several from which to choose). +Another option is to go to http://www.atari.st/ and get a real TOS: +http://www.atari.st/ +The first time you run hatari, you should configure it to find the +TOS you prefer to use. Be sure to save your settings. +" + +DOCS="readme.txt doc/*.txt" +HTML_DOCS="doc/" + +src_prepare() { + cmake-utils_src_prepare + + sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die + sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die + sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die +} + +src_configure() { + mycmakeargs=( + "-DDOCDIR=/usr/share/doc/${PF}" + "-DENABLE_SDL2=$(usex sdl2)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/ +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml index 78274e0fa550..d4511e749d48 100644 --- a/games-emulation/hatari/metadata.xml +++ b/games-emulation/hatari/metadata.xml @@ -5,4 +5,7 @@ <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> +<use> + <flag name="sdl2">Use libsdl2 instead of libsdl</flag> +</use> </pkgmetadata> |