Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 396203 - games-strategy/wargus & games-engines/stratagus version bump to 2.2.6
Summary: games-strategy/wargus & games-engines/stratagus version bump to 2.2.6
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Games (show other bugs)
Hardware: All Linux
: Normal enhancement (vote)
Assignee: Gentoo Games
URL: https://launchpad.net/wargus/+announc...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-12-27 13:44 UTC by Russell Knighton
Modified: 2012-05-27 20:27 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
patch for wargus libpng 1.5 compatibility (wargus-2.2.6-libpng15.patch,1.21 KB, patch)
2012-01-03 16:25 UTC, Rafał Mużyło
Details | Diff
New ebuild for stratagus (stratagus-2.2.6.ebuild,1.66 KB, text/plain)
2012-05-20 08:38 UTC, Michał Górny
Details
New ebuild for wargus (wargus-2.2.6.ebuild,1.34 KB, text/plain)
2012-05-20 09:42 UTC, Michał Górny
Details
New (fixed) ebuild for stratagus (stratagus-2.2.6.ebuild,1.69 KB, text/plain)
2012-05-20 09:56 UTC, Michał Górny
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Russell Knighton 2011-12-27 13:44:04 UTC
As the subject says - new version released so this is a version bump request.

Reproducible: Always
Comment 1 Rafał Mużyło 2012-01-03 16:25:13 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
Comment 2 jannis 2012-01-03 18:45:36 UTC
(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 :)
Comment 3 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2012-05-18 17:54:40 UTC
Rafał, did you produce some ebuild in the meantime?
Comment 4 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2012-05-20 08:38:57 UTC
Created attachment 312327 [details]
New ebuild for stratagus
Comment 5 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2012-05-20 09:42:25 UTC
Created attachment 312333 [details]
New ebuild for wargus
Comment 6 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2012-05-20 09:44:05 UTC
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.
Comment 7 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2012-05-20 09:56:25 UTC
Created attachment 312335 [details]
New (fixed) ebuild for stratagus

(fixed install with USE=-doc)
Comment 8 Julian Ospald 2012-05-20 11:32:52 UTC
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
Comment 9 Julian Ospald 2012-05-23 17:08:26 UTC
build system patch is upstream

include this: http://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8279#CMakeLists.txt
Comment 10 Julian Ospald 2012-05-27 20:27:58 UTC
+*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