From 2ee47cd9968bfb9e44b49bce0d28616ee92a044c Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 7 Jun 2011 20:29:03 +0000 Subject: version bump (bug #350448) Package-Manager: portage-2.1.9.42/cvs/Linux i686 --- games-emulation/hatari/ChangeLog | 10 +- games-emulation/hatari/Manifest | 5 +- .../hatari/files/hatari-1.4.0-gentoo.patch | 132 +++++++++++++++++++++ games-emulation/hatari/hatari-1.4.0.ebuild | 65 ++++++++++ 4 files changed, 209 insertions(+), 3 deletions(-) create mode 100644 games-emulation/hatari/files/hatari-1.4.0-gentoo.patch create mode 100644 games-emulation/hatari/hatari-1.4.0.ebuild (limited to 'games-emulation') diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog index 3a7e7d6f4be8..6b19c5f15880 100644 --- a/games-emulation/hatari/ChangeLog +++ b/games-emulation/hatari/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-emulation/hatari -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.27 2010/01/22 20:06:17 ranger Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.28 2011/06/07 20:29:03 mr_bones_ Exp $ + +*hatari-1.4.0 (07 Jun 2011) + + 07 Jun 2011; Michael Sterrett +hatari-1.4.0.ebuild, + +files/hatari-1.4.0-gentoo.patch: + version bump (bug #350448) 22 Jan 2010; Brent Baude hatari-1.3.1.ebuild: stable ppc, bug 292805 diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index 9639e4719a11..8a6c4d9064d1 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,4 +1,7 @@ +AUX hatari-1.4.0-gentoo.patch 3624 RMD160 b6620cbe522be2f953fbbd3dafceed9299d53682 SHA1 f1f5bf0ec41983782f2c398d34bc12c24dae524e SHA256 847d7ebbe0d2201ece1323cd22916c1f79560e835016a1dd0213189a2a3843ed DIST hatari-1.3.1.tar.bz2 1045627 RMD160 83a7a8138013be3324cf54e5f0df2efb0ebc40d3 SHA1 d603e1ddea34af9d0c1001f83f3e16081c136ef9 SHA256 ebae927ad99a029f8cd8796463df2113357a7636c2199e00290ad4a35856e0da +DIST hatari-1.4.0.tar.bz2 1260844 RMD160 a85dda4e4ad5f84b3fe3f77b8f5d3a4bb523a929 SHA1 9fa2ef9fbcbeeefccb6e455eb91679c12f2f37bd SHA256 690e21bd2210a7e86af5d76ccc7f4e608aae37df466d2ead2ac4d105a637bc7b EBUILD hatari-1.3.1.ebuild 1564 RMD160 1f82493d15757733dff80f763a3b8afe28cafeca SHA1 0bab625bb22d88e05b518b73cd278d6986245822 SHA256 f1635d2d1eb0748ea7d5a1d112437a00ae43e6bc8bfb731f277a492d3c8cbd6a -MISC ChangeLog 3606 RMD160 6adec360f117d95450cac3e7831f6435c72b5077 SHA1 1a1ca5a2fbb12d964915a7c658e97171595e6454 SHA256 c195feede3103d6467e68cbdf52363a7944c77f52d853ce441cfbccb13098dcf +EBUILD hatari-1.4.0.ebuild 1721 RMD160 313010fc9eb1575f8500a8e264c8ad2f2e070343 SHA1 6669fcb19764744f8c6f0ecd2463b33464749aba SHA256 df56f53c1fdba9f42522432a09f1c1293eec4ce5dab936e47e54dc05abd4d527 +MISC ChangeLog 3781 RMD160 cb40ada383926a95ef1ea9a4d1fb16a1c62781ef SHA1 7c09a2c2cdec990b846e88b565d3077d8ce7ee67 SHA256 625b9422e52376d151243d26030f37acf54fef347a99dbe8d44e235ff0c4d611 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-emulation/hatari/files/hatari-1.4.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.4.0-gentoo.patch new file mode 100644 index 000000000000..77aaddd9914c --- /dev/null +++ b/games-emulation/hatari/files/hatari-1.4.0-gentoo.patch @@ -0,0 +1,132 @@ +--- hatari-1.4.0.orig/Makefile-MinGW.cnf ++++ hatari-1.4.0/Makefile-MinGW.cnf +@@ -24,7 +24,6 @@ + SYS_WINDOWS = 1 + + # Set the C compiler (e.g. gcc) +-CC = $(MINGW_PREFIX)gcc + + # What warnings to use + WARNFLAGS = -Wmissing-prototypes -Wstrict-prototypes -Wsign-compare \ +--- hatari-1.4.0.orig/Makefile-default.cnf ++++ hatari-1.4.0/Makefile-default.cnf +@@ -14,7 +14,6 @@ + # make CC=my-cc + + # Set the C compiler (e.g. gcc) +-CC = gcc + + OPTFLAGS = -O2 + +--- 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.4.0.ebuild b/games-emulation/hatari/hatari-1.4.0.ebuild new file mode 100644 index 000000000000..96479ac3456e --- /dev/null +++ b/games-emulation/hatari/hatari-1.4.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.4.0.ebuild,v 1.1 2011/06/07 20:29:03 mr_bones_ Exp $ + +EAPI=2 +inherit toolchain-funcs cmake-utils games + +DESCRIPTION="Atari ST emulator" +HOMEPAGE="http://hatari.berlios.de/" +SRC_URI="mirror://berlios/hatari/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="media-libs/libsdl[X,audio,video] + sys-libs/readline + media-libs/libpng + sys-libs/zlib" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +RDEPEND="${RDEPEND} + games-emulation/emutos" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + 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/ + 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 +} -- cgit v1.2.3-65-gdbad