Summary: | games-strategy/wargus & games-engines/stratagus version bump to 2.2.6 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Russell Knighton <russell> |
Component: | [OLD] Games | Assignee: | Gentoo Games <games> |
Status: | RESOLVED FIXED | ||
Severity: | enhancement | CC: | kripton, mgorny, pq |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
URL: | https://launchpad.net/wargus/+announcement/9414 | ||
See Also: | https://launchpad.net/bugs/1001999 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
patch for wargus libpng 1.5 compatibility
New ebuild for stratagus New ebuild for wargus New (fixed) ebuild for stratagus |
Description
Russell Knighton
2011-12-27 13:44:04 UTC
Created attachment 297801 [details, diff]
patch for wargus libpng 1.5 compatibility
My summary judgment on this is "f this s".
But regardless:
- upstream gone from autotools to cmake (this means cmake-utils eclass)
- in stratagus
$(cmake-utils_use_with debug)
$(cmake-utils_use_enable doc)
$(cmake-utils_use_with bzip2)
$(cmake-utils_use_with mikmod)
$(cmake-utils_use_with mng)
$(cmake-utils_use_with theora)
$(cmake-utils_use_with vorbis oggvorbis)
-DENABLE_DEV=ON
should cover most (ENABLE_DEV, so it installs the header, alternatively, ebuild may simply copy it); haven't actually tested doc generation on stratagus; toluapp seems to be a new dep (on that note, I wonder if missing SONAME is a major or a minor problem);
- stratagus is libpng15 clean, but now wargus needs the attached patch
- cmake/modules/FindStratagus.cmake in stratagus clashes horribly with portage; ended up adding "-DSTRATAGUS=/usr/games/bin/stratagus" to mycmakeargs; beforehand, needed something like:
sed -i -e '/stratagus DESTINATION/s:games:games/bin:' CMakeLists.txt
for stratagus, otherwise gets installed as /usr/games/stratagus (desktop file points there too)
- build.sh is gone, all goes through wartool now, couldn't really test how to change that, but seems straightforward
(In reply to comment #1) > [...] Thanks for all your work. Hope you didn't re-engineer that patch, it was to be found at #395501 Looking forward to test an ebuild soon :) Rafał, did you produce some ebuild in the meantime? Created attachment 312327 [details]
New ebuild for stratagus
Created attachment 312333 [details]
New ebuild for wargus
To sum up: 1) the current libpng patch for wargus is fine, so I just updated reference in the ebuild; 2) I'd suggest splitting out wargus-data out of wargus ebuild. It would be a little cleaner that way; 3) the ebuilds I attached here work fine on amd64 (unlike those in gx86), 4) both ebuilds were committed to gamerlay as well. Created attachment 312335 [details]
New (fixed) ebuild for stratagus
(fixed install with USE=-doc)
I think libpng is missing the slot here. (unless it works for both and unless we don't need any headers) media-libs/libpng:0 build system patch is upstream include this: http://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8279#CMakeLists.txt +*stratagus-2.2.6 (27 May 2012) + + 27 May 2012; Julian Ospald <hasufell@gentoo.org> +stratagus-2.2.6.ebuild, + +files/stratagus-2.2.6-build.patch: + version bump wrt #396203 +*wargus-2.2.6 (27 May 2012) + + 27 May 2012; Julian Ospald <hasufell@gentoo.org> +wargus-2.2.6.ebuild, + +files/wargus-2.2.6-build.patch: + version bump wrt #396203 |