diff options
| -rw-r--r-- | dev-games/gigi/files/libpng-14.patch | 31 | ||||
| -rw-r--r-- | dev-games/gigi/files/unbundle-ltdl.patch | 68 | ||||
| -rw-r--r-- | dev-games/gigi/gigi-9999.ebuild | 75 | ||||
| -rw-r--r-- | dev-games/gigi/metadata.xml | 17 | ||||
| -rw-r--r-- | games-strategy/freeorion/files/fix_graphviz.patch | 33 | ||||
| -rw-r--r-- | games-strategy/freeorion/files/freeorion-cmake-zlib.patch | 11 | ||||
| -rw-r--r-- | games-strategy/freeorion/freeorion-9999.ebuild | 58 | ||||
| -rw-r--r-- | games-strategy/freeorion/metadata.xml | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 5 |
9 files changed, 1 insertions, 302 deletions
diff --git a/dev-games/gigi/files/libpng-14.patch b/dev-games/gigi/files/libpng-14.patch deleted file mode 100644 index f096a8e..0000000 --- a/dev-games/gigi/files/libpng-14.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- gigi-9999/GG/src/GIL/extension/io/png_io_private.hpp -+++ gigi-9999/GG/src/GIL/extension/io/png_io_private.hpp -@@ -26,6 +26,10 @@ - #include "../../gil_all.hpp" - #include "io_error.hpp" - -+ -+#define int_p_NULL (int *)NULL -+#define png_infopp_NULL (png_infopp)NULL -+ - namespace boost { namespace gil { - - namespace detail { -@@ -312,7 +312,7 @@ - case 4: - case 8: - if(bit_depth < 8) -- png_set_gray_1_2_4_to_8(_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(_png_ptr); - png_read_and_convert_pixels<gray8_pixel_t,gray8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); - break; - case 16: -@@ -350,7 +350,7 @@ - case 4: - case 8: - if(bit_depth < 8) -- png_set_gray_1_2_4_to_8(_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(_png_ptr); - png_read_and_convert_pixels<gray_alpha8_pixel_t,gray_alpha8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); - break; - case 16: diff --git a/dev-games/gigi/files/unbundle-ltdl.patch b/dev-games/gigi/files/unbundle-ltdl.patch deleted file mode 100644 index 4f307ea..0000000 --- a/dev-games/gigi/files/unbundle-ltdl.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: src/CMakeLists.txt -=================================================================== ---- src/CMakeLists.txt (revision 812) -+++ src/CMakeLists.txt (working copy) -@@ -43,8 +43,6 @@ - dialogs/FileDlg.cpp - dialogs/ThreeButtonDlg.cpp - -- ../libltdl/ltdl.c -- - adobe/adam.cpp - adobe/adam_evaluate.cpp - adobe/adam_parser.cpp -@@ -157,13 +155,6 @@ - ) - endif () - --set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1) --execute_process( -- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h -- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h --) --set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true) -- - set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES}) - if (USE_DEVIL) - list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY}) -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 812) -+++ CMakeLists.txt (working copy) -@@ -224,36 +224,6 @@ - ######################################## - # Header Generation # - ######################################## --if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h) -- if (UNIX) -- message("-- Configuring libltdl using \"libltdl/configure\" ...") -- execute_process( -- COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure -- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl -- OUTPUT_QUIET -- ) -- else () -- file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h -- "/* WARNING: Generated by GG's build system. All local changes will be lost! */ --#define error_t int --#define HAVE_STDIO_H 1 --#define HAVE_STDLIB_H 1 --#define HAVE_STRING_H 1 --#define HAVE_CTYPE_H 1 --#define HAVE_MEMORY_H 1 --#define HAVE_ERRNO_H 1 --#define __WIN32__ --#define HAVE_MEMCPY 1 --#define HAVE_MEMMOVE 1 --#define LTDL_OBJDIR \".libs\" --#define LTDL_DLOPEN_DEPLIBS 1 --#define LTDL_SHLIBPATH_VAR \"PATH\" --#define LTDL_SHLIB_EXT \".dll\" --" -- ) -- endif () --endif () -- - configure_file( - ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in - ${CMAKE_HOME_DIRECTORY}/GG/Config.h diff --git a/dev-games/gigi/gigi-9999.ebuild b/dev-games/gigi/gigi-9999.ebuild deleted file mode 100644 index d5cdec7..0000000 --- a/dev-games/gigi/gigi-9999.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit cmake-utils subversion - -DESCRIPTION="GiGi is an OpenGL interface library" -HOMEPAGE="http://gigi.sourceforge.net" -ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk" -ESVN_PROJECT="${PN}" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="debug devil doc ogre ois +sdl static-libs +threads" - -RDEPEND=" - >=dev-libs/boost-1.44 - media-libs/freetype - x11-libs/libX11 - virtual/opengl - devil? ( >=media-libs/devil-1.6.1 ) - !devil? ( - virtual/jpeg - media-libs/tiff - media-libs/libpng - ) - ogre? ( - threads? ( || - ( >=dev-games/ogre-1.7.1[boost-threads] - >=dev-games/ogre-1.7.1[poco-threads] - >=dev-games/ogre-1.7.1[tbb-threads] ) - ) - ois? ( dev-games/ois ) - ) - sdl? ( >=media-libs/libsdl-1.2 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -CMAKE_USE_DIR="${S}/GG" - -#src_prepare() { -# # remove libtool -# cd "${CMAKE_USE_DIR}" -# rm -rf libltdl/ || die -# # remove cmake calls to libtool -# epatch "${FILESDIR}/unbundle-ltdl.patch" -# # use system headers -# sed -i \ -# -e "s:GG/ltdl.h:ltdl.h:" \ -# GG/PluginInterface.h || die -# # fix working with libpng1.4 -# epatch "${FILESDIR}/libpng-14.patch" -#} - -src_configure() { - use ogre && use ois && mycmakeargs=( "-DBUILD_OGRE_OIS_PLUGIN=ON" ) || mycmakeargs=( "-DBUILD_OGRE_OIS_PLUGIN=OFF" ) - mycmakeargs+=( - "-DBUILD_TUTORIALS=OFF" - $(cmake-utils_use_build debug) - $(cmake-utils_use devil) - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use_build ogre OGRE_DRIVER) - $(cmake-utils_use_build sdl SDL_DRIVER) - $(cmake-utils_use_build static-libs STATIC) - $(cmake-utils_use_build threads MULTI_THREADED) - ) - - cmake-utils_src_configure -} diff --git a/dev-games/gigi/metadata.xml b/dev-games/gigi/metadata.xml deleted file mode 100644 index bf04fa0..0000000 --- a/dev-games/gigi/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer> - <email>krytzz@soylent.eu</email> - <name>steffen stramm</name> -</maintainer> -<maintainer> - <email>azamat.hackimov@gmail.com</email> - <name>Azamat H. Hackimov</name> -</maintainer> -<use> - <flag name='devil'>Enable image loading via DevIL.</flag> - <flag name='ois'>Enable OIS support.</flag> - <flag name='ogre'>Enable OGRE support.</flag> -</use> -</pkgmetadata> diff --git a/games-strategy/freeorion/files/fix_graphviz.patch b/games-strategy/freeorion/files/fix_graphviz.patch deleted file mode 100644 index d793128..0000000 --- a/games-strategy/freeorion/files/fix_graphviz.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: cmake/FindGraphviz.cmake -=================================================================== ---- FreeOrion/cmake/FindGraphviz.cmake (revision 3608) -+++ FreeOrion/cmake/FindGraphviz.cmake (working copy) -@@ -10,7 +10,7 @@ - - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(GRAPHVIZ libagraph libcdt libcgraph libgraph libgvc libpathplan) -+ pkg_check_modules(GRAPHVIZ libcdt libcgraph libgraph libgvc libpathplan) - if (GRAPHVIZ_FOUND) - set(GRAPHVIZ_INCLUDE_DIR ${GRAPHVIZ_INCLUDE_DIRS}) - endif () -@@ -26,11 +26,6 @@ - ) - - find_library( -- GRAPHVIZ_AGRAPH_LIBRARY -- NAMES agraph -- PATHS ${GRAPHVIZ_LIBRARY_DIRS} --) --find_library( - GRAPHVIZ_CDT_LIBRARY - NAMES cdt - PATHS ${GRAPHVIZ_LIBRARY_DIRS} -@@ -57,7 +52,6 @@ - ) - - if (GRAPHVIZ_INCLUDE_DIR AND -- GRAPHVIZ_AGRAPH_LIBRARY AND - GRAPHVIZ_CDT_LIBRARY AND - GRAPHVIZ_CGRAPH_LIBRARY AND - GRAPHVIZ_GRAPH_LIBRARY AND diff --git a/games-strategy/freeorion/files/freeorion-cmake-zlib.patch b/games-strategy/freeorion/files/freeorion-cmake-zlib.patch deleted file mode 100644 index 09422f5..0000000 --- a/games-strategy/freeorion/files/freeorion-cmake-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- FreeOrion/client/AI/CMakeLists.txt~ 2010-09-12 22:21:35.000000000 +0600 -+++ FreeOrion/client/AI/CMakeLists.txt 2010-09-12 22:21:52.000000000 +0600 -@@ -131,7 +131,7 @@ - link_directories(${BOOST_LIBRARYDIR}) - set(THIS_EXE_LINK_LIBS ${THIS_EXE_LINK_LIBS} ${GIGI_GIGI_LIBRARY} ${ZLIB_LIBRARY}) - else () -- set(THIS_EXE_LINK_LIBS ${THIS_EXE_LINK_LIBS} ${Boost_LIBRARIES}) -+ set(THIS_EXE_LINK_LIBS ${THIS_EXE_LINK_LIBS} ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) - endif () - - executable_all_variants(freeorionca) diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild deleted file mode 100644 index 277d73b..0000000 --- a/games-strategy/freeorion/freeorion-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit games cmake-utils subversion - -DESCRIPTION="FreeOrion is a free and open source clone of Master Of Orion" -HOMEPAGE="http://www.freeorion.org" -ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk" -ESVN_PROJECT="${PN}" - -LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0" -SLOT="0" -KEYWORDS="" -IUSE="debug" - -RDEPEND=" - dev-games/gigi[ogre] - <dev-lang/python-3 - dev-libs/boost:1.42 - media-gfx/graphviz - media-libs/freealut - >=media-libs/libogg-1.1.3 - >=media-libs/libsdl-1.2 - >=media-libs/libvorbis-1.1.2 - media-libs/openal - sci-physics/bullet - sys-devel/libtool - sys-libs/zlib" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -CMAKE_USE_DIR="${S}/FreeOrion" - -src_prepare() { - epatch "${FILESDIR}/fix_graphviz.patch" - epatch "${FILESDIR}/freeorion-cmake-zlib.patch" -} - -src_configure() { - mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}/${PN}" - -DCMAKE_DOC_DIR=/usr/share/doc/${PF} - -DCMAKE_MAN_DIR=/usr/share/man - -DCMAKE_DATA_DIR="${GAMES_DATADIR}" - $(cmake-utils_use_build debug) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - prepgamesdirs -} diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml deleted file mode 100644 index 4a5a466..0000000 --- a/games-strategy/freeorion/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>playboys</herd> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 97a4c67..8b13789 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,4 +1 @@ -# Azamat H. Hackimov <azamat.hackimov@gmail.com> (29 Apr 2010) -# Wait until boost-1.44, bug #320039 -dev-games/gigi -games-strategy/freeorion + |