diff options
| -rw-r--r-- | games-strategy/openra/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/openra/files/openra-20131223-sdl2.patch | 26 | ||||
| -rw-r--r-- | games-strategy/openra/openra-20131223-r1.ebuild (renamed from games-strategy/openra/openra-20131223.ebuild) | 35 |
3 files changed, 50 insertions, 19 deletions
diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog index 603522e35785..33031f869a0b 100644 --- a/games-strategy/openra/ChangeLog +++ b/games-strategy/openra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-strategy/openra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.24 2013/12/22 22:37:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.25 2013/12/24 21:46:19 hasufell Exp $ + +*openra-20131223-r1 (24 Dec 2013) + + 24 Dec 2013; Julian Ospald <hasufell@gentoo.org> -openra-20131223.ebuild, + +openra-20131223-r1.ebuild, +files/openra-20131223-sdl2.patch: + revbump, rm obsolete cg useflag, fix sdl2 support *openra-20131223 (22 Dec 2013) diff --git a/games-strategy/openra/files/openra-20131223-sdl2.patch b/games-strategy/openra/files/openra-20131223-sdl2.patch new file mode 100644 index 000000000000..c474498294de --- /dev/null +++ b/games-strategy/openra/files/openra-20131223-sdl2.patch @@ -0,0 +1,26 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Dec 24 21:10:12 UTC 2013 +Subject: fix engine detection + +--- a/OpenRA.Game/GameRules/Settings.cs ++++ b/OpenRA.Game/GameRules/Settings.cs +@@ -83,7 +83,7 @@ + + public class GraphicSettings + { +- public string Renderer = "Gl"; ++ public string Renderer; + public WindowMode Mode = WindowMode.PseudoFullscreen; + public int2 FullscreenSize = new int2(0,0); + public int2 WindowedSize = new int2(1024, 768); +--- a/OpenRA.Game/Game.cs ++++ b/OpenRA.Game/Game.cs +@@ -283,7 +283,7 @@ + } + + FileSystem.Mount("."); // Needed to access shaders +- var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", "Gl", "Cg", null }; ++ var renderers = new[] { "Sdl2", "Gl", "Cg", null }; + foreach (var r in renderers) + { + if (r == null) diff --git a/games-strategy/openra/openra-20131223.ebuild b/games-strategy/openra/openra-20131223-r1.ebuild index 5807fd70dfd8..d590579ae53a 100644 --- a/games-strategy/openra/openra-20131223.ebuild +++ b/games-strategy/openra/openra-20131223-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20131223.ebuild,v 1.1 2013/12/22 22:37:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20131223-r1.ebuild,v 1.1 2013/12/24 21:46:19 hasufell Exp $ EAPI=5 @@ -13,16 +13,18 @@ SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cg tools" +IUSE="tools" DEPEND="dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] - media-libs/libsdl[X,opengl,video] + || ( + media-libs/libsdl[X,opengl,video] + media-libs/libsdl2[X,opengl,video] + ) media-libs/openal virtual/jpeg - virtual/opengl - cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )" + virtual/opengl" RDEPEND="${DEPEND}" pkg_setup() { @@ -35,6 +37,7 @@ src_unpack() { } src_prepare() { + epatch "${FILESDIR}"/${P}-sdl2.patch # register game-version sed \ -e "/Version/s/{DEV_VERSION}/release-${PV}/" \ @@ -57,13 +60,9 @@ src_install() { doins -r packaging/linux/hicolor # desktop entries - local myrenderer=$(usex cg Cg Gl) - make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \ - "OpenRA CNC" ${PN} - make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \ - "OpenRA RA" ${PN} - make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \ - "OpenRA Dune2k" ${PN} + make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN} + make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN} + make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN} make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN} dodoc "${FILESDIR}"/README.gentoo README.md CHANGELOG @@ -81,12 +80,12 @@ pkg_postinst() { games_pkg_postinst gnome2_icon_cache_update - if ! use cg ; then - elog "If you have problems starting the game consider switching" - elog "to Graphics.Renderer=Cg in openra*.desktop or manually" - elog "run:" - elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg" - fi + elog "optional dependencies:" + elog " media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)" + elog + elog "you might also want to emerge media-libs/libsdl2 specifically," + elog "because ${PN} supports both sdl1.2 and sdl2, but the ebuild only" + elog "pulls in one of them, prefering sdl1.2." } pkg_postrm() { |