[PD-cvs] packages/darwin_app/patches darwin_linking_fixes.patch, 1.2, 1.3

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/packages/darwin_app/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19430

Modified Files:
	darwin_linking_fixes.patch 
Log Message:
changed Jack linking to 'weak'

Index: darwin_linking_fixes.patch
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/patches/darwin_linking_fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** darwin_linking_fixes.patch	6 Jun 2005 23:47:18 -0000	1.2
--- darwin_linking_fixes.patch	9 Jun 2005 05:44:27 -0000	1.3
***************
*** 5,9 ****
  diff -u -w -r1.10 configure.in
  --- configure.in	30 May 2005 04:37:25 -0000	1.10
! +++ configure.in	6 Jun 2005 23:45:51 -0000
  @@ -13,6 +13,7 @@
   AC_SUBST(USE_DEBUG_CFLAGS, no)
--- 5,9 ----
  diff -u -w -r1.10 configure.in
  --- configure.in	30 May 2005 04:37:25 -0000	1.10
! +++ configure.in	7 Jun 2005 00:14:52 -0000
  @@ -13,6 +13,7 @@
   AC_SUBST(USE_DEBUG_CFLAGS, no)
***************
*** 14,18 ****
   AC_SUBST(GUIFLAGS)
   AC_SUBST(OSNUMBER)
! @@ -207,6 +210,24 @@
   	OPT_CFLAGS="-g"
       else
--- 14,18 ----
   AC_SUBST(GUIFLAGS)
   AC_SUBST(OSNUMBER)
! @@ -207,6 +208,24 @@
   	OPT_CFLAGS="-g"
       else
***************
*** 39,43 ****
       echo OPT_CFLAGS --------------- $OPT_CFLAGS
       OSNUMBER=0
! @@ -245,24 +266,41 @@
           ../portmidi/pm_common/portmidi.c \
           ../portmidi/porttime/ptmacosx_cf.c "
--- 39,43 ----
       echo OPT_CFLAGS --------------- $OPT_CFLAGS
       OSNUMBER=0
! @@ -245,11 +264,25 @@
           ../portmidi/pm_common/portmidi.c \
           ../portmidi/porttime/ptmacosx_cf.c "
***************
*** 70,76 ****
       then
   	OPT_CFLAGS="-g"
!      else
! -	OPT_CFLAGS="-O2"
! +        OPT_CFLAGS="-O2 -fast -fPIC -mcpu=7450 -faltivec"
       fi
       OSNUMBER=2
--- 70,74 ----
       then
   	OPT_CFLAGS="-g"
! @@ -258,11 +291,14 @@
       fi
       OSNUMBER=2
***************
*** 79,93 ****
       if test x$jack == "xyes";
       then
!      	LDFLAGS=$LDFLAGS" -framework Jack"
  -	MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
  -	SYSSRC=$SYSSRC" s_audio_jack.c"
  +    fi
  +    if test x$jack == "xrun";
  +    then
! +        LDFLAGS=$LDFLAGS" -framework Jack"
       fi
   fi
   
! @@ -272,13 +310,11 @@
   then
       MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
--- 77,92 ----
       if test x$jack == "xyes";
       then
! -    	LDFLAGS=$LDFLAGS" -framework Jack"
  -	MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
  -	SYSSRC=$SYSSRC" s_audio_jack.c"
+ +    	LDFLAGS=$LDFLAGS" -weak_framework Jack"
  +    fi
  +    if test x$jack == "xrun";
  +    then
! +        LDFLAGS=$LDFLAGS" -weak_framework Jack"
       fi
   fi
   
! @@ -272,13 +308,11 @@
   then
       MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
***************
*** 109,113 ****
  diff -u -w -r1.6 makefile.in
  --- makefile.in	18 May 2005 04:28:51 -0000	1.6
! +++ makefile.in	6 Jun 2005 23:45:51 -0000
  @@ -97,11 +97,17 @@
   	cp u_main.tk $(BIN_DIR)/pd.tk
--- 108,112 ----
  diff -u -w -r1.6 makefile.in
  --- makefile.in	18 May 2005 04:28:51 -0000	1.6
! +++ makefile.in	7 Jun 2005 00:14:52 -0000
  @@ -97,11 +97,17 @@
   	cp u_main.tk $(BIN_DIR)/pd.tk
***************
*** 139,143 ****
  diff -u -w -r1.9 u_main.tk
  --- u_main.tk	18 May 2005 04:28:51 -0000	1.9
! +++ u_main.tk	6 Jun 2005 23:45:52 -0000
  @@ -48,7 +48,7 @@
       global pd_tearoff
--- 138,142 ----
  diff -u -w -r1.9 u_main.tk
  --- u_main.tk	18 May 2005 04:28:51 -0000	1.9
! +++ u_main.tk	7 Jun 2005 00:14:52 -0000
  @@ -48,7 +48,7 @@
       global pd_tearoff