| 1 |
commit: 83a2cdf98c253c23d60d804b0d4e9a7f055e9012 |
| 2 |
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de> |
| 3 |
AuthorDate: Tue Feb 28 07:06:48 2012 +0000 |
| 4 |
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de> |
| 5 |
CommitDate: Tue Feb 28 07:06:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=83a2cdf9 |
| 7 |
|
| 8 |
[app-emulation/fs-uae] updated fs-uae-0.9.10.ebuild |
| 9 |
|
| 10 |
--- |
| 11 |
.../fs-uae/files/fs-uae-0.9.8-minizip.patch | 36 -------------------- |
| 12 |
.../{fs-uae-0.9.8.ebuild => fs-uae-0.9.10.ebuild} | 4 ++- |
| 13 |
2 files changed, 3 insertions(+), 37 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
deleted file mode 100644 |
| 17 |
index 6825465..0000000 |
| 18 |
--- a/app-emulation/fs-uae/files/fs-uae-0.9.8-minizip.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,36 +0,0 @@ |
| 21 |
-diff -Naur fs-uae-0.9.8-o/libuae/zfile_archive.cpp fs-uae-0.9.8/libuae/zfile_archive.cpp |
| 22 |
---- fs-uae-0.9.8-o/libuae/zfile_archive.cpp 2012-02-05 10:58:47.000000000 +0100 |
| 23 |
-+++ fs-uae-0.9.8/libuae/zfile_archive.cpp 2012-02-18 20:05:10.500004527 +0100 |
| 24 |
-@@ -16,7 +16,7 @@ |
| 25 |
- |
| 26 |
- #include "options.h" |
| 27 |
- #include "zfile.h" |
| 28 |
--#include "archivers/zip/unzip.h" |
| 29 |
-+#include <minizip/unzip.h> |
| 30 |
- #include "archivers/dms/pfile.h" |
| 31 |
- #include "crc32.h" |
| 32 |
- #include "zarchive.h" |
| 33 |
-diff -Naur fs-uae-0.9.8-o/libuae/zfile.cpp fs-uae-0.9.8/libuae/zfile.cpp |
| 34 |
---- fs-uae-0.9.8-o/libuae/zfile.cpp 2012-02-10 20:03:49.000000000 +0100 |
| 35 |
-+++ fs-uae-0.9.8/libuae/zfile.cpp 2012-02-18 20:05:02.910004398 +0100 |
| 36 |
-@@ -25,7 +25,7 @@ |
| 37 |
- #include "diskutil.h" |
| 38 |
- #include "fdi2raw.h" |
| 39 |
- |
| 40 |
--#include "archivers/zip/unzip.h" |
| 41 |
-+#include <minizip/unzip.h> |
| 42 |
- #include "archivers/dms/pfile.h" |
| 43 |
- #include "archivers/wrp/warp.h" |
| 44 |
- |
| 45 |
-diff -Naur fs-uae-0.9.8-o/Makefile fs-uae-0.9.8/Makefile |
| 46 |
---- fs-uae-0.9.8-o/Makefile 2012-02-15 21:27:08.000000000 +0100 |
| 47 |
-+++ fs-uae-0.9.8/Makefile 2012-02-18 20:05:44.240005112 +0100 |
| 48 |
-@@ -43,7 +43,7 @@ |
| 49 |
- -I$(libfsemu_dir)/include |
| 50 |
- ldflags = |
| 51 |
- libs = -L$(libfsemu_dir)/out -lfsemu `sdl-config --libs` \ |
| 52 |
-- `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz |
| 53 |
-+ `pkg-config --libs glib-2.0 gthread-2.0` -lpng -lz -lminizip |
| 54 |
- |
| 55 |
- libuae_warnings = -Wno-unused-value -Wno-uninitialized -Wno-sign-compare |
| 56 |
- generate = 0 |
| 57 |
|
| 58 |
diff --git a/app-emulation/fs-uae/fs-uae-0.9.8.ebuild b/app-emulation/fs-uae/fs-uae-0.9.10.ebuild |
| 59 |
similarity index 79% |
| 60 |
rename from app-emulation/fs-uae/fs-uae-0.9.8.ebuild |
| 61 |
rename to app-emulation/fs-uae/fs-uae-0.9.10.ebuild |
| 62 |
index 76cac54..9f58fd1 100644 |
| 63 |
--- a/app-emulation/fs-uae/fs-uae-0.9.8.ebuild |
| 64 |
+++ b/app-emulation/fs-uae/fs-uae-0.9.10.ebuild |
| 65 |
@@ -26,7 +26,9 @@ DEPEND="$RDEPEND" |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
rm -rf libuae/archivers/zip |
| 69 |
- epatch "${FILESDIR}"/${P}-minizip.patch |
| 70 |
+ sed -i -e "s:lz:lz -lminizip:g" -i Makefile |
| 71 |
+ sed -i -e "s:\"archivers/zip/unzip.h\":<minizip/unzip.h>:g" -i libuae/zfile_archive.cpp |
| 72 |
+ sed -i -e "s:\"archivers/zip/unzip.h\":<minizip/unzip.h>:g" -i libuae/zfile.cpp |
| 73 |
} |
Archives