[89205] trunk/dports/devel/libsdl
jmr at macports.org
jmr at macports.org
Fri Jan 20 22:39:08 PST 2012
Revision: 89205
http://trac.macports.org/changeset/89205
Author: jmr at macports.org
Date: 2012-01-20 22:39:05 -0800 (Fri, 20 Jan 2012)
Log Message:
-----------
libsdl: update to 1.2.15 (fixes crash on Lion, #30478)
Modified Paths:
--------------
trunk/dports/devel/libsdl/Portfile
Removed Paths:
-------------
trunk/dports/devel/libsdl/files/cpuinfo.diff
trunk/dports/devel/libsdl/files/mmx.h.diff
trunk/dports/devel/libsdl/files/patch-SDL_x11gl_c.h.diff
Modified: trunk/dports/devel/libsdl/Portfile
===================================================================
--- trunk/dports/devel/libsdl/Portfile 2012-01-21 05:31:10 UTC (rev 89204)
+++ trunk/dports/devel/libsdl/Portfile 2012-01-21 06:39:05 UTC (rev 89205)
@@ -8,8 +8,7 @@
name libsdl
set my_name SDL
-version 1.2.14
-revision 9
+version 1.2.15
categories devel multimedia
platforms macosx freebsd
license LGPL-2.1+
@@ -24,13 +23,11 @@
DirectMedia Layer supports Linux, Win32, BeOS, Mac OS, Solaris, IRIX, and FreeBSD.
homepage http://www.libsdl.org/
-master_sites http://www.libsdl.org/release/
-dist_subdir ${name}/${version}_8
+master_sites ${homepage}release/
distname ${my_name}-${version}
-checksums md5 e52086d1b508fa0b76c52ee30b55bec4 \
- sha1 ba625b4b404589b97e92d7acd165992debe576dd \
- rmd160 a3a9a691f5510eb5327ca159a034f55a70cb5801
+checksums rmd160 d4802a090cb4a24eeb0c8ce5690802f596d394c3 \
+ sha256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
minimum_xcodeversions {8 2.4.1}
if {[vercmp $xcodeversion 4.2] >= 0 && [vercmp $xcodeversion 4.2.1] <= 0 && ($build_arch == "i386" || [variant_isset universal])} {
@@ -38,28 +35,18 @@
configure.optflags -Os
}
-patchfiles cpuinfo.diff patch-SDL_x11gl_c.h.diff mmx.h.diff
-
-configure.args --enable-shared \
- --mandir=${prefix}/share/man \
- --disable-nasm \
+configure.args --disable-nasm \
--without-x
variant x11 conflicts no_x11 {
configure.args-delete --without-x
- configure.args-append --x-include=${prefix}/include \
- --x-lib=${prefix}/lib
+ configure.args-append --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --disable-x11-shared
depends_lib-append \
port:xorg-libXext \
port:xorg-libXrandr \
port:xrender
-
- post-configure {
- foreach lib {libX11.6 libXext.6 libXrandr.2 libXrender.1} {
- reinplace "/${lib}.dylib/s|\".*\"|\"${prefix}/lib/${lib}.dylib\"|" \
- ${worksrcpath}/include/SDL_config.h
- }
- }
}
variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
if {[variant_isset no_x11]} {
@@ -68,15 +55,14 @@
default_variants +x11
}
-use_parallel_build yes
-
post-configure {
- # not just for universal, ppc endianness detection is also broken
- system "cd ${worksrcpath} && ed - ./include/SDL_config.h < ${filespath}/include_SDL_config.h.ed"
+ if {[variant_isset universal]} {
+ system -W ${worksrcpath}/include "ed - ./SDL_config.h < ${filespath}/include_SDL_config.h.ed"
+ }
}
post-destroot {
- set docdir ${prefix}/share/doc/${name}-${version}
+ set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}/html
Deleted: trunk/dports/devel/libsdl/files/cpuinfo.diff
===================================================================
--- trunk/dports/devel/libsdl/files/cpuinfo.diff 2012-01-21 05:31:10 UTC (rev 89204)
+++ trunk/dports/devel/libsdl/files/cpuinfo.diff 2012-01-21 06:39:05 UTC (rev 89205)
@@ -1,193 +0,0 @@
-Upstream changesets:
-ca91f36ef3def70a02eefd8d3920439409fee3d0
-dcb26ac38e6bb206589d711916ab02701223c651
-72d3b4fd918b661a06e237b1b9e2dcb2b72e9ed4
-
---- src/cpuinfo/SDL_cpuinfo.c.orig 2009-10-13 10:07:14.000000000 +1100
-+++ src/cpuinfo/SDL_cpuinfo.c 2011-05-11 12:36:25.000000000 +1000
-@@ -26,7 +26,7 @@
- #include "SDL.h"
- #include "SDL_cpuinfo.h"
-
--#if defined(__MACOSX__) && defined(__ppc__)
-+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
- #include <sys/sysctl.h> /* For AltiVec check */
- #elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
- #include <signal.h>
-@@ -148,67 +148,77 @@ static __inline__ int CPU_getCPUIDFeatur
- int features = 0;
- #if defined(__GNUC__) && defined(i386)
- __asm__ (
--" movl %%ebx,%%edi\n"
- " xorl %%eax,%%eax # Set up for CPUID instruction \n"
-+" pushl %%ebx \n"
- " cpuid # Get and save vendor ID \n"
-+" popl %%ebx \n"
- " cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
- " jl 1f # We dont have the CPUID instruction\n"
- " xorl %%eax,%%eax \n"
- " incl %%eax \n"
-+" pushl %%ebx \n"
- " cpuid # Get family/model/stepping/features\n"
-+" popl %%ebx \n"
- " movl %%edx,%0 \n"
- "1: \n"
--" movl %%edi,%%ebx\n"
- : "=m" (features)
- :
-- : "%eax", "%ecx", "%edx", "%edi"
-+ : "%eax", "%ecx", "%edx"
- );
- #elif defined(__GNUC__) && defined(__x86_64__)
- __asm__ (
--" movq %%rbx,%%rdi\n"
- " xorl %%eax,%%eax # Set up for CPUID instruction \n"
-+" pushq %%rbx \n"
- " cpuid # Get and save vendor ID \n"
-+" popq %%rbx \n"
- " cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
- " jl 1f # We dont have the CPUID instruction\n"
- " xorl %%eax,%%eax \n"
- " incl %%eax \n"
-+" pushq %%rbx \n"
- " cpuid # Get family/model/stepping/features\n"
-+" popq %%rbx \n"
- " movl %%edx,%0 \n"
- "1: \n"
--" movq %%rdi,%%rbx\n"
- : "=m" (features)
- :
-- : "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
-+ : "%rax", "%rcx", "%rdx"
- );
- #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
- __asm {
- xor eax, eax ; Set up for CPUID instruction
-+ push ebx
- cpuid ; Get and save vendor ID
-+ pop ebx
- cmp eax, 1 ; Make sure 1 is valid input for CPUID
- jl done ; We dont have the CPUID instruction
- xor eax, eax
- inc eax
-+ push ebx
- cpuid ; Get family/model/stepping/features
-+ pop ebx
- mov features, edx
- done:
- }
- #elif defined(__sun) && (defined(__i386) || defined(__amd64))
- __asm(
--" movl %ebx,%edi\n"
- " xorl %eax,%eax \n"
-+" pushl %ebx \n"
- " cpuid \n"
-+" popl %ebx \n"
- " cmpl $1,%eax \n"
- " jl 1f \n"
- " xorl %eax,%eax \n"
- " incl %eax \n"
-+" pushl %ebx \n"
- " cpuid \n"
-+" popl %ebx \n"
- #ifdef __i386
- " movl %edx,-8(%ebp) \n"
- #else
- " movl %edx,-8(%rbp) \n"
- #endif
- "1: \n"
--" movl %edi,%ebx\n" );
- #endif
- return features;
- }
-@@ -218,63 +228,73 @@ static __inline__ int CPU_getCPUIDFeatur
- int features = 0;
- #if defined(__GNUC__) && defined(i386)
- __asm__ (
--" movl %%ebx,%%edi\n"
- " movl $0x80000000,%%eax # Query for extended functions \n"
-+" pushl %%ebx \n"
- " cpuid # Get extended function limit \n"
-+" popl %%ebx \n"
- " cmpl $0x80000001,%%eax \n"
- " jl 1f # Nope, we dont have function 800000001h\n"
- " movl $0x80000001,%%eax # Setup extended function 800000001h\n"
-+" pushl %%ebx \n"
- " cpuid # and get the information \n"
-+" popl %%ebx \n"
- " movl %%edx,%0 \n"
- "1: \n"
--" movl %%edi,%%ebx\n"
- : "=m" (features)
- :
-- : "%eax", "%ecx", "%edx", "%edi"
-+ : "%eax", "%ecx", "%edx"
- );
- #elif defined(__GNUC__) && defined (__x86_64__)
- __asm__ (
--" movq %%rbx,%%rdi\n"
- " movl $0x80000000,%%eax # Query for extended functions \n"
-+" pushq %%rbx \n"
- " cpuid # Get extended function limit \n"
-+" popq %%rbx \n"
- " cmpl $0x80000001,%%eax \n"
- " jl 1f # Nope, we dont have function 800000001h\n"
- " movl $0x80000001,%%eax # Setup extended function 800000001h\n"
-+" pushq %%rbx \n"
- " cpuid # and get the information \n"
-+" popq %%rbx \n"
- " movl %%edx,%0 \n"
- "1: \n"
--" movq %%rdi,%%rbx\n"
- : "=m" (features)
- :
-- : "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
-+ : "%rax", "%rcx", "%rdx"
- );
- #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
- __asm {
- mov eax,80000000h ; Query for extended functions
-+ push ebx
- cpuid ; Get extended function limit
-+ pop ebx
- cmp eax,80000001h
- jl done ; Nope, we dont have function 800000001h
- mov eax,80000001h ; Setup extended function 800000001h
-+ push ebx
- cpuid ; and get the information
-+ pop ebx
- mov features,edx
- done:
- }
- #elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
- __asm (
--" movl %ebx,%edi\n"
- " movl $0x80000000,%eax \n"
-+" pushl %ebx \n"
- " cpuid \n"
-+" popl %ebx \n"
- " cmpl $0x80000001,%eax \n"
- " jl 1f \n"
- " movl $0x80000001,%eax \n"
-+" pushl %ebx \n"
- " cpuid \n"
-+" popl %ebx \n"
- #ifdef __i386
- " movl %edx,-8(%ebp) \n"
- #else
- " movl %edx,-8(%rbp) \n"
- #endif
- "1: \n"
--" movl %edi,%ebx\n"
- );
- #endif
- return features;
-@@ -339,7 +359,7 @@ static __inline__ int CPU_haveSSE2(void)
- static __inline__ int CPU_haveAltiVec(void)
- {
- volatile int altivec = 0;
--#if defined(__MACOSX__) && defined(__ppc__)
-+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
- int selectors[2] = { CTL_HW, HW_VECTORUNIT };
- int hasVectorUnit = 0;
- size_t length = sizeof(hasVectorUnit);
Deleted: trunk/dports/devel/libsdl/files/mmx.h.diff
===================================================================
--- trunk/dports/devel/libsdl/files/mmx.h.diff 2012-01-21 05:31:10 UTC (rev 89204)
+++ trunk/dports/devel/libsdl/files/mmx.h.diff 2012-01-21 06:39:05 UTC (rev 89205)
@@ -1,11 +0,0 @@
---- src/video/mmx.h Mon Feb 06 08:28:51 2006 +0000
-+++ src/video/mmx.h Sun Jan 30 13:38:57 2011 -0800
-@@ -355,7 +355,7 @@
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
Deleted: trunk/dports/devel/libsdl/files/patch-SDL_x11gl_c.h.diff
===================================================================
--- trunk/dports/devel/libsdl/files/patch-SDL_x11gl_c.h.diff 2012-01-21 05:31:10 UTC (rev 89204)
+++ trunk/dports/devel/libsdl/files/patch-SDL_x11gl_c.h.diff 2012-01-21 06:39:05 UTC (rev 89205)
@@ -1,10 +0,0 @@
---- src/video/x11/SDL_x11gl_c.h.orig 2007-12-31 15:48:13.000000000 +1100
-+++ src/video/x11/SDL_x11gl_c.h 2009-03-25 05:53:09.000000000 +1100
-@@ -23,6 +23,7 @@
-
- #if SDL_VIDEO_OPENGL_GLX
- #include <GL/glx.h>
-+#include <GL/glxtokens.h>
- #include "SDL_loadso.h"
- #endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120120/cd8e430b/attachment-0001.html>
More information about the macports-changes
mailing list