public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* SDL updated to 1.2.8.

Browse Source 
svn path=/nixpkgs/trunk/; revision=3315
This commit is contained in:
Eelco Dolstra 2005-07-12 11:28:43 +00:00
parent 3e32488049
commit 0fc44c5e5e
3 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/SDL/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, x11}: {stdenv, fetchurl, x11}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "SDL-1.2.7"; name = "SDL-1.2.8";
src = fetchurl { src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/SDL-1.2.7.tar.gz; url = http://www.libsdl.org/release/SDL-1.2.8.tar.gz;
md5 = "d29b34b6ba3ed213893fc9d8d35e357a"; md5 = "37aaf9f069f9c2c18856022f35de9f8c";
}; };
buildInputs = [x11]; buildInputs = [x11];
patches = [./gcc-3.4.patch]; patches = [./no-cxx.patch];
} }

37
pkgs/development/libraries/SDL/gcc-3.4.patch
View File

@ -1,37 +0,0 @@
diff -rc SDL-orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c
*** SDL-orig/src/cpuinfo/SDL_cpuinfo.c 2004-02-10 16:31:35.000000000 +0100
--- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c 2004-09-26 18:49:50.000000000 +0200
***************
*** 118,124 ****
" movl %%edi,%%ebx\n"
: "=m" (features)
:
! : "%eax", "%ebx", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER)
__asm {
--- 118,124 ----
" movl %%edi,%%ebx\n"
: "=m" (features)
:
! : "%eax", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER)
__asm {
***************
*** 153,159 ****
" movl %%edi,%%ebx\n"
: "=m" (features)
:
! : "%eax", "%ebx", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER)
__asm {
--- 153,159 ----
" movl %%edi,%%ebx\n"
: "=m" (features)
:
! : "%eax", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER)
__asm {

21
pkgs/development/libraries/SDL/no-cxx.patch Normal file
View File

@ -0,0 +1,21 @@
diff -rc SDL-1.2.8-orig/src/main/Makefile.in SDL-1.2.8/src/main/Makefile.in
*** SDL-1.2.8-orig/src/main/Makefile.in 2004-12-13 10:04:02.000000000 +0100
--- SDL-1.2.8/src/main/Makefile.in 2005-07-12 13:24:19.000000000 +0200
***************
*** 411,417 ****
rm -f "$${dir}/so_locations"; \
done
libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES)
! $(CXXLINK) $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
--- 411,417 ----
rm -f "$${dir}/so_locations"; \
done
libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES)
! $(LINK) $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Only in SDL-1.2.8/src/main: Makefile.in~