Update of /cvsroot/audacity/audacity-src/mac
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28147
Modified Files:
Tag: AUDACITY_1_2
compile.txt
Added Files:
Tag: AUDACITY_1_2
wxMac-2.4.2.patch
Log Message:
Updating mac 2.4.2 patch
--- NEW FILE: wxMac-2.4.2.patch ---
diff -r -u wxMac-2.4.2/include/wx/font.h wxMac-2.4.2-patched/include/wx/font.h
--- wxMac-2.4.2/include/wx/font.h 2002-10-27 17:51:41.000000000 -0800
+++ wxMac-2.4.2-patched/include/wx/font.h 2006-10-24 23:57:27.000000000
-0700
@@ -142,8 +142,8 @@
wxString GetWeightString() const;
// Unofficial API, don't use
- virtual void SetNoAntiAliasing( bool no = TRUE ) { }
- virtual bool GetNoAntiAliasing() { return FALSE; }
+ virtual void SetNoAntiAliasing( bool no = TRUE ) { mNoAntiAliasing = no; }
+ virtual bool GetNoAntiAliasing() { return mNoAntiAliasing; }
// the default encoding is used for creating all fonts with default
// encoding parameter
@@ -154,6 +154,8 @@
// get the internal data
wxFontRefData *GetFontData() const
{ return (wxFontRefData *)m_refData; }
+
+ bool mNoAntiAliasing;
private:
// the currently default encoding: by default, it's the default system
diff -r -u wxMac-2.4.2/src/common/intl.cpp
wxMac-2.4.2-patched/src/common/intl.cpp
--- wxMac-2.4.2/src/common/intl.cpp 2003-09-20 03:24:25.000000000 -0700
+++ wxMac-2.4.2-patched/src/common/intl.cpp 2006-11-12 21:15:56.000000000
-0800
@@ -34,6 +34,10 @@
#include <locale.h>
#include <ctype.h>
#include <stdlib.h>
+
+// dmazzoni: langinfo.h is not included in Mac OS X 10.2
+#undef HAVE_LANGINFO_H
+
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
diff -r -u wxMac-2.4.2/src/mac/app.cpp wxMac-2.4.2-patched/src/mac/app.cpp
--- wxMac-2.4.2/src/mac/app.cpp 2003-06-03 06:58:19.000000000 -0700
+++ wxMac-2.4.2-patched/src/mac/app.cpp 2006-11-12 21:17:49.000000000 -0800
@@ -1501,6 +1501,11 @@
sleepTime = 0 ;
else
sleepTime = GetCaretTime() / 2 ;
+
+ // dmazzoni: hack to never sleep more than 1/60 of a second
+ // otherwise Audacity's user interface doesn't update
+ // frequently enough
+ sleepTime = 1;
}
if ( event.what != kHighLevelEvent )
SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v
, event.where.h + 1 , event.where.v + 1 ) ;
diff -r -u wxMac-2.4.2/src/mac/dc.cpp wxMac-2.4.2-patched/src/mac/dc.cpp
--- wxMac-2.4.2/src/mac/dc.cpp 2003-09-20 03:24:33.000000000 -0700
+++ wxMac-2.4.2-patched/src/mac/dc.cpp 2006-11-12 21:20:57.000000000 -0800
@@ -1365,7 +1365,11 @@
long xx = XLOG2DEVMAC(x);
long yy = YLOG2DEVMAC(y);
#if TARGET_CARBON
- bool useDrawThemeText = ( DrawThemeTextBox != (void*)
kUnresolvedCFragSymbolAddress ) ;
+ // dmazzoni hack: Audacity is too slow on Mac OS X 10.2
+ // unless we turn off "theme text" (anti-aliased":
+ // bool useDrawThemeText = ( DrawThemeTextBox != (void*)
kUnresolvedCFragSymbolAddress ) ;
+ bool useDrawThemeText = false;
+
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing()
)
useDrawThemeText = false ;
#endif
@@ -1512,7 +1516,10 @@
FontInfo fi ;
::GetFontInfo( &fi ) ;
#if TARGET_CARBON
- bool useGetThemeText = ( GetThemeTextDimensions != (void*)
kUnresolvedCFragSymbolAddress ) ;
+ // dmazzoni hack: Audacity is too slow on Mac OS X 10.2
+ // unless we turn off "theme text" (anti-aliased":
+ bool useGetThemeText = false;
+ //bool useGetThemeText = ( GetThemeTextDimensions != (void*)
kUnresolvedCFragSymbolAddress ) ;
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) ||
((wxFont*)&m_font)->GetNoAntiAliasing() )
useGetThemeText = false ;
#endif
diff -r -u wxMac-2.4.2/src/mac/dcclient.cpp
wxMac-2.4.2-patched/src/mac/dcclient.cpp
--- wxMac-2.4.2/src/mac/dcclient.cpp 2003-09-20 03:24:33.000000000 -0700
+++ wxMac-2.4.2-patched/src/mac/dcclient.cpp 2006-11-12 21:21:28.000000000
-0800
@@ -72,6 +72,12 @@
wxWindowDC::~wxWindowDC()
{
+ // dmazzoni - this fixes a serious crashing bug
+ // To trigger it more rapidly, set the MallocScribble and MallocGuardEdges
+ // environment variables first...
+ if (!m_macPort)
+ return;
+
// set clipping region to full window so that the OS can draw controls
everywhere
RgnHandle visRgn = NewRgn() ;
GetPortVisibleRegion( (CGrafPtr) m_macPort , visRgn );
diff -r -u wxMac-2.4.2/src/mac/font.cpp wxMac-2.4.2-patched/src/mac/font.cpp
--- wxMac-2.4.2/src/mac/font.cpp 2002-11-24 09:34:15.000000000 -0800
+++ wxMac-2.4.2-patched/src/mac/font.cpp 2006-10-24 23:58:23.000000000
-0700
@@ -161,6 +161,8 @@
const wxString& faceName,
wxFontEncoding encoding)
{
+ mNoAntiAliasing = false;
+
UnRef();
m_refData = new wxFontRefData(pointSize, family, style, weight,
underlined, faceName, encoding);
Index: compile.txt
===================================================================
RCS file: /cvsroot/audacity/audacity-src/mac/compile.txt,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- compile.txt 25 Feb 2004 21:24:15 -0000 1.3.2.2
+++ compile.txt 13 Nov 2006 05:51:23 -0000 1.3.2.3
@@ -4,21 +4,18 @@
Dominic Mazzoni
================================================================
-This version is currently accurate for Audacity version 1.2.0.
-Last Updated: July 26, 2003
+This version is currently accurate for Audacity version 1.2.6.
+Last Updated: November 12, 2006
If the advice here is inaccurate or incomplete, please
email [EMAIL PROTECTED]
================================================================
Note: Audacity is no longer supported at all for Mac OS 9.
-This document assumes you are using Mac OS X 10.2.6 with
-Apple's December 2002 Developer Tools or newer. If you
-type "gcc --version" at your prompt, you should see:
-
- gcc (GCC) 3.1 20020420 (prerelease)
-
-If you have gcc 3.3 (Summer 2003), that should be fine.
+While Audacity compiles and runs on Mac OS X 10.4 and newer, we
+try to support Audacity on Mac OS X as early as 10.2. Therefore
+the instructions below include some patches that are intended
+to improve 10.2 compatibility.
Only the command-line build process is officially supported,
because it's easier to keep it in sync between the various
@@ -42,31 +39,20 @@
Similar to the Linux kernel, wxWidgets is available as
stable and development branches.
-The Mac version of wxWidgets is still a little bit unstable,
-and none of the releases support 100% of the features that
-Audacity needs. In particular, version 2.4.1 breaks some
-features that were working in version 2.4.0.
-
-The best way to compile Audacity is to download wxMac 2.4.0
-and apply a patch which adds a couple of the features that
-Audacity needs. More instructions are below.
-
-For step 1, just download wxMac 2.4.0 from http://www.wxWidgets.org/
-Click on the "Download" link on the left, then click on the link
-to the main download site "http" (or ftp, if you prefer), click on
-the 2.4.0 directory, and download:
-
- wxMac-2.4.0.tar.gz
+Audacity 1.2.x is only supported with wxWidgets 2.4.2. The latest
+version of Audacity uses wxWidgets 2.6.x and newer.
-Direct download link:
+The Audacity developers have found a few bugs in wxMac 2.4.2 that
+should be fixed before compiling it. Details below.
- http://biolpc22.york.ac.uk/pub/2.4.0/wxMac-2.4.0.tar.gz
+For step 1, just download wxMac 2.4.2 from http://www.wxWidgets.org/ -
+you may have to dig to find old versions:
-Remember that version 2.4.1 will NOT work with Audacity.
+ wxMac-2.4.2.tar.gz
Uncompress wxMac from the command line by typing:
- tar xvzf wxMac-2.4.0.tar.gz
+ tar xvzf wxMac-2.4.2.tar.gz
Do not compile wxWidgets yet - you need to patch it in step 3.
@@ -79,8 +65,8 @@
To retrieve the latest version from CVS, use the following
commands:
- cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/audacity login
- cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/audacity checkout audacity
+ cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/audacity login
+ cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/audacity checkout -r AUDACITY_1_2
audacity
--------------------
STEP 3: Apply patch
@@ -91,11 +77,26 @@
audacity are in your home directory (~); you will need to change
the paths accordingly depending on where you put them.
- cd ~/wxMac-2.4.0
- patch -p 1 < ~/audacity/mac/wxMac-2.4.0.patch
+ cd ~/wxMac-2.4.2
+ patch -p 1 < ~/audacity/mac/wxMac-2.4.2.patch
+
+------------------------------------
+STEP 4: Optional 10.2 compatibility
+------------------------------------
+
+If you use tcsh:
+
+setenv MACOSX_DEPLOYMENT_TARGET 10.2
+setenv NEXT_ROOT /Developer/SDKs/MacOSX10.2.8.sdk
+setenv C_INCLUDE_PATH
/usr/local/include:/Developer/SDKs/MacOSX10.2.8.sdk/usr/include
+setenv LIBRARY_PATH
/usr/local/lib:/Developer/SDKs/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3
+setenv LD_PREBIND 1
+setenv CPPFLAGS -DMAC_OS_X_VERSION_MAX_ALLOWED=1020
+
+For bash, "setenv foo bar" becomes "export foo=bar" (notice the '=' sign).
----------------------------------
-STEP 4: Compile and install wxMac
+STEP 5: Compile and install wxMac
----------------------------------
mkdir macbuild
@@ -107,11 +108,11 @@
[ Type your Mac OS X password ]
-------------------------
-STEP 5: Compile Audacity
+STEP 6: Compile Audacity
-------------------------
To compile everything:
-./configure --with-help --with-libflac
+./configure
make
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
