From 79fb5ccd885393a4e303ccd22989abb079f95780 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 27 Feb 2004 22:32:59 +0000 Subject: [PATCH] - updated for 1.2.7 Changed files: SDL-mmx-constraints.patch -> 1.2 SDL-no_rpath_in_sdl-config.patch -> 1.3 --- SDL-mmx-constraints.patch | 7 +++---- SDL-no_rpath_in_sdl-config.patch | 24 +++++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/SDL-mmx-constraints.patch b/SDL-mmx-constraints.patch index e4dc8e3..02aae36 100644 --- a/SDL-mmx-constraints.patch +++ b/SDL-mmx-constraints.patch @@ -1,5 +1,5 @@ ---- SDL-1.2.6/src/video/mmx.h.orig 2003-08-22 07:51:19.000000000 +0200 -+++ SDL-1.2.6/src/video/mmx.h 2003-11-09 13:49:35.270218296 +0100 +--- SDL-1.2.7/src/video/mmx.h.orig 2003-08-22 07:51:19.000000000 +0200 ++++ SDL-1.2.7/src/video/mmx.h 2003-11-09 13:49:35.270218296 +0100 @@ -246,15 +246,37 @@ printf(#op "_i2r(" #imm "=0x%08x%08x, ", \ mmx_trace.d[1], mmx_trace.d[0]); \ @@ -149,8 +149,7 @@ #define mmx_m2r(op, mem, reg) \ __asm__ __volatile__ (#op " %0, %%" #reg \ : /* nothing */ \ -- : "X" (mem)) -+ : "m" (mem)) + : "m" (mem)) + +/* 32 bits or less */ +#define mmx_r2m32(op, reg, mem) \ diff --git a/SDL-no_rpath_in_sdl-config.patch b/SDL-no_rpath_in_sdl-config.patch index 8b92a4c..06f401a 100644 --- a/SDL-no_rpath_in_sdl-config.patch +++ b/SDL-no_rpath_in_sdl-config.patch @@ -1,11 +1,17 @@ ---- SDL-1.2.4/sdl-config.in~ Thu Oct 10 17:46:46 2002 -+++ SDL-1.2.4/sdl-config.in Thu Oct 10 17:46:46 2002 -@@ -48,7 +48,7 @@ - echo $includes -I@includedir@/SDL @SDL_CFLAGS@ +--- SDL-1.2.7/sdl-config.in.orig 2004-02-18 18:21:55.000000000 +0100 ++++ SDL-1.2.7/sdl-config.in 2004-02-27 23:00:09.602808160 +0100 +@@ -51,12 +51,12 @@ + #echo $includes -I@includedir@/SDL @SDL_CFLAGS@ ;; - @ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@ --libs|--static-libs) --@ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" -+@ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@" - @ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@ - @ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@ ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" ++@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@" + @ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" ++@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@" + @ENABLE_STATIC_TRUE@ echo $libdirs @SDL_STATIC_LIBS@ @STATIC_SYSTEM_LIBS@ + @ENABLE_STATIC_TRUE@ ;; *) -- 2.44.0