From e299dc22a865ef1f81df053467aaa49990fa24d9 Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Tue, 8 Nov 2011 12:26:40 +0100 Subject: [games-util/terragear-cs] move to cmake. Lots of improvements upstream. --- games-util/terragear-cs/Manifest | 3 +- .../terragear-cs/files/terragear-cs-use-agg.patch | 134 --------------------- games-util/terragear-cs/terragear-cs-9999.ebuild | 14 ++- 3 files changed, 9 insertions(+), 142 deletions(-) delete mode 100644 games-util/terragear-cs/files/terragear-cs-use-agg.patch (limited to 'games-util') diff --git a/games-util/terragear-cs/Manifest b/games-util/terragear-cs/Manifest index ca18009..8d73654 100644 --- a/games-util/terragear-cs/Manifest +++ b/games-util/terragear-cs/Manifest @@ -1,3 +1,2 @@ -AUX terragear-cs-use-agg.patch 5557 RMD160 b1070af53fa8427d87cc6b8dc7df473cc5a1fb38 SHA1 3a6b297968c0f7cb1df9f5faf21ed499706710df SHA256 5b019c12e41ca7ab0d0c1bc8adeefe5839f49027aef6d7d103be0c9c4718af4b -EBUILD terragear-cs-9999.ebuild 634 RMD160 10df506d6c2fc57bf98910c535095f6e1ae54652 SHA1 84c8de9708860a60234c39485ac8d0528defdb4b SHA256 b13157622fa3b4879c145b9c36d43d109b6471e4970c812dc4b6e51c23dbe2fe +EBUILD terragear-cs-9999.ebuild 694 RMD160 c0720fa030e60ed9c46d39f934291721db0465a4 SHA1 c6a98f45bd43ac05eafa8100294034f8f02d2da7 SHA256 258c53db85bdb1de35b854c6c76eccf6fee693fba996756bfd9868192fb2e9c5 MISC metadata.xml 309 RMD160 3b2c61243b818b3b53932f26899e00bd192cfbb4 SHA1 0419836318eb7c961fcf0063ae4dbef259b750f1 SHA256 2c1cb442256717e7a928002fb32e7167f8e991e6b42b2b85ec15f699d3041eac diff --git a/games-util/terragear-cs/files/terragear-cs-use-agg.patch b/games-util/terragear-cs/files/terragear-cs-use-agg.patch deleted file mode 100644 index aa6bf1d..0000000 --- a/games-util/terragear-cs/files/terragear-cs-use-agg.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -ru src/Airports/GenAirports/Makefile.am src/Airports/GenAirports/Makefile.am ---- src/Airports/GenAirports/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Airports/GenAirports/Makefile.am 2010-07-15 10:05:48.000000000 +0200 -@@ -52,7 +52,7 @@ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip \ -+ -lagggpc \ - -lnewmat \ - -lz \ - $(base_LIBS) -diff -ru src/BuildTiles/Clipper/Makefile.am src/BuildTiles/Clipper/Makefile.am ---- src/BuildTiles/Clipper/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/BuildTiles/Clipper/Makefile.am 2010-07-15 10:05:48.000000000 +0200 -@@ -16,7 +16,7 @@ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles - -diff -ru src/BuildTiles/Main/Makefile.am src/BuildTiles/Main/Makefile.am ---- src/BuildTiles/Main/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/BuildTiles/Main/Makefile.am 2010-07-15 10:05:48.000000000 +0200 -@@ -21,7 +21,7 @@ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \ -- -lplibsg -lplibul -lgenpolyclip -lz -+ -lplibsg -lplibul -lagggpc -lz - - fgfs_master_SOURCES = master.cxx - -diff -ru src/Prep/E00Lines/Makefile.am src/Prep/E00Lines/Makefile.am ---- src/Prep/E00Lines/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/E00Lines/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -10,6 +10,6 @@ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - $(top_builddir)/src/Lib/e00/libe00.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -diff -ru src/Prep/GSHHS/Makefile.am src/Prep/GSHHS/Makefile.am ---- src/Prep/GSHHS/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/GSHHS/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -11,7 +11,7 @@ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - debug_SOURCES = \ - debug.cxx -@@ -21,6 +21,6 @@ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib -diff -ru src/Prep/MergerClipper/Makefile.am src/Prep/MergerClipper/Makefile.am ---- src/Prep/MergerClipper/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/MergerClipper/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -13,6 +13,6 @@ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -diff -ru src/Prep/OGRDecode/Makefile.am src/Prep/OGRDecode/Makefile.am ---- src/Prep/OGRDecode/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/OGRDecode/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -11,6 +11,6 @@ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -diff -ru src/Prep/Photo/Makefile.am src/Prep/Photo/Makefile.am ---- src/Prep/Photo/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/Photo/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -37,7 +37,7 @@ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - $(base_LIBS) - - wgs84offset_SOURCES = wgs84offset.cxx -diff -ru src/Prep/ShapeFile/Makefile.am src/Prep/ShapeFile/Makefile.am ---- src/Prep/ShapeFile/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/ShapeFile/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -12,6 +12,6 @@ - $(top_builddir)/src/Lib/shapelib/libshape.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -diff -ru src/Prep/TGVPF/Makefile.am src/Prep/TGVPF/Makefile.am ---- src/Prep/TGVPF/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/TGVPF/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -10,6 +10,6 @@ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - $(top_builddir)/src/Lib/vpf/libvpf.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgtiming -lsgstructure -lsgxml \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib -diff -ru src/Prep/UserDef/Makefile.am src/Prep/UserDef/Makefile.am ---- src/Prep/UserDef/Makefile.am 2010-07-15 10:04:49.000000000 +0200 -+++ src/Prep/UserDef/Makefile.am 2010-07-15 10:05:47.000000000 +0200 -@@ -11,6 +11,6 @@ - -lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgstructure -lsgxml \ - -lsgdebug \ - -lOpenThreads \ -- -lgenpolyclip -lz -+ -lagggpc -lz - - INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild index c560da4..2d011fd 100644 --- a/games-util/terragear-cs/terragear-cs-9999.ebuild +++ b/games-util/terragear-cs/terragear-cs-9999.ebuild @@ -4,7 +4,7 @@ EAPI="4" -inherit autotools git-2 +inherit cmake-utils git-2 DESCRIPTION="Terrain editing programs for FlightGear" HOMEPAGE="http://terragear.sourceforge.net/" @@ -16,8 +16,8 @@ KEYWORDS="" IUSE="gdal" DEPEND="dev-games/simgear + dev-libs/boost dev-libs/newmat - media-libs/plib || ( =x11-libs/agg-2.5 >x11-libs/agg-2.5[gpc] ) gdal? ( sci-libs/gdal ) " @@ -25,11 +25,13 @@ DEPEND="dev-games/simgear RDEPEND="${DEPEND}" src_prepare() { - epatch ${FILESDIR}/"${PN}"-use-agg.patch - eautoreconf + sed -e "s|genpolyclip|agggpc|g" -i CMakeModules/FindGPC.cmake } src_configure() { - econf \ - $(use_with gdal) + mycmakeargs=( + $(cmake-utils_use_enable gdal) + ) + + cmake-utils_src_configure } -- cgit v1.2.3-65-gdbad