diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-23 12:27:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-23 12:27:12 +0000 |
| commit | e58d1aa981852db059b68428cb98c6c73141be71 (patch) | |
| tree | fcb6cabeddd681f8b3157c5cd87d0d2ee5194add /media-libs/libsdl | |
| parent | Version bump #130963 by Andrija Prcic / #146376 by Pacho Ramos. (diff) | |
| download | gentoo-2-e58d1aa981852db059b68428cb98c6c73141be71.tar.gz gentoo-2-e58d1aa981852db059b68428cb98c6c73141be71.tar.bz2 gentoo-2-e58d1aa981852db059b68428cb98c6c73141be71.zip | |
Add fix for #148186.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'media-libs/libsdl')
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch | 13 | ||||
| -rw-r--r-- | media-libs/libsdl/libsdl-1.2.11.ebuild | 35 |
3 files changed, 35 insertions, 20 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 2d405a113722..5f58fd645852 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.113 2006/09/18 21:34:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.114 2006/09/23 12:27:12 vapier Exp $ + + 23 Sep 2006; Mike Frysinger <vapier@gentoo.org> + +files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch, + libsdl-1.2.11.ebuild: + Add fix for #148186. 18 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> libsdl-1.2.11.ebuild: Stable on amd64 wrt bug #145470. diff --git a/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch b/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch new file mode 100644 index 000000000000..22695aa4d7fd --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/148186 + +--- src/video/SDL_blit_A.c ++++ src/video/SDL_blit_A.c +@@ -1621,7 +1621,7 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * in + + #if GCC_ASMBLIT + /* fast (as in MMX with prefetch) ARGB888->(A)RGB888 blending with pixel alpha */ +-inline static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info) ++static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info) + { + int width = info->d_width; + int height = info->d_height; diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild index 85a71804ee89..47c64aeca2bb 100644 --- a/media-libs/libsdl/libsdl-1.2.11.ebuild +++ b/media-libs/libsdl/libsdl-1.2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.12 2006/09/18 21:34:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.13 2006/09/23 12:27:12 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils libtool @@ -24,17 +24,15 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 ) arts? ( kde-base/arts ) nas? ( media-libs/nas - || ( ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 ) - virtual/x11 ) ) + x11-libs/libXt + x11-libs/libXext + x11-libs/libX11 + ) X? ( - || ( ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 ) - virtual/x11 ) ) + x11-libs/libXt + x11-libs/libXext + x11-libs/libX11 + ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) @@ -43,15 +41,13 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 ) opengl? ( virtual/opengl )" DEPEND="${RDEPEND} nas? ( - || ( ( - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) ) + x11-proto/xextproto + x11-proto/xproto + ) X? ( - || ( ( - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) ) + x11-proto/xextproto + x11-proto/xproto + ) x86? ( dev-lang/nasm )" S=${WORKDIR}/SDL-${PV} @@ -79,6 +75,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-libcaca.patch #40224 epatch "${FILESDIR}"/${P}-sdl-config.patch epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917 + epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186 # add yasm-compatible defines to nasm code (hopefully we # can get this killed soonish) |