pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/sms_sdl Don't hard-code use of x86 asm or li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/053f8afdc52a
branches:  trunk
changeset: 649074:053f8afdc52a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 31 15:26:46 2015 +0000

description:
Don't hard-code use of x86 asm or little endian, but properly detect
suppoprt for either.

diffstat:

 emulators/sms_sdl/Makefile                   |  12 +++++++++++-
 emulators/sms_sdl/distinfo                   |   4 +++-
 emulators/sms_sdl/patches/patch-makefile     |  14 ++++++++++++++
 emulators/sms_sdl/patches/patch-sdl_Makefile |  14 ++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diffs (75 lines):

diff -r ab3e453996d0 -r 053f8afdc52a emulators/sms_sdl/Makefile
--- a/emulators/sms_sdl/Makefile        Tue Mar 31 15:25:22 2015 +0000
+++ b/emulators/sms_sdl/Makefile        Tue Mar 31 15:26:46 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/08/21 16:20:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2015/03/31 15:26:46 joerg Exp $
 #
 
 DISTNAME=              sms_sdl-0.9.4a-r7.1-src
@@ -20,6 +20,16 @@
 LDFLAGS.DragonFly=     -lm
 LDFLAGS.SunOS+=                -lm
 
+.include "../../mk/endian.mk"
+
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+CFLAGS+=       -DX86_ASM
+.endif
+
+.if ${MACHINE_ENDIAN} == "little"
+CFLAGS+=       -DLSB_FIRST
+.endif
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/sdl/sms_sdl ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/sms_sdl
diff -r ab3e453996d0 -r 053f8afdc52a emulators/sms_sdl/distinfo
--- a/emulators/sms_sdl/distinfo        Tue Mar 31 15:25:22 2015 +0000
+++ b/emulators/sms_sdl/distinfo        Tue Mar 31 15:26:46 2015 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/06/17 18:53:26 minskim Exp $
+$NetBSD: distinfo,v 1.3 2015/03/31 15:26:46 joerg Exp $
 
 SHA1 (sms_sdl-0.9.4a-r7.1-src.zip) = 66147e5b9d69eca64924093ca26c580acf20c493
 RMD160 (sms_sdl-0.9.4a-r7.1-src.zip) = 98a7b6101a496f80b5c5b54231816d39a69e40f5
 Size (sms_sdl-0.9.4a-r7.1-src.zip) = 113154 bytes
 SHA1 (patch-aa) = 80a6ee341b8b3e4d5c92bcd42ef26164dac3e9f6
+SHA1 (patch-makefile) = 870393cc8b598af1f57bb78b63906988e28e78d5
+SHA1 (patch-sdl_Makefile) = 22e92498d263a443e6421b93c830bf6391fa74af
diff -r ab3e453996d0 -r 053f8afdc52a emulators/sms_sdl/patches/patch-makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/sms_sdl/patches/patch-makefile  Tue Mar 31 15:26:46 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-makefile,v 1.1 2015/03/31 15:26:46 joerg Exp $
+
+--- makefile.orig      2015-03-25 15:03:24.000000000 +0000
++++ makefile
+@@ -8,8 +8,7 @@ CC     =       gcc
+ AS    =       nasm -f coff
+ LDFLAGS       =       
+ FLAGS =       -I. -Icpu -Idos -Isound \
+-              -Werror -Wall \
+-              -O6 -mcpu=pentium -fomit-frame-pointer \
++              -Werror -Wall ${CFLAGS} \
+               -DLSB_FIRST -DX86_ASM
+ 
+ LIBS  =       -lalleg -laudio -lz
diff -r ab3e453996d0 -r 053f8afdc52a emulators/sms_sdl/patches/patch-sdl_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/sms_sdl/patches/patch-sdl_Makefile      Tue Mar 31 15:26:46 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-sdl_Makefile,v 1.1 2015/03/31 15:26:46 joerg Exp $
+
+--- sdl/Makefile.orig  2015-03-25 15:04:19.000000000 +0000
++++ sdl/Makefile
+@@ -12,8 +12,7 @@
+ NAME    = sms_sdl
+ 
+ CC        = gcc
+-CFLAGS    = `sdl-config --cflags` -O2
+-DEFINES   = -DLSB_FIRST -DX86_ASM
++CFLAGS    += `sdl-config --cflags`
+ INCLUDES  = -I. -I.. -I../cpu -I../sound
+ LIBS    = `sdl-config --libs`
+ 



Home | Main Index | Thread Index | Old Index