1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

update to 3.1

PR:		26335
Submitted by:	    William Lloyd <wlloyd@galt.slap.net> (new maintainer)
This commit is contained in:
Michael Haro 2001-04-04 09:02:43 +00:00
parent 385d26eb0b
commit 4ee38fcfd8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=40831
11 changed files with 194 additions and 92 deletions

View File

@ -6,12 +6,13 @@
#
PORTNAME= pose
PORTVERSION= 3.0a6
PORTVERSION= 3.1
CATEGORIES= palm emulators
MASTER_SITES= http://www.palmos.com/dev/tech/tools/emulator/
DISTNAME= emulator_src_30a6
# DISTNAME= emulator_src_31
DISTFILES= emulator_src_31.tar.gz emulator_skins_16.tar.gz
MAINTAINER= ports@FreeBSD.org
MAINTAINER= wlloyd@slap.net
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
@ -24,7 +25,8 @@ CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
post-install:
${MKDIR} ${PREFIX}/share/pose
${INSTALL_DATA} "${WRKSRC}/../ROMTransfer/Source/ROM Transfer.prc" ${PREFIX}/share/pose
${INSTALL_DATA} "${WRKSRC}/../ROMTransfer/Source/ROM_Transfer.prc" ${PREFIX}/share/pose
@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
${CP} -Rp ${WRKDIR}/Skins_v1.6 ${PREFIX}/share/pose/skins
.include <bsd.port.mk>

View File

@ -1 +1,2 @@
MD5 (emulator_src_30a6.tar.gz) = 64076fe4b9a32745ef7e98715bb1002f
MD5 (emulator_src_31.tar.gz) = 7791c4d56d250f50bebdd8d443da596d
MD5 (emulator_skins_16.tar.gz) = cc577300c700b0cffeecda576a004913

View File

@ -1,23 +1,24 @@
--- configure.orig Wed Apr 19 20:27:38 2000
+++ configure Sat May 6 16:53:56 2000
@@ -1099,6 +1099,7 @@
--- configure.orig Thu Mar 29 10:43:55 2001
+++ configure Thu Mar 29 10:51:21 2001
@@ -3105,6 +3105,8 @@
*-freebsd*)
THREAD_FLAGS="-pthread -D_THREAD_SAFE -D_REENTRANT -DPthreadDraftVersion=10"
THREAD_LIBS=
+ POSER_CFLAGS="$POSER_CFLAGS $CFLAGS $FLAGS $_WARNINGS_CFLAGS"
+ POSER_CXXFLAGS="$POSER_CXXFLAGS $CFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
;;
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
+echo "HALLO, HALLO!!!!"
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@@ -3064,7 +3065,7 @@
*-bsdi4*)
@@ -3121,7 +3123,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lfltk -L$x_libraries -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
+LIBS="-lfltk -lGL -L$x_libraries -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3070 "configure"
#line 3127 "configure"
#include "confdefs.h"
@@ -3098,7 +3099,7 @@
@@ -3155,7 +3157,7 @@
#define $ac_tr_lib 1
EOF
@ -26,7 +27,7 @@
else
echo "$ac_t""no" 1>&6
@@ -3131,7 +3132,6 @@
@@ -3188,7 +3190,6 @@
@ -34,14 +35,3 @@
@@ -3150,8 +3150,8 @@
FLAGS="$FLAGS_COMMON $FLAGS_OPTIMIZE $FLAGS_PROFILE $FLAGS_PALM_PROFILE $FLAGS_DEBUG"
-POSER_CFLAGS="$POSER_CFLAGS $FLAGS $_WARNINGS_CFLAGS"
-POSER_CXXFLAGS="$POSER_CXXFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
+POSER_CFLAGS="$POSER_CFLAGS $CFLAGS $FLAGS $_WARNINGS_CFLAGS"
+POSER_CXXFLAGS="$POSER_CXXFLAGS $CFLAGS $FLAGS $_WARNINGS_CXXFLAGS"

View File

@ -1,13 +0,0 @@
--- ../SrcShared/EmulatorTypes.h.orig Wed Apr 19 20:27:35 2000
+++ ../SrcShared/EmulatorTypes.h Sat May 6 13:22:40 2000
@@ -442,10 +442,6 @@
#if PLATFORM_UNIX || PLATFORM_MAC
#include <sys/types.h>
#include <sys/socket.h> // socklen_t
-
- #if (defined(__svr4__) && defined(sun)) || defined (__FreeBSD__)
- typedef int socklen_t; // not defined in <sys/socket.h> on solaris or FreeBSD
- #endif
#else
typedef int socklen_t;
#endif

View File

@ -1,11 +0,0 @@
--- Makefile.am- Wed Apr 19 11:27:37 2000
+++ Makefile.am Mon Jun 19 02:48:11 2000
@@ -256,7 +256,7 @@
bin_PROGRAMS = pose
-pose_LDADD = -L/usr/lib -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
+pose_LDADD = -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
pose_LDADD += -L./Gzip -lposergzip
pose_LDADD += -L./jpeg -lposerjpeg

View File

@ -1,6 +1,6 @@
--- ../SrcUnix/EmTransportSerialUnix.cpp- Mon Jun 19 02:03:59 2000
+++ ../SrcUnix/EmTransportSerialUnix.cpp Mon Jun 19 02:16:39 2000
@@ -372,9 +372,9 @@
--- ../SrcUnix/EmTransportSerialUnix.cpp.orig Fri Mar 30 11:41:13 2001
+++ ../SrcUnix/EmTransportSerialUnix.cpp Fri Mar 30 11:47:36 2001
@@ -382,9 +382,9 @@
EmHostTransportSerial::EmHostTransportSerial (void) :
fReadThread (NULL),
fWriteThread (NULL),
@ -13,7 +13,7 @@
fTimeToQuit (false),
fDataMutex (),
fDataCondition (&fDataMutex),
@@ -402,9 +402,9 @@
@@ -412,9 +412,9 @@
{
assert (fReadThread == NULL);
assert (fWriteThread == NULL);
@ -26,7 +26,7 @@
}
@@ -440,7 +440,7 @@
@@ -450,7 +450,7 @@
if (fCommHandle <= 0)
{
@ -35,7 +35,7 @@
return errno;
}
@@ -470,7 +470,7 @@
@@ -480,7 +480,7 @@
ErrCode EmHostTransportSerial::CreateCommThreads (const EmTransportSerial::ConfigSerial& /*config*/)
{
@ -44,75 +44,81 @@
{
PRINTF ("EmTransportSerial::HostOpen: Creating serial port handler threads...");
@@ -510,35 +510,37 @@
{
@@ -525,35 +525,38 @@
// Signal the threads to quit.
- fDataMutex.lock ();
+ if ( fCommSignalPipeA != -1 && fCommSignalPipeB != -1 ) {
+ fDataMutex.lock ();
+ fDataMutex.lock ();
+
+ fTimeToQuit = true;
+
+ int dummy = 0;
+ write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
- fTimeToQuit = true;
+ fTimeToQuit = true;
+ fDataCondition.broadcast (); // Signals CommWrite.
+ fDataMutex.unlock ();
- int dummy = 0;
- write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
+ int dummy = 0;
+ write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
+ // Wait for the threads to quit.
- fDataCondition.broadcast (); // Signals CommWrite.
- fDataMutex.unlock ();
+ fDataCondition.broadcast (); // Signals CommWrite.
+ fDataMutex.unlock ();
-
- // Wait for the threads to quit.
+ // Wait for the threads to quit.
+ if (fReadThread)
+ {
+ fReadThread->join (NULL);
+ fWriteThread->join (NULL);
+ }
- if (fReadThread)
- {
- fReadThread->join (NULL);
- fWriteThread->join (NULL);
- }
+ if (fReadThread)
+ {
+ fReadThread->join (NULL);
+ fWriteThread->join (NULL);
+ }
+ // Thread objects delete themselves, so set our references to NULL.
- // Thread objects delete themselves, so set our references to NULL.
+ // Thread objects delete themselves, so set our references to NULL.
+ fReadThread = NULL;
+ fWriteThread = NULL;
- fReadThread = NULL;
- fWriteThread = NULL;
+ fReadThread = NULL;
+ fWriteThread = NULL;
+ // Close the signal pipe.
- // Close the signal pipe.
+ // Close the signal pipe.
+ close (fCommSignalPipeA);
+ close (fCommSignalPipeB);
- close (fCommSignalPipeA);
- close (fCommSignalPipeB);
+ close (fCommSignalPipeA);
+ close (fCommSignalPipeB);
+ fCommSignalPipeA = fCommSignalPipeB = 0;
- fCommSignalPipeA = fCommSignalPipeB = 0;
+ fCommSignalPipeA = fCommSignalPipeB = -1;
+ }
return errNone;
}
@@ -558,10 +560,11 @@
@@ -573,11 +576,13 @@
ErrCode EmHostTransportSerial::CloseCommPort (void)
{
- int result;
- result = close (fCommHandle);
+ if ( fCommHandle != -1 ) {
+ int result = close (fCommHandle);
- (void) close (fCommHandle);
-
- fCommHandle = 0;
+ fCommHandle = -1;
+ }
return errNone;
-
- return errNone;
+ if ( fCommHandle != -1 ) {
+ int result = close (fCommHandle);
+
+ fCommHandle = -1;
+ }
+
+ return errNone;
}

11
palm/pose/files/patch-af Normal file
View File

@ -0,0 +1,11 @@
--- ../SrcShared/Logging.h.orig Fri Mar 30 07:21:43 2001
+++ ../SrcShared/Logging.h Fri Mar 30 07:22:40 2001
@@ -18,7 +18,7 @@
#include "Miscellaneous.h" // StMemory
#include "PreferenceMgr.h" // FOR_EACH_PREF
#include "omnithread.h" // omni_mutex
-
+#include "stdarg.h" // FreeBSD
class EmStreamFile;

17
palm/pose/files/patch-ag Normal file
View File

@ -0,0 +1,17 @@
--- ../SrcShared/EmScreen.cpp.orig Fri Mar 30 07:45:11 2001
+++ ../SrcShared/EmScreen.cpp Fri Mar 30 07:50:48 2001
@@ -181,6 +181,14 @@
}
}
+Bool EmScreen::IsDirty ()
+{
+ if ( gScreenDirtyLow >= gScreenDirtyHigh )
+ {
+ return false;
+ }
+ return true;
+}
/***********************************************************************
*

11
palm/pose/files/patch-ah Normal file
View File

@ -0,0 +1,11 @@
--- ../SrcShared/EmScreen.h.orig Fri Mar 30 07:51:38 2001
+++ ../SrcShared/EmScreen.h Fri Mar 30 07:54:33 2001
@@ -50,6 +50,8 @@
static void Dispose (void);
static void MarkDirty (emuptr address, uint32 size);
+ static Bool IsDirty ();
+
static void InvalidateAll (void);
static Bool GetBits (EmScreenUpdateInfo&);

13
palm/pose/files/patch-ai Normal file
View File

@ -0,0 +1,13 @@
--- ../SrcUnix/fltk_LcdWindow.cpp.orig Fri Mar 30 08:41:10 2001
+++ ../SrcUnix/fltk_LcdWindow.cpp Fri Mar 30 08:44:49 2001
@@ -222,7 +222,9 @@
if (gSession)
{
- lcd->damageLcdArea ();
+ if ( EmScreen::IsDirty() ) {
+ lcd->damageLcdArea ();
+ }
}
if (gSession)

View File

@ -1,3 +1,78 @@
bin/pose
share/pose/ROM Transfer.prc
share/pose/ROM_Transfer.prc
share/pose/skins/Handspring/Visor_Prism_Japanese.skin
share/pose/skins/Handspring/Visor_Blue_16.jpg
share/pose/skins/Handspring/Visor_Blue_16_Japanese.jpg
share/pose/skins/Handspring/Visor_Blue_32.jpg
share/pose/skins/Handspring/Visor_Blue_32_Japanese.jpg
share/pose/skins/Handspring/Visor_Blue_Japanese.skin
share/pose/skins/Handspring/Visor_Graphite.skin
share/pose/skins/Handspring/Visor_Graphite_16.jpg
share/pose/skins/Handspring/Visor_Graphite_16_Japanese.jpg
share/pose/skins/Handspring/Visor_Graphite_32.jpg
share/pose/skins/Handspring/Visor_Graphite_32_Japanese.jpg
share/pose/skins/Handspring/Visor_Graphite_Japanese.skin
share/pose/skins/Handspring/Visor_Platinum.skin
share/pose/skins/Handspring/Visor_Platinum_16.jpg
share/pose/skins/Handspring/Visor_Prism.skin
share/pose/skins/Handspring/Visor_Platinum_16_Japanese.jpg
share/pose/skins/Handspring/Visor_Platinum_32.jpg
share/pose/skins/Handspring/Visor_Platinum_32_Japanese.jpg
share/pose/skins/Handspring/Visor_Platinum_Japanese.skin
share/pose/skins/Handspring/Visor_Prism_16.jpg
share/pose/skins/Handspring/Visor_Prism_16_Japanese.jpg
share/pose/skins/Handspring/Visor_Prism_32.jpg
share/pose/skins/Handspring/Visor_Prism_32_Japanese.jpg
share/pose/skins/Handspring/Visor_Blue.skin
share/pose/skins/Palm/m100_32.jpg
share/pose/skins/Palm/Palm_IIIc.skin
share/pose/skins/Palm/Palm_IIIe.skin
share/pose/skins/Palm/Palm_IIIx.skin
share/pose/skins/Palm/Palm_Pilot.skin
share/pose/skins/Palm/Palm_V.skin
share/pose/skins/Palm/Palm_VII.skin
share/pose/skins/Palm/Palm_VIIx.skin
share/pose/skins/Palm/Pilot.skin
share/pose/skins/Palm/Workpad.skin
share/pose/skins/Palm/Workpad_c3.skin
share/pose/skins/Palm/m100.skin
share/pose/skins/Palm/Palm_III_16.jpg
share/pose/skins/Palm/Palm_III_32.jpg
share/pose/skins/Palm/Palm_IIIc_16.jpg
share/pose/skins/Palm/Palm_IIIc_32.jpg
share/pose/skins/Palm/Palm_IIIe_16.jpg
share/pose/skins/Palm/Palm_IIIe_32.jpg
share/pose/skins/Palm/Palm_IIIx_16.jpg
share/pose/skins/Palm/Palm_VII_16.jpg
share/pose/skins/Palm/Palm_IIIx_32.jpg
share/pose/skins/Palm/Palm_Pilot_16.jpg
share/pose/skins/Palm/Palm_Pilot_32.jpg
share/pose/skins/Palm/Palm_VII_32.jpg
share/pose/skins/Palm/Palm_VIIx_16.jpg
share/pose/skins/Palm/Palm_VIIx_32.jpg
share/pose/skins/Palm/Palm_V_16.jpg
share/pose/skins/Palm/Palm_V_32.jpg
share/pose/skins/Palm/Pilot_16.jpg
share/pose/skins/Palm/Pilot_32.jpg
share/pose/skins/Palm/Workpad_16.jpg
share/pose/skins/Palm/Workpad_32.jpg
share/pose/skins/Palm/Workpad_c3_16.jpg
share/pose/skins/Palm/Workpad_c3_32.jpg
share/pose/skins/Palm/m100_16.jpg
share/pose/skins/Palm/Palm_III.skin
share/pose/skins/Symbol/Symbol_1500.skin
share/pose/skins/Symbol/Symbol_1700.skin
share/pose/skins/Symbol/Symbol_1500_16.jpg
share/pose/skins/Symbol/Symbol_1500_32.jpg
share/pose/skins/Symbol/Symbol_1700_16.jpg
share/pose/skins/Symbol/Symbol_1700_32.jpg
share/pose/skins/TRG/TRGpro.skin
share/pose/skins/TRG/TRGpro_16.jpg
share/pose/skins/TRG/TRGpro_32.jpg
share/pose/skins/ReadMe.txt
@dirrm share/pose/skins/Handspring
@dirrm share/pose/skins/Palm
@dirrm share/pose/skins/Symbol
@dirrm share/pose/skins/TRG
@dirrm share/pose/skins
@dirrm share/pose