diff options
author | Sven Eden <sven.eden@gmx.de> | 2012-04-20 16:07:14 +0200 |
---|---|---|
committer | Sven Eden <sven.eden@gmx.de> | 2012-04-20 16:07:14 +0200 |
commit | 954b59de55071858120635a86c0eff3d045d9d63 (patch) | |
tree | c2e8e18fd6be66a09f7d42b68b683e175893d01a /dev-games | |
parent | CrystalSpace-2.0: Quick hotfix to make cs-config work again (diff) | |
download | seden-954b59de55071858120635a86c0eff3d045d9d63.tar.gz seden-954b59de55071858120635a86c0eff3d045d9d63.tar.bz2 seden-954b59de55071858120635a86c0eff3d045d9d63.zip |
CS-2.0: Eventually wrote a patch to fix the broken cs-config-2.0 script
Diffstat (limited to 'dev-games')
-rw-r--r-- | dev-games/crystalspace/ChangeLog | 8 | ||||
-rw-r--r-- | dev-games/crystalspace/Manifest | 5 | ||||
-rw-r--r-- | dev-games/crystalspace/crystalspace-2.0_beta3-r3.ebuild (renamed from dev-games/crystalspace/crystalspace-2.0_beta3-r2.ebuild) | 13 | ||||
-rw-r--r-- | dev-games/crystalspace/files/crystalspace-2.0-cs-config.patch | 54 |
4 files changed, 70 insertions, 10 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog index e085877..200ecfb 100644 --- a/dev-games/crystalspace/ChangeLog +++ b/dev-games/crystalspace/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*crystalspace-2.0_beta3-r3 (20 Apr 2012) + + 20 Apr 2012; Sven Eden <sven.eden@gmx.de> + +crystalspace-2.0_beta3-r3.ebuild + -crystalspace-2.0_beta3-r2.ebuild + Instead of symlinking everything together, a new patch now fixes + the borked cs-config-2.0 script. + *crystalspace-2.0_beta3-r2 (20 Apr 2012) 20 Apr 2012; Sven Eden <sven.eden@gmx.de> diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest index 938a592..5e00b2b 100644 --- a/dev-games/crystalspace/Manifest +++ b/dev-games/crystalspace/Manifest @@ -1,8 +1,9 @@ AUX crystalspace-1.4.0-bullet.patch 501 RMD160 8a5c37029c5c1470d1c73b5e0b38df0936e2a85a SHA1 d65deefa25dc49a6e4b7f3d641b9f8ab36565368 SHA256 0dc5ecb64d9a9a07a3da9e89c51080952beb1a4daed40e6b3eccc64ab9e4677f +AUX crystalspace-2.0-cs-config.patch 1329 RMD160 11b2fdefae6fbd779ffe0b3f1ad3f22e8ff39050 SHA1 496e22220250936c8cede34884a31189e107b3f1 SHA256 48498ff5ae4d1f37e5e766ed4483886e20bf417aef054819ac2f09c604a8a3f4 DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba DIST crystalspace-src-2.0beta3.tar.bz2 189457618 RMD160 826686d65651bf2b7e8cbd7a1930d9c6b71d69fe SHA1 1d594a055a39c23da2dd10ab0ba527772ee5faf7 SHA256 e1c97f2937f091c73c4d55276586094544f4ef32d7cc2e0a1999fe2dc3fbd9e9 EBUILD crystalspace-1.4.0-r2.ebuild 3499 RMD160 aa8e97669720b3b3fe53672d46ff2352116a402b SHA1 3666a937bcf83e8d3cba582f9a661b691f18a6f8 SHA256 4fb1ca5b6921bbf182adfb80336c21e4f83fdd6b7f16dd35f17c9effc856cbbc -EBUILD crystalspace-2.0_beta3-r2.ebuild 5666 RMD160 a56fed117b77cedaaf1192427d95aebe97e98b8d SHA1 71ad295f057fbe9f6913ce3e4bc2844becf4b923 SHA256 2e4195b5840c0cb71422e328ba1e899e129ec1060b3c7c4f410dcbeefe1cd031 +EBUILD crystalspace-2.0_beta3-r3.ebuild 5557 RMD160 c324e367ebaf777583b36a1710fd945fcc4c55e5 SHA1 7e53ebf3a91d3c13f1e2da0d47796849cf69ecc7 SHA256 269237d74e85a2ca3d7e66c923877f033f2b5572099c7fe6f1ccc10d1d1635e2 EBUILD crystalspace-2.1_pre9999-r1.ebuild 5229 RMD160 cfb27839a6bfa6d55a730c33399a351b1affbd36 SHA1 5aa4777dfc27c71f563eb7247cf18dee4ac2236f SHA256 5bf8eb98c99466f0cb8a5f6cf444116840f4b2b839c190284c2caaa15010d43c -MISC ChangeLog 1559 RMD160 4cabce8eb85fcdeb78b771bad68ef7ac27274326 SHA1 84494721557ba51f11501479f6f350d87df7394f SHA256 f38302486227327603866ef01f812c85db84f357e0172c5bb7211ffaf6714ef0 +MISC ChangeLog 1820 RMD160 ba4c2380e1a1e63ab6594c0e6383a121b2d4789e SHA1 e3ca13ff06be86365970323ed4f99fac7e74c153 SHA256 defdf631218213f8bd2558423592793a1a14436f9f4ba4279e4a31f0df4d8213 MISC metadata.xml 897 RMD160 59e6eddca113690915fb17277d4ed3125f7599f2 SHA1 5e114681013e6ede57ecc30814b40e91948ce3d8 SHA256 82b3c21f6c5fb6b66310dc663f6bdd3ad3ca2b0e1d70ee056ce48eb92ef747ed diff --git a/dev-games/crystalspace/crystalspace-2.0_beta3-r2.ebuild b/dev-games/crystalspace/crystalspace-2.0_beta3-r3.ebuild index 2c10114..0b8c5c1 100644 --- a/dev-games/crystalspace/crystalspace-2.0_beta3-r2.ebuild +++ b/dev-games/crystalspace/crystalspace-2.0_beta3-r3.ebuild @@ -139,6 +139,9 @@ src_compile() { jam -q ${jamopts} staticplugins \ || die "staticplugins compile failed (jam -q ${jamopts})" fi + + # No cs-config-2.0 script is ready, but contains some defects that are to be patched away: + epatch epatch "${FILESDIR}"/${MY_P}-cs-config.patch } src_install() { @@ -168,7 +171,7 @@ src_install() { echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${MY_P}" > 90crystalspace echo "CRYSTAL_CONFIG=/etc/${MY_P}" >> 90crystalspace - # "CRYSTAL" seems to be an env var that is now important, althoug it + # "CRYSTAL" seems to be an env var that is now important, although it # existed already in CS-1.4 and was never actually needed for CS to # work properly echo "CRYSTAL=/usr/share/${MY_P}" >> 90crystalspace @@ -177,12 +180,6 @@ src_install() { # Applications that do not read CRYSTAL_CONFIG need vfs.cfg in $CRYSTAL: dosym /etc/${MY_P}/vfs.cfg /usr/share/${MY_P}/vfs.cfg - # Applications that do not read CRYSTAL_PLUGIN need the libdir in CRYSTAL# + # Applications that do not read CRYSTAL_PLUGIN need the libdir in $CRYSTAL: dosym /usr/$(get_libdir)/${MY_P} /usr/share/${MY_P}/libs - - # Actually cs-config is too stupid to gather that the PREFIX is /usr and - # assumes it it /usr/share/crystalspace-2.0. We therefore need to link - # the location of the libcrystalspace*.so libaries to lib: - dosym /usr/$(get_libdir) /usr/share/${MY_P}/lib - } diff --git a/dev-games/crystalspace/files/crystalspace-2.0-cs-config.patch b/dev-games/crystalspace/files/crystalspace-2.0-cs-config.patch new file mode 100644 index 0000000..060eaa7 --- /dev/null +++ b/dev-games/crystalspace/files/crystalspace-2.0-cs-config.patch @@ -0,0 +1,54 @@ +--- cs-config-2.0 2012-04-20 15:46:07.652756874 +0200 ++++ cs-config-2.0 2012-04-20 16:00:40.872802423 +0200 +@@ -91,7 +91,7 @@ + then + includedir="/usr/include/crystalspace-2.0" + fi +-syslibs=" -lc -lm -ldl -lnsl -L/usr/local/lib " ++syslibs=" -lc -lm -ldl -lnsl " + common_cflags=" " + common_cxxflags=" " + staticdeps="crystalspace_staticplugins.jam" +@@ -106,7 +106,7 @@ + EXE= + DLL=.so + LIBS.EXE.PLATFORM=-ldl -lm -lnsl +-LFLAGS.GENERAL=$(LFLAGS.L)/usr/local/lib -lpthread ++LFLAGS.GENERAL=$(LFLAGS.L)/usr/lib -lpthread + LFLAGS.DLL=-shared -Wl,-soname -Wl,$@ + + __EOF__ +@@ -156,14 +156,12 @@ + esac + } + +-liblist=" crystalspace crystalspace_opengl +-" +-liblist_opt=" crystalspace_staticplugins +-" ++liblist=" crystalspace crystalspace_opengl" ++liblist_opt=" crystalspace_staticplugins" + + libcrystalspace=crystalspace-2.0 +- libcrystalspace_opengl=crystalspace_opengl-2.0 +- libcrystalspace_staticplugins=crystalspace_staticplugins-2.0 ++libcrystalspace_opengl=crystalspace_opengl-2.0 ++libcrystalspace_staticplugins=crystalspace_staticplugins-2.0 + + + +@@ -223,6 +221,14 @@ + fi + done + ++# Patch: On Gentoo they are always there: ++if test "x$lflags" = "x" ++then ++ libdir="/usr/lib" ++ lflags="-L$libdir" ++fi ++ ++ + # Look for build tools such as relaytool + tools_sentinel=relaytool + if test -x "$prefix/bin/$tools_sentinel" ; then |