* [gentoo-commits] proj/gamerlay:master commit in: app-emulation/fs-uae/, app-emulation/fs-uae/files/
@ 2012-02-15 16:50 Marcel Unbehaun
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Unbehaun @ 2012-02-15 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 1673ed76671242828ce5a654f3e9b4d0c6a9fce5
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Wed Feb 15 16:52:23 2012 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Wed Feb 15 16:52:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=1673ed76
[app-emulation/fs-uae] initial fs-uae-0.9.7.ebuild
---
.../fs-uae/files/fs-uae-0.9.7-minizip.patch | 36 +++++++++++++++
app-emulation/fs-uae/fs-uae-0.9.7.ebuild | 46 ++++++++++++++++++++
app-emulation/fs-uae/metadata.xml | 9 ++++
3 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch b/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch
new file mode 100644
index 0000000..42bfc2d
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch
@@ -0,0 +1,36 @@
+diff -Naur libuae/zfile_archive.cpp libuae/zfile_archive.cpp
+--- libuae/zfile_archive.cpp 2012-02-13 22:09:01.000000000 +0100
++++ libuae/zfile_archive.cpp 2012-02-15 18:07:06.512866167 +0100
+@@ -16,7 +16,7 @@
+
+ #include "options.h"
+ #include "zfile.h"
+-#include "archivers/zip/unzip.h"
++#include <minizip/unzip.h>
+ #include "archivers/dms/pfile.h"
+ #include "crc32.h"
+ #include "zarchive.h"
+diff -Naur libuae/zfile.cpp libuae/zfile.cpp
+--- libuae/zfile.cpp 2012-02-13 22:08:58.000000000 +0100
++++ libuae/zfile.cpp 2012-02-15 18:06:57.392866167 +0100
+@@ -25,7 +25,7 @@
+ #include "diskutil.h"
+ #include "fdi2raw.h"
+
+-#include "archivers/zip/unzip.h"
++#include <minizip/unzip.h>
+ #include "archivers/dms/pfile.h"
+ #include "archivers/wrp/warp.h"
+
+diff -Naur Makefile Makefile
+--- Makefile 2012-02-13 21:39:43.000000000 +0100
++++ Makefile 2012-02-15 18:08:31.052866167 +0100
+@@ -42,7 +42,7 @@
+ -I$(libfsemu_dir)/include
+ ldflags =
+ libs = -L$(libfsemu_dir)/out -lfsemu `sdl-config --libs` \
+- `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz
++ `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz -lminizip
+
+ libuae_warnings = -Wno-unused-value -Wno-uninitialized -Wno-sign-compare
+ generate = 0
diff --git a/app-emulation/fs-uae/fs-uae-0.9.7.ebuild b/app-emulation/fs-uae/fs-uae-0.9.7.ebuild
new file mode 100644
index 0000000..2283a1d
--- /dev/null
+++ b/app-emulation/fs-uae/fs-uae-0.9.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v3
+# $Header: app-emulation/e-uae/fs-uae-0.9.7.ebuild,v 1.0 2012/02/15 16:30:51 frostwork Exp $
+
+EAPI="2"
+
+inherit eutils games
+
+DESCRIPTION="a multi-platform Amiga emulator"
+HOMEPAGE="http://fengestad.no/"${PN}""
+SRC_URI="http://fengestad.no/"${PN}"/files/"${P}".tar.gz"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+ media-libs/openal
+ media-libs/libpng
+ media-libs/libsdl
+ sys-libs/zlib[minizip]"
+
+DEPEND="$RDEPEND"
+
+src_prepare() {
+ rm -rf libuae/archivers/zip
+ epatch "${FILESDIR}"/${P}-minizip.patch
+}
+
+src_install() {
+ dogamesbin out/${PN}
+
+ local datadir="${GAMES_DATADIR}"/${PN}
+ dodir ${datadir}
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins example.conf || die
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ ewarn "Before you launch fs-uae for the first time you need to create and configure"
+ ewarn "~/.config/fs-uae/fs-uae.conf"
+ ewarn "for an example see ${GAMES_DATADIR}/${PN}/example.conf"
+}
diff --git a/app-emulation/fs-uae/metadata.xml b/app-emulation/fs-uae/metadata.xml
new file mode 100644
index 0000000..4e4714e
--- /dev/null
+++ b/app-emulation/fs-uae/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>frostworks@gmx.de</email>
+ <name>Marcel Unbehaun</name>
+</maintainer>
+<herd>games</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: app-emulation/fs-uae/, app-emulation/fs-uae/files/
@ 2012-02-19 11:09 Marcel Unbehaun
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Unbehaun @ 2012-02-19 11:09 UTC (permalink / raw
To: gentoo-commits
commit: e92cfcdfd41dad9f2781e3ffcb6a42ae690765f6
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sun Feb 19 11:11:28 2012 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sun Feb 19 11:11:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=e92cfcdf
[app-emulation/fs-uae] update to fs-uae-0.9.8.ebuild
---
.../fs-uae/files/fs-uae-0.9.7-minizip.patch | 36 --------------------
.../fs-uae/files/fs-uae-0.9.8-minizip.patch | 36 ++++++++++++++++++++
.../{fs-uae-0.9.7.ebuild => fs-uae-0.9.8.ebuild} | 0
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch b/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch
deleted file mode 100644
index 42bfc2d..0000000
--- a/app-emulation/fs-uae/files/fs-uae-0.9.7-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur libuae/zfile_archive.cpp libuae/zfile_archive.cpp
---- libuae/zfile_archive.cpp 2012-02-13 22:09:01.000000000 +0100
-+++ libuae/zfile_archive.cpp 2012-02-15 18:07:06.512866167 +0100
-@@ -16,7 +16,7 @@
-
- #include "options.h"
- #include "zfile.h"
--#include "archivers/zip/unzip.h"
-+#include <minizip/unzip.h>
- #include "archivers/dms/pfile.h"
- #include "crc32.h"
- #include "zarchive.h"
-diff -Naur libuae/zfile.cpp libuae/zfile.cpp
---- libuae/zfile.cpp 2012-02-13 22:08:58.000000000 +0100
-+++ libuae/zfile.cpp 2012-02-15 18:06:57.392866167 +0100
-@@ -25,7 +25,7 @@
- #include "diskutil.h"
- #include "fdi2raw.h"
-
--#include "archivers/zip/unzip.h"
-+#include <minizip/unzip.h>
- #include "archivers/dms/pfile.h"
- #include "archivers/wrp/warp.h"
-
-diff -Naur Makefile Makefile
---- Makefile 2012-02-13 21:39:43.000000000 +0100
-+++ Makefile 2012-02-15 18:08:31.052866167 +0100
-@@ -42,7 +42,7 @@
- -I$(libfsemu_dir)/include
- ldflags =
- libs = -L$(libfsemu_dir)/out -lfsemu `sdl-config --libs` \
-- `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz
-+ `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz -lminizip
-
- libuae_warnings = -Wno-unused-value -Wno-uninitialized -Wno-sign-compare
- generate = 0
diff --git a/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch b/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch
new file mode 100644
index 0000000..6825465
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch
@@ -0,0 +1,36 @@
+diff -Naur fs-uae-0.9.8-o/libuae/zfile_archive.cpp fs-uae-0.9.8/libuae/zfile_archive.cpp
+--- fs-uae-0.9.8-o/libuae/zfile_archive.cpp 2012-02-05 10:58:47.000000000 +0100
++++ fs-uae-0.9.8/libuae/zfile_archive.cpp 2012-02-18 20:05:10.500004527 +0100
+@@ -16,7 +16,7 @@
+
+ #include "options.h"
+ #include "zfile.h"
+-#include "archivers/zip/unzip.h"
++#include <minizip/unzip.h>
+ #include "archivers/dms/pfile.h"
+ #include "crc32.h"
+ #include "zarchive.h"
+diff -Naur fs-uae-0.9.8-o/libuae/zfile.cpp fs-uae-0.9.8/libuae/zfile.cpp
+--- fs-uae-0.9.8-o/libuae/zfile.cpp 2012-02-10 20:03:49.000000000 +0100
++++ fs-uae-0.9.8/libuae/zfile.cpp 2012-02-18 20:05:02.910004398 +0100
+@@ -25,7 +25,7 @@
+ #include "diskutil.h"
+ #include "fdi2raw.h"
+
+-#include "archivers/zip/unzip.h"
++#include <minizip/unzip.h>
+ #include "archivers/dms/pfile.h"
+ #include "archivers/wrp/warp.h"
+
+diff -Naur fs-uae-0.9.8-o/Makefile fs-uae-0.9.8/Makefile
+--- fs-uae-0.9.8-o/Makefile 2012-02-15 21:27:08.000000000 +0100
++++ fs-uae-0.9.8/Makefile 2012-02-18 20:05:44.240005112 +0100
+@@ -43,7 +43,7 @@
+ -I$(libfsemu_dir)/include
+ ldflags =
+ libs = -L$(libfsemu_dir)/out -lfsemu `sdl-config --libs` \
+- `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz
++ `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz -lminizip
+
+ libuae_warnings = -Wno-unused-value -Wno-uninitialized -Wno-sign-compare
+ generate = 0
diff --git a/app-emulation/fs-uae/fs-uae-0.9.7.ebuild b/app-emulation/fs-uae/fs-uae-0.9.8.ebuild
similarity index 100%
rename from app-emulation/fs-uae/fs-uae-0.9.7.ebuild
rename to app-emulation/fs-uae/fs-uae-0.9.8.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: app-emulation/fs-uae/, app-emulation/fs-uae/files/
@ 2012-02-28 7:04 Marcel Unbehaun
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Unbehaun @ 2012-02-28 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 83a2cdf98c253c23d60d804b0d4e9a7f055e9012
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Tue Feb 28 07:06:48 2012 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Tue Feb 28 07:06:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=83a2cdf9
[app-emulation/fs-uae] updated fs-uae-0.9.10.ebuild
---
.../fs-uae/files/fs-uae-0.9.8-minizip.patch | 36 --------------------
.../{fs-uae-0.9.8.ebuild => fs-uae-0.9.10.ebuild} | 4 ++-
2 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch b/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch
deleted file mode 100644
index 6825465..0000000
--- a/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur fs-uae-0.9.8-o/libuae/zfile_archive.cpp fs-uae-0.9.8/libuae/zfile_archive.cpp
---- fs-uae-0.9.8-o/libuae/zfile_archive.cpp 2012-02-05 10:58:47.000000000 +0100
-+++ fs-uae-0.9.8/libuae/zfile_archive.cpp 2012-02-18 20:05:10.500004527 +0100
-@@ -16,7 +16,7 @@
-
- #include "options.h"
- #include "zfile.h"
--#include "archivers/zip/unzip.h"
-+#include <minizip/unzip.h>
- #include "archivers/dms/pfile.h"
- #include "crc32.h"
- #include "zarchive.h"
-diff -Naur fs-uae-0.9.8-o/libuae/zfile.cpp fs-uae-0.9.8/libuae/zfile.cpp
---- fs-uae-0.9.8-o/libuae/zfile.cpp 2012-02-10 20:03:49.000000000 +0100
-+++ fs-uae-0.9.8/libuae/zfile.cpp 2012-02-18 20:05:02.910004398 +0100
-@@ -25,7 +25,7 @@
- #include "diskutil.h"
- #include "fdi2raw.h"
-
--#include "archivers/zip/unzip.h"
-+#include <minizip/unzip.h>
- #include "archivers/dms/pfile.h"
- #include "archivers/wrp/warp.h"
-
-diff -Naur fs-uae-0.9.8-o/Makefile fs-uae-0.9.8/Makefile
---- fs-uae-0.9.8-o/Makefile 2012-02-15 21:27:08.000000000 +0100
-+++ fs-uae-0.9.8/Makefile 2012-02-18 20:05:44.240005112 +0100
-@@ -43,7 +43,7 @@
- -I$(libfsemu_dir)/include
- ldflags =
- libs = -L$(libfsemu_dir)/out -lfsemu `sdl-config --libs` \
-- `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz
-+ `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz -lminizip
-
- libuae_warnings = -Wno-unused-value -Wno-uninitialized -Wno-sign-compare
- generate = 0
diff --git a/app-emulation/fs-uae/fs-uae-0.9.8.ebuild b/app-emulation/fs-uae/fs-uae-0.9.10.ebuild
similarity index 79%
rename from app-emulation/fs-uae/fs-uae-0.9.8.ebuild
rename to app-emulation/fs-uae/fs-uae-0.9.10.ebuild
index 76cac54..9f58fd1 100644
--- a/app-emulation/fs-uae/fs-uae-0.9.8.ebuild
+++ b/app-emulation/fs-uae/fs-uae-0.9.10.ebuild
@@ -26,7 +26,9 @@ DEPEND="$RDEPEND"
src_prepare() {
rm -rf libuae/archivers/zip
- epatch "${FILESDIR}"/${P}-minizip.patch
+ sed -i -e "s:lz:lz -lminizip:g" -i Makefile
+ sed -i -e "s:\"archivers/zip/unzip.h\":<minizip/unzip.h>:g" -i libuae/zfile_archive.cpp
+ sed -i -e "s:\"archivers/zip/unzip.h\":<minizip/unzip.h>:g" -i libuae/zfile.cpp
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-28 7:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-19 11:09 [gentoo-commits] proj/gamerlay:master commit in: app-emulation/fs-uae/, app-emulation/fs-uae/files/ Marcel Unbehaun
-- strict thread matches above, loose matches on Subject: below --
2012-02-28 7:04 Marcel Unbehaun
2012-02-15 16:50 Marcel Unbehaun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox