diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-18 18:17:11 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-18 18:17:11 +0000 |
commit | f68335bfacf5a569fe9fdf312308b8b61c833f16 (patch) | |
tree | 593c34faa7208df4d3fcc45c976d8528eddd0cce /dev-games | |
parent | Marked stable for amd64 wrt bug #452700 (diff) | |
download | gentoo-2-f68335bfacf5a569fe9fdf312308b8b61c833f16.tar.gz gentoo-2-f68335bfacf5a569fe9fdf312308b8b61c833f16.tar.bz2 gentoo-2-f68335bfacf5a569fe9fdf312308b8b61c833f16.zip |
old
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-games')
-rw-r--r-- | dev-games/vamos/ChangeLog | 7 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.6.2-as-needed.patch | 12 | ||||
-rw-r--r-- | dev-games/vamos/files/vamos-0.6.2-libpng15.patch | 23 | ||||
-rw-r--r-- | dev-games/vamos/vamos-0.6.2.ebuild | 48 |
4 files changed, 6 insertions, 84 deletions
diff --git a/dev-games/vamos/ChangeLog b/dev-games/vamos/ChangeLog index 84e6584bd845..a59248bfc81c 100644 --- a/dev-games/vamos/ChangeLog +++ b/dev-games/vamos/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-games/vamos # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.20 2013/01/13 11:22:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.21 2013/01/18 18:17:11 mr_bones_ Exp $ + + 18 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> + -files/vamos-0.6.2-as-needed.patch, -files/vamos-0.6.2-libpng15.patch, + -vamos-0.6.2.ebuild: + old 13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> vamos-0.7.0.ebuild: Stable for x86, wrt bug #449934 diff --git a/dev-games/vamos/files/vamos-0.6.2-as-needed.patch b/dev-games/vamos/files/vamos-0.6.2-as-needed.patch deleted file mode 100644 index f84547cd2248..000000000000 --- a/dev-games/vamos/files/vamos-0.6.2-as-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru vamos-0.6.2.orig/media/Makefile.in vamos-0.6.2/media/Makefile.in ---- vamos-0.6.2.orig/media/Makefile.in 2009-06-12 21:38:13.000000000 -0400 -+++ vamos-0.6.2/media/Makefile.in 2009-10-12 13:42:26.483990624 -0400 -@@ -174,7 +174,7 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - - libvamos_media_la_LDFLAGS = --libvamos_media_la_LIBADD = -+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la - am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \ - XML_Parser.lo - libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS) diff --git a/dev-games/vamos/files/vamos-0.6.2-libpng15.patch b/dev-games/vamos/files/vamos-0.6.2-libpng15.patch deleted file mode 100644 index 19a564c99fef..000000000000 --- a/dev-games/vamos/files/vamos-0.6.2-libpng15.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- media/Texture_Image.cc -+++ media/Texture_Image.cc -@@ -162,15 +162,15 @@ - - png_bytep* row_pointers = png_get_rows (png_ptr, info_ptr); - -- m_width_pixels = info_ptr->width; -- m_height_pixels = info_ptr->height; -- m_channels = info_ptr->channels; -- size_t row_size = info_ptr->width * info_ptr->channels; -+ m_width_pixels = png_get_image_width(png_ptr, info_ptr); -+ m_height_pixels = png_get_image_height(png_ptr, info_ptr); -+ m_channels = png_get_channels(png_ptr, info_ptr); -+ size_t row_size = png_get_image_width(png_ptr, info_ptr) * png_get_channels(png_ptr, info_ptr); - - size_t data_size = row_size * m_height_pixels; - unsigned char* data = new unsigned char [data_size]; - -- for (size_t i = 0; i < info_ptr->height; i++) -+ for (size_t i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) - { - for (size_t j = 0; j < row_size; j++) - { diff --git a/dev-games/vamos/vamos-0.6.2.ebuild b/dev-games/vamos/vamos-0.6.2.ebuild deleted file mode 100644 index 27bb49a97176..000000000000 --- a/dev-games/vamos/vamos-0.6.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.8 2012/05/03 06:35:31 jdhore Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="an automotive simulation framework" -HOMEPAGE="http://vamos.sourceforge.net/" -SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="static-libs" - -RDEPEND="virtual/opengl - media-libs/freeglut - media-libs/libpng - media-libs/libsdl[joystick,video] - media-libs/openal - media-libs/freealut" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}"/${P}-libpng15.patch -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - --disable-unit-tests \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dobin caelum/.libs/caelum || die "dobin failed" - newdoc caelum/README README.caelum - dodoc AUTHORS ChangeLog README TODO - if ! use static-libs ; then - find "${D}" -type f -name '*.la' -exec rm {} + \ - || die "la removal failed" - fi -} |