diff options
| -rw-r--r-- | games-action/openclonk/Manifest | 2 | ||||
| -rw-r--r-- | games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch | 20 | ||||
| -rw-r--r-- | games-action/openclonk/files/openclonk-5.5.1-paths.patch | 67 | ||||
| -rw-r--r-- | games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch | 25 | ||||
| -rw-r--r-- | games-action/openclonk/openclonk-5.5.1.ebuild | 121 |
5 files changed, 0 insertions, 235 deletions
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest index 880992f5b167..18d7ff8b66b2 100644 --- a/games-action/openclonk/Manifest +++ b/games-action/openclonk/Manifest @@ -1,3 +1 @@ -DIST openclonk-5.5.1-src.tar.bz2 65383438 SHA256 c038d6dc2ef9a3d7966b18ba6147b9dd136f353dfaa5796455f9917b79255743 SHA512 eb111a1f19e2373e6999850dddafa9a5653694904f470690ef39300e4cc3105f0394637e7dbea0a4cff9d91dd30b04f9037252eb0e8830966696f01f6424b977 WHIRLPOOL 990e90ff0daf9aa9dc4826ff621f0647089a68b5ba7d798a4d6cd5ef5d9ec78a666ae897241a6d556f90110f6739206fb09ebc2bc6c9558df65ee67dba0ea8af DIST openclonk-6.1-src.tar.bz2 68861317 SHA256 5c3903f82c9d7e8c466ab1ff594d553911a6e5fa0be2a326684d823ef1c24905 SHA512 2705a34e797e8352c2f480c57f1c8131a4e2c71bec3ac353d1cdbca6976e7b9e4722ed171b67c03f958eecedbe43b2751be843d7fcc460c2ee65fd035bc6bb4a WHIRLPOOL 3cb05e758c91ec963f198dbe2fbdb117641628ccd139ad787e55a1b57a93719e2d4b655758cbcbf8f42a5391b09282488133febd7f9400e51587291f72126136 -DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13 diff --git a/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch b/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch deleted file mode 100644 index 161258604e6b..000000000000 --- a/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/graphics/C4SurfaceLoaders.cpp.old 2015-01-02 18:01:35.768676874 +0100 -+++ src/graphics/C4SurfaceLoaders.cpp 2015-01-02 18:02:17.705896683 +0100 -@@ -303,7 +303,7 @@ - // The doc says to give fake end-of-inputs if there is no more data - cinfo->src->next_input_byte = &end_of_input; - cinfo->src->bytes_in_buffer = 1; -- return true; -+ return (boolean)true; - } - static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) - { -@@ -354,7 +354,7 @@ - blub.term_source = jpeg_noop; - - // a missing image is an error -- jpeg_read_header(&cinfo, true); -+ jpeg_read_header(&cinfo, (boolean)true); - - // Let libjpeg convert for us - cinfo.out_color_space = JCS_RGB; diff --git a/games-action/openclonk/files/openclonk-5.5.1-paths.patch b/games-action/openclonk/files/openclonk-5.5.1-paths.patch deleted file mode 100644 index 02776e21ed69..000000000000 --- a/games-action/openclonk/files/openclonk-5.5.1-paths.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Thu Feb 6 19:58:45 UTC 2014 -Subject: make paths modifiable - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,16 @@ - set(${_var} "${_string}" PARENT_SCOPE) - endfunction() - -+ -+############################################################################ -+# User selectable paths -+############################################################################ -+set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination") -+set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination") -+set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination") -+set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination") -+ -+ - ############################################################################ - # User selectable options - ############################################################################ -@@ -1170,10 +1180,16 @@ - # Assemble compiler flags - ############################################################################ - if(UNIX) -+ if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}") -+ set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}") -+ else() -+ set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}") -+ endif() -+ - # Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached, - # and when the path is changed both the old and new definition appears - # in the list of flags. -- add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"") -+ add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"") - endif() - if(OC_CXX_FLAGS) - list(REMOVE_DUPLICATES OC_CXX_FLAGS) -@@ -1474,20 +1490,20 @@ - DEPENDS c4group - VERBATIM - ) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk") - endif() - endforeach() - - if (NOT APPLE) - add_custom_target(groups DEPENDS ${OC_C4GROUPS}) - add_dependencies(data groups) -- -+ - # Install new files -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications") - - # Install binaries -- install(TARGETS openclonk DESTINATION games) -- install(TARGETS c4group DESTINATION bin) -+ install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}") -+ install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}") - else() - install(TARGETS openclonk - BUNDLE DESTINATION . diff --git a/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch b/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch deleted file mode 100644 index a55943fc3135..000000000000 --- a/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Thu Feb 6 19:58:45 UTC 2014 -Subject: use shared tinyxml - ---- a/CMakeLists.txt.old.new -+++ b/CMakeLists.txt -@@ -1292,7 +1292,6 @@ - CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H) - - # TinyXML --add_subdirectory(thirdparty/tinyxml) - target_link_libraries(openclonk tinyxml) - - if(WIN32) ---- a/src/lib/StdMeshLoaderXml.cpp -+++ b/src/lib/StdMeshLoaderXml.cpp -@@ -19,7 +19,7 @@ - #include "C4Include.h" - #include "StdMesh.h" - #include "StdMeshLoader.h" --#include <tinyxml/tinyxml.h> -+#include <tinyxml.h> - - // Helper class to load things from an XML file with error checking - class StdMeshLoader::StdMeshXML diff --git a/games-action/openclonk/openclonk-5.5.1.ebuild b/games-action/openclonk/openclonk-5.5.1.ebuild deleted file mode 100644 index fe6d46e67f0d..000000000000 --- a/games-action/openclonk/openclonk-5.5.1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# FIXME: does not compile with gtk+3 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils eutils gnome2-utils python-any-r1 games - -MY_P=${PN}-release-${PV}-src - -DESCRIPTION="A free multiplayer action game where you control clonks" -HOMEPAGE="http://openclonk.org/" -SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2 - http://${PN}.org/homepage/icon.png -> ${PN}.png" - -LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated doc" - -RDEPEND=" - >=dev-libs/boost-1.40 - dev-libs/tinyxml - net-libs/libupnp - media-libs/libpng:0 - sys-libs/zlib - !dedicated? ( - dev-libs/glib:2 - media-libs/freealut - media-libs/freetype:2 - media-libs/glew - media-libs/libsdl[X,opengl,sound,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl-mixer[mp3,vorbis,wav] - virtual/jpeg - virtual/opengl - virtual/glu - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libXrandr - x11-libs/libX11 - ) - dedicated? ( sys-libs/readline:0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - ${PYTHON_DEPS} - dev-libs/libxml2[python] - sys-devel/gettext - )" - -PATCHES=( - "${FILESDIR}"/${P}-tinyxml-shared.patch - "${FILESDIR}"/${P}-paths.patch - "${FILESDIR}"/${P}-jpeg9.patch -) -S=${WORKDIR}/${PN}-release-${PV}-src - -pkg_setup() { - games_pkg_setup - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - rm -r thirdparty/tinyxml || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(usex dedicated \ - "-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \ - "-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=OFF") - -DWITH_AUTOMATIC_UPDATE=OFF - -DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}" - -DINSTALL_DATADIR="${GAMES_DATADIR}" - -DUSE_STATIC_BOOST=OFF - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - emake -C docs - fi -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated; then - mv "${ED%/}${GAMES_BINDIR}/openclonk" "${ED%/}${GAMES_BINDIR}/clonk" || die - newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN} - doicon -s 64 "${DISTDIR}"/${PN}.png - make_desktop_entry ${PN} - fi - use doc && dohtml -r docs/online/* - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} |