diff options
author | joerg <joerg> | 2006-06-28 15:56:10 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-06-28 15:56:10 +0000 |
commit | d9e4d7c76054fb7697f06431db3a47526bfa3817 (patch) | |
tree | fcfcef1b62d07a8d9349f27d5ea98dd09ae26369 /emulators | |
parent | 271bf50e3ad152822a97bb559fa28cb131f0287c (diff) | |
download | pkgsrc-d9e4d7c76054fb7697f06431db3a47526bfa3817.tar.gz |
Use nanosleep on DragonFly and fix C++ for GCC 3.4 (no passing of
function pointers to protected members).
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/palmosemulator/distinfo | 5 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ab | 17 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-aq | 22 |
3 files changed, 38 insertions, 6 deletions
diff --git a/emulators/palmosemulator/distinfo b/emulators/palmosemulator/distinfo index 8ced4cbcafb..010f16e5446 100644 --- a/emulators/palmosemulator/distinfo +++ b/emulators/palmosemulator/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/04/28 13:52:05 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/06/28 15:56:10 joerg Exp $ SHA1 (palmosemulator/emulator_src_3.5.tar.gz) = 2debd7690736397d0af41f7b2d482df65391fc65 RMD160 (palmosemulator/emulator_src_3.5.tar.gz) = fbb6761e4c43ecc9fb20d90d2ae0ec6ccf1c3f27 @@ -7,7 +7,7 @@ SHA1 (palmosemulator/emulator-skins-19.tar.gz) = 70b0497061d6877a4e3c6a378fa647c RMD160 (palmosemulator/emulator-skins-19.tar.gz) = 9b4e16f50b1d2b9ad9b17e3a104c34a983d0a4ba Size (palmosemulator/emulator-skins-19.tar.gz) = 2443913 bytes SHA1 (patch-aa) = eef35ce5c3d91bf56903bb48c0c78bd333591fcc -SHA1 (patch-ab) = 8e097f4c45ad9e5402a9d4019cfb86137ada9732 +SHA1 (patch-ab) = 061379a827d338e411e8ea53dc071cb668a6c524 SHA1 (patch-ac) = c00a821d390ab92b28a01a47e7934eed4261fe6f SHA1 (patch-ad) = 6ad0beceb03bed0f51383331715a160b16c04ffd SHA1 (patch-ae) = eff843f8603b14791d3363a13634fb482e996ee5 @@ -22,3 +22,4 @@ SHA1 (patch-am) = 2790c8b567a94d86bced52d59cf62b4448b62731 SHA1 (patch-an) = 93e326e3ab9f532d5bab1cc987c179e8337a823d SHA1 (patch-ao) = 9ace708f71d33802059db53c9242f0d89a77e4da SHA1 (patch-ap) = 7cb159b84f8ad0638c49285ea5140aae93623f96 +SHA1 (patch-aq) = f3d3a6bf278f71573fb7d45021305561c3dcc114 diff --git a/emulators/palmosemulator/patches/patch-ab b/emulators/palmosemulator/patches/patch-ab index 498fcd01671..f35495af59b 100644 --- a/emulators/palmosemulator/patches/patch-ab +++ b/emulators/palmosemulator/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.2 2003/01/05 03:31:25 dsainty Exp $ +$NetBSD: patch-ab,v 1.3 2006/06/28 15:56:10 joerg Exp $ Use the libjpeg package, instead of a local copy, and pass through the skins directory. --- BuildUnix/configure.orig Sat Nov 23 23:54:59 2002 +++ BuildUnix/configure Sun Nov 24 00:57:08 2002 -@@ -3180,6 +3180,11 @@ +@@ -3180,6 +3180,11 @@ case "$target" in THREAD_LIBS="-lpthread" ;; @@ -17,7 +17,16 @@ directory. *-nto*) THREAD_FLAGS="-D_REENTRANT -DPthreadDraftVersion=10" THREAD_LIBS="" -@@ -3598,7 +3603,7 @@ +@@ -3214,7 +3219,7 @@ case "$target" in + USE_SOLARIS_CPP="true" + ;; + +-*-freebsd*) ++*-freebsd*|*-dragonfly*) + THREAD_FLAGS="-pthread -D_THREAD_SAFE -D_REENTRANT -DPthreadDraftVersion=10" + THREAD_LIBS= + ;; +@@ -3598,7 +3603,7 @@ rm -f confcache save_LIBS="$LIBS" @@ -26,7 +35,7 @@ directory. ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -3853,6 +3858,7 @@ +@@ -3853,6 +3860,7 @@ s%@ALLOCA@%$ALLOCA%g s%@CXXCPP@%$CXXCPP%g s%@GLLIB@%$GLLIB%g s%@AR@%$AR%g diff --git a/emulators/palmosemulator/patches/patch-aq b/emulators/palmosemulator/patches/patch-aq new file mode 100644 index 00000000000..c1aeb8d5ec6 --- /dev/null +++ b/emulators/palmosemulator/patches/patch-aq @@ -0,0 +1,22 @@ +$NetBSD: patch-aq,v 1.1 2006/06/28 15:56:10 joerg Exp $ + +--- SrcShared/Hardware/EmRegs.h.orig 2006-06-28 14:35:52.000000000 +0000 ++++ SrcShared/Hardware/EmRegs.h +@@ -54,12 +54,17 @@ class EmRegs + uint32 start, int count); + + uint32 UnsupportedRead (emuptr address, int size); ++ public: + uint32 StdRead (emuptr address, int size); ++ ++ protected: + uint32 StdReadBE (emuptr address, int size); + uint32 ZeroRead (emuptr address, int size); + + void UnsupportedWrite (emuptr address, int size, uint32 value); ++ public: + void StdWrite (emuptr address, int size, uint32 value); ++ protected: + void StdWriteBE (emuptr address, int size, uint32 value); + void NullWrite (emuptr address, int size, uint32 value); + |