From 14c227cb6791a96b7ad0d6ee86860964fcefa4af Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 8 Jun 2006 09:41:13 +0000 Subject: [PATCH] Rename include file so it doesnt get compiled in #134632 by Martin Wegner. Package-Manager: portage-2.1_rc4-r3 --- media-libs/libsdl/ChangeLog | 6 ++++- media-libs/libsdl/Manifest | 22 +++++++++---------- .../libsdl-1.2.10-PIC-hidden-symbols.patch | 14 ++++++------ 3 files changed, 23 insertions(+), 19 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 + 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; +files/libsdl-1.2.10-noxinerama.patch, libsdl-1.2.10.ebuild: diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index ead0f8ec62e2..bced242376fb 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -45,10 +45,10 @@ AUX 1.2.8-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 SH MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 files/1.2.8-nobuggy-X.patch 568 SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 files/1.2.8-nobuggy-X.patch 568 -AUX libsdl-1.2.10-PIC-hidden-symbols.patch 4247 RMD160 4b69adf31eb690619a2b05cf41cc89dcf56a66e5 SHA1 37b98876ba283d60388f3fd585f1bf6c96ff8641 SHA256 ebddb80f6a0b0c627d74dabf2832bc64ed8c0705959cad92087184782bc359c4 -MD5 09d2bf66d15fd0b252d67aa1ed0630d2 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 -RMD160 4b69adf31eb690619a2b05cf41cc89dcf56a66e5 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 -SHA256 ebddb80f6a0b0c627d74dabf2832bc64ed8c0705959cad92087184782bc359c4 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +AUX libsdl-1.2.10-PIC-hidden-symbols.patch 4247 RMD160 ce62f2854d41e19e654839efce9d4cacdbc23809 SHA1 0eda54e3e10f3fbbc2e18a51f4fa9f40c26ff598 SHA256 3cc7a3a2c9cec382c85fb1f29c9c2ab8755b74ffcd93c18103a7ced88a0f6ba6 +MD5 8d510e693969c21c088d25d3f157e2c9 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +RMD160 ce62f2854d41e19e654839efce9d4cacdbc23809 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +SHA256 3cc7a3a2c9cec382c85fb1f29c9c2ab8755b74ffcd93c18103a7ced88a0f6ba6 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 AUX libsdl-1.2.10-libcaca.patch 17034 RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815dfa01 SHA1 cf8e09994ecaa919955ce92198ef5a7b6899bed6 SHA256 930bda73223f4d00dd979ae2b7dd86c51ae57a310ec3a4d5e97dbac452d8e3a0 MD5 5110a1432def77889f6f88fae64e2c9d files/libsdl-1.2.10-libcaca.patch 17034 RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815dfa01 files/libsdl-1.2.10-libcaca.patch 17034 @@ -149,10 +149,10 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643 -MISC ChangeLog 16320 RMD160 fcc6e9970f626eac425ae36a407ad3389bed23f0 SHA1 0584ad704ef1ec600b7030e4145ead3dd0df0a0e SHA256 30482832514bda3775d249ab451131132fa4d86c0d18c667dbba2360d96c5299 -MD5 5b463c791448dd67ab2281b817a5287f ChangeLog 16320 -RMD160 fcc6e9970f626eac425ae36a407ad3389bed23f0 ChangeLog 16320 -SHA256 30482832514bda3775d249ab451131132fa4d86c0d18c667dbba2360d96c5299 ChangeLog 16320 +MISC ChangeLog 16496 RMD160 8d70d4ba07a8d17739f0e7ac8226e292eabddacc SHA1 ca2c818d368e00bb4cfde7e9fd11bb45e198b7ee SHA256 340140b16133f7e71d061571e7ceed11f78212b58b71e2a846a8d781b8201937 +MD5 91fd6c8f7ae4546b06f339108b9ea6b2 ChangeLog 16496 +RMD160 8d70d4ba07a8d17739f0e7ac8226e292eabddacc ChangeLog 16496 +SHA256 340140b16133f7e71d061571e7ceed11f78212b58b71e2a846a8d781b8201937 ChangeLog 16496 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974 @@ -175,7 +175,7 @@ SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEe0Qt2CTtIKiFlQIRAszTAJ9lJE3XFTkWUKmW2DXpPSmvK9qF0ACfZHMs -c9eduurg0KeZ6Lcx1OCguO8= -=yJuT +iD8DBQFEh/Gt2+ySkm8kpY0RAvcwAKCYEFNpncwpktahV7cKHodfAuNZXgCgxEWe +G2rjF5thUTNVuFoWMfZrM0U= +=imzL -----END PGP SIGNATURE----- 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 + -- 2.26.2