diff options
| author | eroen | 2013-06-18 03:16:40 +0200 |
|---|---|---|
| committer | eroen | 2013-06-18 03:16:40 +0200 |
| commit | 7db020d6831da051bf6904a0f2ed2d470bc5bd56 (patch) | |
| tree | e907fd66be6f46716806679659c837a230748aab /games-util | |
| parent | 38151a937b22b93e0b8d8876bada3365d113a4dc (diff) | |
| download | eroen-overlay-7db020d6831da051bf6904a0f2ed2d470bc5bd56.tar.gz eroen-overlay-7db020d6831da051bf6904a0f2ed2d470bc5bd56.tar.bz2 eroen-overlay-7db020d6831da051bf6904a0f2ed2d470bc5bd56.tar.xz | |
dfhack-9999 - cleanup
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/dfhack/Manifest | 9 | ||||
| -rw-r--r-- | games-util/dfhack/dfhack-9999.ebuild | 18 | ||||
| -rw-r--r-- | games-util/dfhack/files/dfhack-9999/09-eggy-remove-annoying-banner.patch | 22 | ||||
| -rw-r--r-- | games-util/dfhack/files/dfhack-9999/series | 1 | ||||
| -rw-r--r-- | games-util/dfhack/files/isoworld-9999/01-missing-include-dir.patch | 21 | ||||
| -rw-r--r-- | games-util/dfhack/files/isoworld-9999/series | 2 | ||||
| -rw-r--r-- | games-util/dfhack/metadata.xml | 1 |
7 files changed, 66 insertions, 8 deletions
diff --git a/games-util/dfhack/Manifest b/games-util/dfhack/Manifest index 9a48ee0a..1868faea 100644 --- a/games-util/dfhack/Manifest +++ b/games-util/dfhack/Manifest @@ -12,7 +12,10 @@ AUX dfhack-9999/05-compile-time-configurable-0.patch 1562 SHA256 16810214a14c585 AUX dfhack-9999/06-compile-time-configurable-1.patch 3578 SHA256 ead1019a14dbdab2fb0ac097073c7f2a22fa24f426eb031615cd79a5a28b1a54 SHA512 fae5f28c20364a6032f329115a8d1630e17fb1e5e7888c058c94218824616f1b807e7471330fdb7e6d1f29d3960a85f1469edbf1d270cc44ed9a707295bf8c90 WHIRLPOOL 5c8e9a113fc0a4972e54df0871fa6cce4074ef0b4cca33cf2d26cffab3d75863d8aace3423d14d2110a00a5ba79ca39b680e1838889e9ac390f4ea95d06c6784 AUX dfhack-9999/07-startup-scripts-configurable.patch 9738 SHA256 a107a4693ed5c8f156c2dd9718c3c83b6c6802bd39d8a41fb15b604bdd2d7908 SHA512 c833b81a0bf7be6d15bc6149e43ae4bcd37bdbe42890ea73ebe950bef416732d9c807c9268031568e08c3f3de9130fc6759d32dd236c830abfa0c3dfddc0f73f WHIRLPOOL 58c7e9891f72819782be79eb9388bd7650a18df2816f4d75f4708fcbdc72d882b0aa18f30af0a91f052cc83f8bf972a6e6df6a64845dbf4521689ba95f8094e4 AUX dfhack-9999/08-ruby-plugin-configurable-paths.patch 19636 SHA256 2a24c35f5e4b1cf060fd6f11a5ff4b438b1fafea6a7ece9b5e0f018d1dfcad46 SHA512 00130cc96695e40e47763e858dd73b739d083808b7f0bb1a097a8120c0b7c8d10306a3da0700aa42b69422a32b7814d40290228f26da4e486c5cbb507bdf139d WHIRLPOOL 80aaf69a4c4139096c120f837bcf25a37076269f0f0d3a6ae272fd95124a59c163595827ddb22361f37b79f15d0a3853601dd2c3fdc9682826679aea9fdf3098 -AUX dfhack-9999/series 373 SHA256 db1b6ef38578430ecc658c8477299e59ce0124ed1e1c65690b2c3b4ac2e807c4 SHA512 a4940fa27bb9346534d2f4e242415593d7dfb5e0bb3fa84d1ebeca38860ae8c29e010b06a3eadba6de4ca27df46030e78daaec9c46b7584f3ea2ecd14a9fee62 WHIRLPOOL abf5987a2f98f34bc4a75f2cecde356f1e30c164775bc35d350d6c601f10db3d36fe27fecc270ec0a7daf2062e1951a03476aa554bc614b55734e5d188f80ea7 +AUX dfhack-9999/09-eggy-remove-annoying-banner.patch 662 SHA256 a139e7d33d1e6d708955572cae529dd2a56be4500ced49ae417c2f30808a3e14 SHA512 b77cf87d4d232779dd3f171364e6660af5a8e69889ca3b4d9b33ac0db4bde37a3851f23315f19b9bac4577050181f54222b57b0b78c8746407e69e7265d1b8b9 WHIRLPOOL 85728501157dcce4fa4a1b4da81ad8ff74ad7d701ed170ae5fa420977ebd4f1992b015f6d19a1ebfff14de90f43764e1521d3188db569b9a71427e966c2d40f2 +AUX dfhack-9999/series 410 SHA256 666ee96606c1b8ff23bff91d5ad6d6f788427ba0ff4affd4e0d4b34e9a22f391 SHA512 852b5ba7928d3040f90f5c8ddafcd9a8f86ad7409d4d8e91303083a4da2e3450fbca6f4cec84612a0b9f134cf20cd7e767d9f98836c122380ec84c608f053bc4 WHIRLPOOL bc0d13a22c98d2754795758b44280039b6789e0100f94cceffa50082966c16b41895bebdd35223dde1644ea7ad8116039158675b2ff1b64e9883c4a2e47750f8 +AUX isoworld-9999/01-missing-include-dir.patch 491 SHA256 00bfd01587e25eeb4c93c3100bbf6872517f214e75a2824c92690c7a3159735e SHA512 267614162fa3d92e6e49783d11c211f55f2d235212fd2538421093f5f59c37509938833e5475a53cd1dc9f96435609f96865834871b373f04e84f7504f7018df WHIRLPOOL bf6c572b9f9db9900196d55fcf2dc26be165cc696dc5cd73454846fcfa6919259c3f71e06dba692addcd517cdebb6e9ee91e48992bc74c8f1fdc0d199f293978 +AUX isoworld-9999/series 106 SHA256 6c265ab0eac63e1b43b9bb9f698ea0b2281db81ea0a67da8602810613b6c0f00 SHA512 22e5f26edb861019d6fb2fdd6959d3efc3fc8687dc545256c34fe2f16e790ca51cdc3d10476f8d4e9ee6a755ed49414abe1c1fb633fca71aee5928cc2b617989 WHIRLPOOL e54a2c64a845f3a643a9f7cfc4fc447986aa83e502ec229c7a9866f9dc2cbe33548cbb9eb8f5dd2167606637230187e9e2a5955427a59e5a52de8994f16498f4 AUX stonesense-9999/01-null-isn-t-an-int32.patch 2293 SHA256 c140f17f9ad485b43ab2b6de8e1ab88ff8e3f6748a233d7d34d63e79a9f8074e SHA512 84ab7ebd25505515085c3c6c2c903d4aa51d8432b8c750a4f66d436426ad9963c07fa5019e24f0ca6d5618be329b35673a819443d092460e55bb6bb829dd4760 WHIRLPOOL 3beb7cc546b1f5eba970628e3a263e2536f881ae1e21115df19c4979b9c267d66ba060bf16f78a46675fe96b2f18fb7281ba1a9dd1695e3e5f0df4147bcb78b7 AUX stonesense-9999/02-configurable-install-paths.patch 1388 SHA256 03ac914c0fbee6d27b68c075d91b8b315179d9cb91944da731006241e0589dbb SHA512 b7b75f33b9aefe91081f4cede21b79b7583374ea5f5608cd4982a6ba5ad35006986ede06985bac70f5260610f2b32ac05cc06e90a983dbc6e85e7346da084d96 WHIRLPOOL 677942b840640ce40a3e93d28265a5f39c778fe369c4de27eee382d8a83e063a775477f5434f754173de88c2a0bf46750006ca11294b244fffe4f3ec5ba80d5f AUX stonesense-9999/03-don-t-segfault-if-logfile-is.patch 817 SHA256 7fd33d13206ef38bca971856d9cfff0fbef88f1e7685111e00fa13b780cc9ecb SHA512 2ff023f34a1cf8718a3954e3a7584d07a1716b67756473d0852863f182c55bcde209921a9e26e1efeffde17ae42ab87c322915d74f2661b79ec49dd158df7cd1 WHIRLPOOL 1c88b645f01d651896b951acbc97d610d986a7d756cb0d58cc9c3c9caaa3873c18d191c46238ad13e050047476cc2589ae7f40614f0b8d3a52bb24fa58325976 @@ -27,5 +30,5 @@ AUX stonesense/0002-compile-time-configuration-of-magic-cwd.patch 7753 SHA256 79 AUX stonesense/0003-screenshots-in-home-dir.patch 2578 SHA256 88bc1a28442dfe8e5ff08e27e82de6443a3c5bccf49d7bcb2a26637a71ae3e18 SHA512 988efaba82e96149641e8dd6d8769b3ac1d890ebaa35128507a8f0d633af947ad9d8090758e1734a2f9b118c5404e4d712e2abb9a4e971f980f4163c0b646f5b WHIRLPOOL f3f03c297fbd39f27b5957cca0073a3420a10ba0a1741cf73f210cf680c2083c761cb68a637663281e69d1fee9e7b5049c3074f18fed394f48888bc377f5bb70 AUX stonesense/0004-create-various-output-files-in-HOME-not-cwd.patch 5217 SHA256 3ac09c948cc36b04058a82cb9f04e0ff26ffee765bf2300a46eac09cebc867de SHA512 9f0c2c5f4a2d15c99e06d30e1d3825527449f63de4d370533f07ce4324d0afbd1a2190dcf9589cbd326fd0f9705333bb436bed74e72ac4a7485f002fa3600639 WHIRLPOOL cbe81a086301a3dc218f31e3b1edb837bd81a25d151e5d46c0988d080165e95faac8ab14a97995a7092262542cbb8b29a2a540fe45a5c74b520e47ec5ab0f420 EBUILD dfhack-0.34.11.2.ebuild 5523 SHA256 c126fc718aaddcfd1f62c04a5ce37add8c6ecfb72e0fa73d8048383e02d048f0 SHA512 ab671faa41ab7cff26b933ef816fba8f5c86389769f5dcf1da6a5ee7413324d50ebcd7e60812935fd0ddd70688461ca23d55edf499ffffec89e3ff3ad321c2e8 WHIRLPOOL 11246c870f497929299ccf75c91f77481a6d3faccc9a8646c668836b22906d089e04826b3f67f5dcc8640b918a9e3a0e1fa9821d7d17664ec58f8a88db498170 -EBUILD dfhack-9999.ebuild 8033 SHA256 7415763c5817ab1d866bfe98a2fc2ec1a4bcc24f85b711331336a97599d9ff78 SHA512 5225221a30b3f33cc83c38c0563b2b3cdd9bc3a246d0b95c66d70027bdaa04ab37b736dd59fb7d4148710796fdfbe245355c9bbf8be0571a926add0b840f9a58 WHIRLPOOL 493f98a0493630381b09b8dfd48ce4b08a5f81d129ad7a9b34e44f52dad7c040f72f66c81f11e0d364ae749b61cb18b487c705ff038fc61f10fbfcab480e1c65 -MISC metadata.xml 663 SHA256 55a12d4c9666a995d266a30d607c232114db139aafa462b02db6f657eb39fa8a SHA512 9a9eede0ad1fed3f735bb08e6f0e9911cc5de7310bc57be987b42842bcaff05becad270d7414da2bca9b40531a69eefb5dff725a61d5b9bfcd3cb84c41847d3c WHIRLPOOL 28e63c07f1470f7bdb56d9c0a7838a501bf94585ed1446e2a107dc5669e0aefc48a6b227c5c55e1e33d0ed2a9be1bff8e2437381496e278b598e542950f43e42 +EBUILD dfhack-9999.ebuild 8400 SHA256 98920d05ed07b87e3900cc65a141178bfb51d85578038c89a80041420de62cc8 SHA512 1a7a44b5ebbce8906d8d0fc0e5e9e9e55fbe2061ebe75ebc2f7b02aa5b2f24ea77a9ae6469d38b0f12cdd4e78bcbecfe75d60a053a36c6dbcd7eb1ba6ff3f662 WHIRLPOOL e868491590c285d674e9d7e72abb15dc55fe853a152f8e306a5d7ff147579bc8215c6aaeb6ea9d2696e29791cd35da1083593bea892884733e947a2b721455a9 +MISC metadata.xml 721 SHA256 92c6cfa56d7afc563cd87101664f1200e50d02fedd5a7a3d19b8a549f042e8bc SHA512 009c4d722c0515a03323e711440db763bb47697719017d0ea8aa2da396739e55a125fcebdd94a1103f48ddf79735523e39ca9edfba77d67ed77c735a62e83a1f WHIRLPOOL ca03b60ff2b56d2bffabfdd8c26f980e5fe6ee70fb50cf13399c1fed55f3a6e7ae28ec7b4290df41f6ae27473b8ef561fe2c82597ef4aca771893a7664786bbb diff --git a/games-util/dfhack/dfhack-9999.ebuild b/games-util/dfhack/dfhack-9999.ebuild index 41e47446..43183040 100644 --- a/games-util/dfhack/dfhack-9999.ebuild +++ b/games-util/dfhack/dfhack-9999.ebuild @@ -29,7 +29,7 @@ CMAKE_REMOVE_MODULES_LIST="FindCurses FindDoxygen CMakeVS10FindMake" LICENSE="ZLIB MIT BSD-2" SLOT="0" KEYWORDS="~amd64" -IUSE="doc api minimal dfusion ssense egg" +IUSE="api dfusion doc egg isoworld minimal ssense" HDEPEND=" dev-perl/XML-LibXML @@ -53,14 +53,12 @@ RDEPEND="${LIBRARY_DEPEND} ssense? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs )" -QA_PREBUILT+="${dfhack_libdir}"/libruby.so - ## missing multilib #dev-lang/lua - binary bundled #dev-libs/protobuf - bundled # sys-libs/zlib (libz.so.1) - baselibs ## ssense -#allegro +#allegro - binary bundled # dev-libs/atk (libatk-1.0.so.0) - gtklibs # dev-libs/glib (libgthread-2.0.so.0,libglib-2.0.so.0,libgobject-2.0.so.0,libgmodule-2.0.so.0,libgio-2.0.so.0) - baselibs # media-libs/fontconfig (libfontconfig.so.1) @@ -88,6 +86,7 @@ if use egg; then else dfhack_libdir="$(games_get_libdir)/${P}" fi +QA_PREBUILT+="${dfhack_libdir}"/libruby.so pkg_setup() { df_executable="df-${df_PV}" @@ -105,6 +104,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}/06-compile-time-configurable-1.patch epatch "${FILESDIR}"/${P}/07-startup-scripts-configurable.patch epatch "${FILESDIR}"/${P}/08-ruby-plugin-configurable-paths.patch + epatch "${FILESDIR}"/${P}/09-eggy-remove-annoying-banner.patch pushd "${S}"/depends/clsocket epatch "${FILESDIR}"/clsocket/0001-Compile-static-library-as-PIC.patch @@ -124,6 +124,12 @@ src_prepare() { #epatch "${FILESDIR}"/stonesense/0003-screenshots-in-home-dir.patch popd fi + if use isoworld; then + pushd "${S}"/plugins/isoworld + epatch "${FILESDIR}"/isoworld-${PV}/01-missing-include-dir.patch + popd + ewarn "The isoworld plugin requires agui, and will probably fail to build" + fi # Fix other scripts # if use dfusion; then @@ -138,6 +144,8 @@ src_prepare() { # - df version # - dfusion is strange. It's always been that, though. # - prebuilt ruby + # - prebuilt lua + # - isoworld requires agui # - prebuilt allegro for stonesense. # - stonesense conf file: /usr/share/games/dfhack-9999/stonesense/init.txt # Set in ./Config.cpp, installed together with the rest of the directory. @@ -151,7 +159,7 @@ src_configure() { "$(cmake-utils_use dfusion BUILD_DFUSION)" "$(cmake-utils_use doc BUILD_DOXYGEN)" "$(cmake-utils_use egg BUILD_EGGY)" - "-DBUILD_ISOWORLD=OFF" + "$(cmake-utils_use isoworld BUILD_ISOWORLD)" "-DBUILD_LIBRARY=ON" "-DBUILD_PLUGINS=ON" "-DBUILD_RUBY=ON" diff --git a/games-util/dfhack/files/dfhack-9999/09-eggy-remove-annoying-banner.patch b/games-util/dfhack/files/dfhack-9999/09-eggy-remove-annoying-banner.patch new file mode 100644 index 00000000..f2c4ce14 --- /dev/null +++ b/games-util/dfhack/files/dfhack-9999/09-eggy-remove-annoying-banner.patch @@ -0,0 +1,22 @@ +eggy - remove annoying banner + +From: eroen <eroen@occam.eroen.eu> + + +--- + library/Core.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/Core.cpp b/library/Core.cpp +index 978fccd..3b10bce 100644 +--- a/library/Core.cpp ++++ b/library/Core.cpp +@@ -986,7 +986,7 @@ bool Core::Init() + HotkeyCond = new condition_variable(); + thread * HK = new thread(fHKthread, (void *) temp); + screen_window = new Windows::top_level_window(); +- screen_window->addChild(new Windows::dfhack_dummy(5,10)); ++ //screen_window->addChild(new Windows::dfhack_dummy(5,10)); + started = true; + + cerr << "Starting the TCP listener.\n"; diff --git a/games-util/dfhack/files/dfhack-9999/series b/games-util/dfhack/files/dfhack-9999/series index 742a16d7..ea00d573 100644 --- a/games-util/dfhack/files/dfhack-9999/series +++ b/games-util/dfhack/files/dfhack-9999/series @@ -7,3 +7,4 @@ 06-compile-time-configurable-1.patch 07-startup-scripts-configurable.patch 08-ruby-plugin-configurable-paths.patch +09-eggy-remove-annoying-banner.patch diff --git a/games-util/dfhack/files/isoworld-9999/01-missing-include-dir.patch b/games-util/dfhack/files/isoworld-9999/01-missing-include-dir.patch new file mode 100644 index 00000000..e7cd20f0 --- /dev/null +++ b/games-util/dfhack/files/isoworld-9999/01-missing-include-dir.patch @@ -0,0 +1,21 @@ +missing include dir + +From: eroen <eroen@occam.eroen.eu> + + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd0cc4b..2bf3210 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,6 +76,7 @@ IF(UNIX) + include_directories (
+ ${include_directories}
+ ${CMAKE_CURRENT_SOURCE_DIR}/allegro/include
++ ${CMAKE_CURRENT_SOURCE_DIR}/agui/include
+ )
+ install(DIRECTORY allegro/lib/
+ DESTINATION "hack/libs"
diff --git a/games-util/dfhack/files/isoworld-9999/series b/games-util/dfhack/files/isoworld-9999/series new file mode 100644 index 00000000..85db40b5 --- /dev/null +++ b/games-util/dfhack/files/isoworld-9999/series @@ -0,0 +1,2 @@ +# This series applies on GIT commit aa3b1bd51f269c07b3235392fd7ed21fe9171f3f +01-missing-include-dir.patch diff --git a/games-util/dfhack/metadata.xml b/games-util/dfhack/metadata.xml index 087400aa..0fd4842f 100644 --- a/games-util/dfhack/metadata.xml +++ b/games-util/dfhack/metadata.xml @@ -7,6 +7,7 @@ <flag name="api">Install development headers. This breaks slotting.</flag> <flag name="dfusion">Build the Dfusion plugin. This does not work properly.</flag> <flag name="egg">Build libegg in stead of the libsdl overriding library for interfacing with <pkg>games-simulation/dwarffortress</pkg>. Requires a patched <pkg>dev-libs/libgraphics</pkg>.</flag> + <flag name="isoworld">Build the isoworld plugin.</flag> <flag name="ssense">Build the Stonesense plugin. This installs pre-built allegro libraries.</flag> </use> </pkgmetadata> |
