ohnobinki_overlay Changeset - 333e0a612ea0

Changeset - 333e0a612ea0

Parent rev.

Child rev.

[Not reviewed]

default

1 4 1

Nathan Brink (binki) - 15 years ago 2010-06-23 22:05:50
ohnobinki@ohnopublishing.net

Added patch so that #include <SDL.h> is used instead of #include <SDL/SDL_*.h>, fixing compilation under portage-multilib. Dropped old warzone2100.2.2.4.ebuild.
(Portage version: 2.2_rc67-r8/hg/Linux x86_64)
(Signed Manifest commit)

6 files changed with 105 insertions and 74 deletions:

games-strategy/warzone2100/ChangeLog

games-strategy/warzone2100/Manifest

games-strategy/warzone2100/files/warzone2100-2.3.1-include-SDL.patch

games-strategy/warzone2100/warzone2100-2.2.4.ebuild

games-strategy/warzone2100/warzone2100-2.3.0.ebuild

games-strategy/warzone2100/warzone2100-2.3.1.ebuild

0 comments (0 inline, 0 general)

games-strategy/warzone2100/ChangeLog

➞

Show inline comments

 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.43 2010/06/21 20:11:51 maekke Exp $
 Jun 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> -warzone2100-2.2.4.ebuild,
   warzone2100-2.3.0.ebuild, warzone2100-2.3.1.ebuild,
   +files/warzone2100-2.3.1-include-SDL.patch:
   Added patch so that #include <SDL.h> is used instead of #include
   <SDL/SDL_*.h>, fixing compilation under portage-multilib. Dropped old
   warzone2100.2.2.4.ebuild.
 Jun 2010; Markus Meier <maekke@gentoo.org> warzone2100-2.3.0.ebuild:
   amd64/x86 stable, bug #322435
 *warzone2100-2.3.1 (14 Jun 2010)
 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
   +warzone2100-2.3.1.ebuild:
   version bump
 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
   warzone2100-2.3.0.ebuild:
   use the higher quality videos (bug #317283)

games-strategy/warzone2100/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 DIST sequences-2.2.wz 169607304 RMD160 88ea130925e4a886f0063dc923c794aef068519a SHA1 3e59a0dee479d8351a9f48c3a58adf9cf7e680ce SHA256 4a1939a1e401f3b0f68736ff19689abed5e1e9d3dfe4fc07b04953c0dfaf7ad6
 DIST warzone2100-2.2.4.tar.gz 50669827 RMD160 717747ae69d62e7ac7658ea4583d3faa70327847 SHA1 264ed777f86c2f8c87985800066192593db5ea15 SHA256 6a3ff34e530d1c6a324fd2b830a7b24bba5b4b83df9c30dbba8089d260e70acf
 AUX warzone2100-2.3.1-include-SDL.patch 2702 RMD160 d369028fa5fa2606d1bc12d88284038602372804 SHA1 522d136c273cd9a657cb5aa00146591277979ea2 SHA256 3f7435ee90da8699a3ee445b86cfcc04bc961c5b796183ae326c48bae48cd34a
 DIST warzone2100-2.3.0-videos.wz 571937134 RMD160 7350fa47b0dc0db631ad22763039e29bf420a847 SHA1 7ade8edd200afee3e4a675d1a5b739b32e574916 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3
 DIST warzone2100-2.3.0.tar.gz 48738273 RMD160 ad766fc7ea2b80e2fef396a51332bf8179b8e91b SHA1 98429aaf04b7ccc81fead97ec438cdf6f83ef48e SHA256 f2a7123216f9bca79ce7d8cfdda967574788d770fee3539a5d48f748cdd33182
 DIST warzone2100-2.3.1-videos.wz 571937134 RMD160 7350fa47b0dc0db631ad22763039e29bf420a847 SHA1 7ade8edd200afee3e4a675d1a5b739b32e574916 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3
 DIST warzone2100-2.3.1.tar.gz 52987292 RMD160 fb3a39b39c5433c81925800f3692334b1a9b2f34 SHA1 e1d99cd3aff195b2bb0ad95d7c805f400438821d SHA256 56995d465250f5007a3acaf7ffae566bfa93bad719c5b07f7f726a136ac97516
 EBUILD warzone2100-2.2.4.ebuild 1690 RMD160 befa9aca6b3b087039d2473636eee831f8cc35cf SHA1 d1684b2fd4d6849985f92560e9ef64fc534b9822 SHA256 9da07e52a67ab6a344c5e7e18c72c3b75cf5eddfff68812cdfcb97d4834ceed6
 EBUILD warzone2100-2.3.0.ebuild 1744 RMD160 4e48eb964264e17b9553e959f87778e927926c12 SHA1 345b59cd60046dfee0e534c3af5759a22d5eb0e0 SHA256 d4bd8b070dd5cc7bda0612e8c2e4adea00fb1ca9fcf3cf0c4ebec39242a0cca1
 EBUILD warzone2100-2.3.1.ebuild 1749 RMD160 3f1f6a8b4c68decc69ccc176e0e44b7388a08d64 SHA1 9a9cd132dfbe669f9e7b118ebe8780076a994b0c SHA256 c78c5ed08961be27505527a0664d678b5f9989aab73ae661f9d8b413d526597c
 MISC ChangeLog 6547 RMD160 7a105e3819f36a8df3d27fc7f5806a54d62bda3f SHA1 e4c340bdc249972820004430220f4c7de67bc795 SHA256 ba7ae7c32062b527eca4765c9bd791c5de0be4e1ab83fe93d6249e490db1efe7
 EBUILD warzone2100-2.3.0.ebuild 1846 RMD160 1376c328ec5d5f59e23d515125c726b61edfd1e2 SHA1 f5d9fa93fc80a1f46f5c761427676a2dbd796c8d SHA256 2fa25778dc1b8e13fa8be0d0d424b4450eb6032ea11ae973437b40046f865492
 EBUILD warzone2100-2.3.1.ebuild 1844 RMD160 f53f6f3a8a0fdef16e802226d05acd0339cf0e8c SHA1 3904f6a6a6d74e47190af27cce5e393eb2d0eb54 SHA256 d2870c7d5b77a80e52720ec7df891c52ecc55f23ed87c389974d6d00184899fe
 MISC ChangeLog 6923 RMD160 9d03672e98692206c6a9098c65c413ae6e9ccbbc SHA1 9d1589b6eb4d6c39dde9e0c17fec8dacdd2deba1 SHA256 f53615d4a3061d136a49c7181429baa32a641047e8fa2a6c0fa3adc54ce9c0f4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 iEYEARECAAYFAkwfxzoACgkQkKaRLQcq0GKJFACfcI0RH8Iex3Ombq7oON/J/wmi
 Cl4AnjlSBrXaEUxduAvdS1AIkTR5H3/i
 =jkSw
 iEYEARECAAYFAkwivX0ACgkQni8M22OVw8AmOACgl2CcAXMo+4g2iRaZ67aOmRX4
 iggAnjnbl/94viOjxHaiVZYWVZ8EdPzy
 =C9TX
 -----END PGP SIGNATURE-----

games-strategy/warzone2100/files/warzone2100-2.3.1-include-SDL.patch

➞

Show inline comments

@@ new file 100644 @@
 Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
 Project: Warzone r11026
 Purpose: Use #include <SDL.h> instead of #include <SDL/SDL.h>. See upstream SDL FAQ ( http://www.libsdl.org/faq.php?action=listentries&category=2#19 ). Fixes compilation on Gentoo portage-multilib systems (reported by xming on freenode).
 Index: configure.ac
 ===================================================================
 --- configure.ac	(revision 11026)
 +++ configure.ac	(working copy)
@@ -367,8 +367,12 @@
  AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}])
  # Look for OpenGL
 -AC_CHECK_HEADER(SDL/SDL_opengl.h, ,
 +CPPFLAGS_SAVE="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
 +AC_CHECK_HEADER([SDL_opengl.h], [],
  	AC_MSG_ERROR([SDL OpenGL header not found. Please install SDL with OpenGL support.]))
 +CPPFLAGS="$CPPFLAGS_SAVE"
++
  AC_CHECK_LIB(GL, main,
  	OPENGL_LIBS="-lGL",
  	AC_CHECK_LIB(opengl32, main,
 Index: lib/iniparser/Makefile.am
 ===================================================================
 --- lib/iniparser/Makefile.am	(revision 11026)
 +++ lib/iniparser/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 +AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
  AM_CFLAGS = $(WZ_CFLAGS)
 -AM_CPPFLAGS = $(WZ_CPPFLAGS)
  noinst_LIBRARIES = libiniparser.a
  noinst_HEADERS = dictionary.h iniparser.h
  libiniparser_a_SOURCES = dictionary.c iniparser.c
 Index: lib/netplay/netsocket.cpp
 ===================================================================
 ===================================================================
 --- lib/framework/SDL_framerate.h	(revision 11026)
 +++ lib/framework/SDL_framerate.h	(working copy)
@@ -17,7 +17,7 @@
  /* --- */
 -#include <SDL/SDL.h>
 +#include <SDL.h>
  /* --------- Definitions */
 Index: lib/framework/input.h
 ===================================================================
 --- lib/framework/input.h	(revision 11026)
 +++ lib/framework/input.h	(working copy)
@@ -30,7 +30,7 @@
  #error Framework header files MUST be included from Frame.h ONLY.
  #endif
 -#include <SDL/SDL.h>
 +#include <SDL.h>
  #include "types.h"
  #include "lib/framework/utf.h"
 Index: lib/framework/cursors.h
 ===================================================================
 --- lib/framework/cursors.h	(revision 11026)
 +++ lib/framework/cursors.h	(working copy)
@@ -24,1 +24,1 @@
 -#include <SDL/SDL_mouse.h>
 +#include <SDL_mouse.h>
 Index: lib/ivis_opengl/piestate.c
 ===================================================================
 --- lib/ivis_opengl/piestate.c	(revision 11026)
 +++ lib/ivis_opengl/piestate.c	(working copy)
@@ -27,1 +27,1 @@
 -#include <SDL/SDL_opengl.h>
 +#include <SDL_opengl.h>
 Index: po/uk_UA.po

games-strategy/warzone2100/warzone2100-2.2.4.ebuild

➞

Show inline comments

deleted file

games-strategy/warzone2100/warzone2100-2.3.0.ebuild

➞

Show inline comments

 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.3.0.ebuild,v 1.3 2010/06/21 20:11:51 maekke Exp $
 EAPI=2
 inherit versionator games
+inherit autotools eutils versionator games
 MY_PV=$(get_version_component_range -2)
 VIDEOS_P=${P}-videos.wz
 DESCRIPTION="3D real-time strategy game"
 HOMEPAGE="http://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.gz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 # upstream requested debug support
@@ @@ -30,24 +30,30 @@ RDEPEND="dev-db/sqlite:3 @@
 	media-libs/sdl-net
 	media-libs/quesoglc
 	virtual/glu
 	virtual/opengl
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 RDEPEND="${RDEPEND}
 	media-fonts/dejavu"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.3.1-include-SDL.patch
 	eautoreconf
+}
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
 		--localedir=/usr/share/locale \
 		--with-distributor="Gentoo ${PF}" \
 		--with-icondir=/usr/share/pixmaps \
 		--with-applicationdir=/usr/share/applications \
 		$(use_enable debug debug relaxed) \
 		$(use_enable nls)
+}

games-strategy/warzone2100/warzone2100-2.3.1.ebuild

➞

Show inline comments

 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.3.1.ebuild,v 1.1 2010/06/14 08:13:58 mr_bones_ Exp $
 EAPI=2
 inherit versionator games
+inherit autotools eutils versionator games
 MY_PV=$(get_version_component_range -2)
 VIDEOS_P=${P}-videos.wz
 DESCRIPTION="3D real-time strategy game"
 HOMEPAGE="http://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.gz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 # upstream requested debug support
@@ @@ -30,24 +30,30 @@ RDEPEND="dev-db/sqlite:3 @@
 	media-libs/sdl-net
 	media-libs/quesoglc
 	virtual/glu
 	virtual/opengl
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 RDEPEND="${RDEPEND}
 	media-fonts/dejavu"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-include-SDL.patch
 	eautoreconf
+}
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
 		--localedir=/usr/share/locale \
 		--with-distributor="Gentoo ${PF}" \
 		--with-icondir=/usr/share/pixmaps \
 		--with-applicationdir=/usr/share/applications \
 		$(use_enable debug debug relaxed) \
 		$(use_enable nls)
+}

0 comments (0 inline, 0 general)