diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-06-08 09:41:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-08 09:41:13 +0000 |
| commit | a27b312644bf5cb42996473519018eabf018eac2 (patch) | |
| tree | cb8c165aed5845f93f50343867d5838448eb1c53 | |
| parent | version bump bug #134902 (diff) | |
| download | gentoo-2-a27b312644bf5cb42996473519018eabf018eac2.tar.gz gentoo-2-a27b312644bf5cb42996473519018eabf018eac2.tar.bz2 gentoo-2-a27b312644bf5cb42996473519018eabf018eac2.zip | |
Rename include file so it doesnt get compiled in #134632 by Martin Wegner.
(Portage version: 2.1_rc4-r3)
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index a3fb65c5b329..38061eaf03ad 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # 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.102 2006/05/29 18:57:34 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.103 2006/06/08 09:41:13 vapier Exp $ + + 08 Jun 2006; Mike Frysinger <vapier@gentoo.org> + files/libsdl-1.2.10-PIC-hidden-symbols.patch: + Rename include file so it doesnt get compiled in #134632 by Martin Wegner. 29 May 2006; <Tupone@gentoo.org> +files/libsdl-1.2.10-noxinerama.patch, libsdl-1.2.10.ebuild: diff --git a/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch b/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch index 857fc6591aa3..c5df94327fd4 100644 --- a/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch +++ b/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch @@ -46,7 +46,7 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html -GLOBAL _ConvertMMX -GLOBAL _mmxreturn -+%include "common.asm" ++%include "common.inc" + +SDL_FUNC _ConvertMMX +SDL_FUNC _mmxreturn @@ -59,7 +59,7 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html BITS 32 -+%include "common.asm" ++%include "common.inc" -GLOBAL _ConvertMMXpII32_24RGB888 -GLOBAL _ConvertMMXpII32_16RGB565 @@ -82,7 +82,7 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html -GLOBAL _ConvertX86 -GLOBAL _x86return -+%include "common.asm" ++%include "common.inc" + +SDL_FUNC _ConvertX86 +SDL_FUNC _x86return @@ -111,7 +111,7 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html -GLOBAL _ConvertX86p16_16RGB555 -GLOBAL _ConvertX86p16_16BGR555 -GLOBAL _ConvertX86p16_8RGB332 -+%include "common.asm" ++%include "common.inc" + +SDL_FUNC _ConvertX86p16_16BGR565 +SDL_FUNC _ConvertX86p16_16RGB555 @@ -139,7 +139,7 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html -GLOBAL _ConvertX86p32_16RGB555 -GLOBAL _ConvertX86p32_16BGR555 -GLOBAL _ConvertX86p32_8RGB332 -+%include "common.asm" ++%include "common.inc" + +SDL_FUNC _ConvertX86p32_32BGR888 +SDL_FUNC _ConvertX86p32_32RGBA888 @@ -154,8 +154,8 @@ http://www.libsdl.org/pipermail/sdl/2006-March/073618.html EXTERN _x86return ---- src/hermes/common.asm -+++ src/hermes/common.asm +--- src/hermes/common.inc ++++ src/hermes/common.inc @@ -0,0 +1,9 @@ +; Some common macros for hermes nasm code + |