pd/src configure, 1.6.2.13, 1.6.2.14 configure.in, 1.5.4.5.2.15, 1.5.4.5.2.16 makefile.in, 1.4.4.2.2.14, 1.4.4.2.2.15 s_midi.c, 1.4.4.1.2.11, 1.4.4.1.2.12 - Pd-cvs

23 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32294
Modified Files:
      Tag: devel_0_39
    configure configure.in makefile.in s_midi.c 
Log Message:
i hope that DesireData's MIDI support is really fixed now.
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.14
retrieving revision 1.4.4.2.2.15
diff -C2 -d -r1.4.4.2.2.14 -r1.4.4.2.2.15
*** makefile.in	23 Nov 2006 17:50:53 -0000	1.4.4.2.2.14
--- makefile.in	23 Nov 2006 19:10:14 -0000	1.4.4.2.2.15
***************
*** 11,15 ****
  INCLUDE = -I.
  LDFLAGS = @LDFLAGS@
- LIB =  @PDLIB@
  OPT_CFLAGS = @OPT_CFLAGS@
  WARN_CFLAGS = 
--- 11,14 ----
***************
*** 66,70 ****
$(PDEXEC): $(OBJ) config.log
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
$(BIN_DIR)/pd.tk: u_main.tk
--- 65,69 ----
$(PDEXEC): $(OBJ) config.log
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ)
$(BIN_DIR)/pd.tk: u_main.tk
Index: s_midi.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v
retrieving revision 1.4.4.1.2.11
retrieving revision 1.4.4.1.2.12
diff -C2 -d -r1.4.4.1.2.11 -r1.4.4.1.2.12
*** s_midi.c	23 Nov 2006 06:08:39 -0000	1.4.4.1.2.11
--- s_midi.c	23 Nov 2006 19:10:14 -0000	1.4.4.1.2.12
***************
*** 475,481 ****
--- 475,483 ----
  void midi_alsa_init( void);
  #endif
+ #ifndef USEAPI_PORTMIDI
  #ifdef USEAPI_OSS
  void midi_oss_init( void);
  #endif
+ #endif
/* last requested parameters */
***************
*** 531,537 ****
--- 533,541 ----
      midi_alsa_init();
  #endif
+ #ifndef USEAPI_PORTMIDI
  #ifdef USEAPI_OSS
      midi_oss_init();
  #endif
+ #endif
      if (enable)
  #ifdef USEAPI_ALSA
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -C2 -d -r1.6.2.13 -r1.6.2.14
*** configure	23 Nov 2006 17:50:53 -0000	1.6.2.13
--- configure	23 Nov 2006 19:10:14 -0000	1.6.2.14
***************
*** 310,314 ****
  #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
--- 310,314 ----
  #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
***************
*** 1309,1313 ****
- 
  USE_DEBUG_CFLAGS=no
--- 1309,1312 ----
***************
*** 4298,4301 ****
--- 4297,4320 ----
+ # audio APIs may accumulate, but there must be only one MIDI API (??)
+ AUDIOSRC=""
+ MIDISRC="s_midi_none.c"
+ 
+ if test `uname -s` = Linux; then
+     LDFLAGS="-Wl,-export-dynamic "
+     EXT=pd_linux
+     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
+     STRIPFLAG=-s
+ fi
+ 
+ if test `uname -s` = Darwin; then
+     LDFLAGS="-Wl"
+     EXT=pd_darwin
+     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
+     STRIPFLAG=""
+     EXTERNTARGET=pd_darwin
+ fi
+ 
+ if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi
echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
***************
*** 4363,4367 ****
  echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
  if test $ac_cv_lib_dl_dlopen = yes; then
!   PDLIB="$PDLIB -ldl"
  else
    echo "dynamic link support required" || exit 1
--- 4382,4386 ----
  echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
  if test $ac_cv_lib_dl_dlopen = yes; then
!   LDFLAGS="$LDFLAGS -ldl"
  else
    echo "dynamic link support required" || exit 1
***************
*** 4432,4436 ****
  echo "${ECHO_T}$ac_cv_lib_ffm_sin" >&6
  if test $ac_cv_lib_ffm_sin = yes; then
!   PDLIB="$PDLIB -lffm"
  fi
--- 4451,4455 ----
  echo "${ECHO_T}$ac_cv_lib_ffm_sin" >&6
  if test $ac_cv_lib_ffm_sin = yes; then
!   LDFLAGS="$LDFLAGS -lffm"
  fi
***************
*** 4499,4503 ****
  echo "${ECHO_T}$ac_cv_lib_m_sin" >&6
  if test $ac_cv_lib_m_sin = yes; then
!   PDLIB="$PDLIB -lm"
  else
    echo "math library required" || exit 1
--- 4518,4522 ----
  echo "${ECHO_T}$ac_cv_lib_m_sin" >&6
  if test $ac_cv_lib_m_sin = yes; then
!   LDFLAGS="$LDFLAGS -lm"
  else
    echo "math library required" || exit 1
***************
*** 4568,4572 ****
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
  if test $ac_cv_lib_pthread_pthread_create = yes; then
!   PDLIB="$PDLIB -lpthread"
  else
    echo "pthreads required" || exit 1
--- 4587,4591 ----
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
  if test $ac_cv_lib_pthread_pthread_create = yes; then
!   LDFLAGS="$LDFLAGS -lpthread"
  else
    echo "pthreads required" || exit 1
***************
*** 4785,4789 ****
  echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_info" >&6
  if test $ac_cv_lib_asound_snd_pcm_info = yes; then
!   PDLIB="$PDLIB -lasound" ; alsa="yes"
  else
    alsa="no"
--- 4804,4808 ----
  echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_info" >&6
  if test $ac_cv_lib_asound_snd_pcm_info = yes; then
!   LDFLAGS="$LDFLAGS -lasound" ; alsa="yes"
  else
    alsa="no"
***************
*** 5065,5069 ****
  echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6
  if test $ac_cv_lib_portaudio_Pa_GetDeviceCount = yes; then
!   PDLIB=$PDLIB" -lportaudio" ; portaudio=yes
  else
    portaudio=no
--- 5084,5088 ----
  echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6
  if test $ac_cv_lib_portaudio_Pa_GetDeviceCount = yes; then
!   LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes
  else
    portaudio=no
***************
*** 5137,5141 ****
  echo "${ECHO_T}$ac_cv_lib_porttime_Pt_Started___" >&6
  if test $ac_cv_lib_porttime_Pt_Started___ = yes; then
!   PDLIB=$PDLIB" -lporttime"
  fi
--- 5156,5160 ----
  echo "${ECHO_T}$ac_cv_lib_porttime_Pt_Started___" >&6
  if test $ac_cv_lib_porttime_Pt_Started___ = yes; then
!   LDFLAGS=$LDFLAGS" -lporttime"
  fi
***************
*** 5204,5208 ****
  echo "${ECHO_T}$ac_cv_lib_portmidi_Pm_Initialize" >&6
  if test $ac_cv_lib_portmidi_Pm_Initialize = yes; then
!   PDLIB=$PDLIB" -lportmidi" ; portmidi=yes
  else
    portmidi=no
--- 5223,5227 ----
  echo "${ECHO_T}$ac_cv_lib_portmidi_Pm_Initialize" >&6
  if test $ac_cv_lib_portmidi_Pm_Initialize = yes; then
!   LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes
  else
    portmidi=no
***************
*** 5211,5221 ****
  fi
- #----------------------------------------------------------------------------------
- # section 2: generate Makefile
- # audio APIs may accumulate, but there must be only one MIDI API.
- 
- AUDIOSRC=""
- MIDISRC="s_midi_none.c"
- 
  if test x$USE_DEBUG_CFLAGS == xyes; then
      OPT_CFLAGS="-O1 -g"
--- 5230,5233 ----
***************
*** 5224,5245 ****
  fi
- if test `uname -s` = Linux; then
-     LDFLAGS="-Wl,-export-dynamic"
-     if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi
-     EXT=pd_linux
-     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
-     STRIPFLAG=-s
-     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- fi
- 
- if test `uname -s` = Darwin; then
-     LDFLAGS="-Wl"
-     EXT=pd_darwin
-     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
-     STRIPFLAG=""
-     EXTERNTARGET=pd_darwin
- fi
- 
  if test x$oss == xyes; then
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
--- 5236,5239 ----
***************
*** 5258,5261 ****
--- 5252,5259 ----
    AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
    if test x$jack != xno; then
+       if test `uname -s` = Linux; then
+           if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+           if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+       fi
        if test `uname -s` = Darwin; then
            LDFLAGS=$LDFLAGS" -framework Jack"
***************
*** 5278,5281 ****
--- 5276,5280 ----
  if test x$portmidi == xyes; then
      MIDISRC="s_midi_pm.c"
+     MIDIFLAGS="-DUSEAPI_PORTMIDI"
      if test `uname -s` = Darwin; then
          LDFLAGS=$LDFLAGS" -framework CoreMIDI"
***************
*** 5283,5286 ****
--- 5282,5287 ----
  fi
+ MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
+ 
            ac_config_files="$ac_config_files makefile"
  cat >confcache <<_ACEOF
***************
*** 5924,5928 ****
  s,@portaudio@,$portaudio,;t t
  s,@portmidi@,$portmidi,;t t
- s,@PDLIB@,$PDLIB,;t t
  s,@MORECFLAGS@,$MORECFLAGS,;t t
  s,@EXT@,$EXT,;t t
--- 5925,5928 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.15
retrieving revision 1.5.4.5.2.16
diff -C2 -d -r1.5.4.5.2.15 -r1.5.4.5.2.16
*** configure.in	23 Nov 2006 17:50:53 -0000	1.5.4.5.2.15
--- configure.in	23 Nov 2006 19:10:14 -0000	1.5.4.5.2.16
***************
*** 5,10 ****
  # ./configure.in, but it's still put in the CVS and releases so that people don't
  # have to have autoconf installed.
- #
- # section 1: detect software.
AC_INIT(d_arithmetic.c)
--- 5,8 ----
***************
*** 14,18 ****
  AC_SUBST(portaudio, yes)
  AC_SUBST(portmidi, yes)
- AC_SUBST(PDLIB)
  AC_SUBST(MORECFLAGS)
  AC_SUBST(EXT)
--- 12,15 ----
***************
*** 56,69 ****
  AC_FUNC_ALLOCA
! dnl Checks for libraries.
dnl Checking for `dlopen' function in -ldl:
! AC_CHECK_LIB(dl, dlopen,PDLIB="$PDLIB -ldl", echo "dynamic link support required" || exit 1)
  dnl Checking for `sin' function in -lffm (ffm is the fast math library on the alpha)
! AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm")
  dnl Checking for `sin' function in -lm:
! AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", echo "math library required" || exit 1)
  dnl Checking for `pthread_create' function in -pthread
! AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1)
if test x$oss == xyes; then
--- 53,85 ----
  AC_FUNC_ALLOCA
! # audio APIs may accumulate, but there must be only one MIDI API (??)
! AUDIOSRC=""
! MIDISRC="s_midi_none.c"
! 
! if test `uname -s` = Linux; then
!     LDFLAGS="-Wl,-export-dynamic "
!     EXT=pd_linux
!     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
!     STRIPFLAG=-s
! fi
! 
! if test `uname -s` = Darwin; then
!     LDFLAGS="-Wl"
!     EXT=pd_darwin
!     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
!     STRIPFLAG=""
!     EXTERNTARGET=pd_darwin
! fi
! 
! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi
dnl Checking for `dlopen' function in -ldl:
! AC_CHECK_LIB(dl, dlopen,LDFLAGS="$LDFLAGS -ldl", echo "dynamic link support required" || exit 1)
  dnl Checking for `sin' function in -lffm (ffm is the fast math library on the alpha)
! AC_CHECK_LIB(ffm, sin,LDFLAGS="$LDFLAGS -lffm")
  dnl Checking for `sin' function in -lm:
! AC_CHECK_LIB(m, sin,LDFLAGS="$LDFLAGS -lm", echo "math library required" || exit 1)
  dnl Checking for `pthread_create' function in -pthread
! AC_CHECK_LIB(pthread, pthread_create,LDFLAGS="$LDFLAGS -lpthread", echo "pthreads required" || exit 1)
if test x$oss == xyes; then
***************
*** 73,77 ****
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
  if test x$alsa == xyes; then
!    AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no")
  fi
--- 89,93 ----
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
  if test x$alsa == xyes; then
!    AC_CHECK_LIB(asound,snd_pcm_info,LDFLAGS="$LDFLAGS -lasound" ; alsa="yes",alsa="no")
  fi
***************
*** 84,102 ****
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
  if test x$portaudio == xyes; then
!    AC_CHECK_LIB(portaudio,Pa_GetDeviceCount,PDLIB=$PDLIB" -lportaudio" ; portaudio=yes,portaudio=no)
  fi
if test x$portmidi == xyes; then
!    AC_CHECK_LIB(porttime,Pt_Started   ,PDLIB=$PDLIB" -lporttime")
!    AC_CHECK_LIB(portmidi,Pm_Initialize,PDLIB=$PDLIB" -lportmidi" ; portmidi=yes,portmidi=no)
  fi
- #----------------------------------------------------------------------------------
- # section 2: generate Makefile
- # audio APIs may accumulate, but there must be only one MIDI API.
- 
- AUDIOSRC=""
- MIDISRC="s_midi_none.c"
- 
  if test x$USE_DEBUG_CFLAGS == xyes; then
      OPT_CFLAGS="-O1 -g"
--- 100,111 ----
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
  if test x$portaudio == xyes; then
!    AC_CHECK_LIB(portaudio,Pa_GetDeviceCount,LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes,portaudio=no)
  fi
if test x$portmidi == xyes; then
!    AC_CHECK_LIB(porttime,Pt_Started   ,LDFLAGS=$LDFLAGS" -lporttime")
!    AC_CHECK_LIB(portmidi,Pm_Initialize,LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes,portmidi=no)
  fi
if test x$USE_DEBUG_CFLAGS == xyes; then
      OPT_CFLAGS="-O1 -g"
***************
*** 105,126 ****
  fi
- if test `uname -s` = Linux; then
-     LDFLAGS="-Wl,-export-dynamic"
-     if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi
-     EXT=pd_linux
-     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
-     STRIPFLAG=-s
-     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- fi
- 
- if test `uname -s` = Darwin; then
-     LDFLAGS="-Wl"
-     EXT=pd_darwin
-     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
-     STRIPFLAG=""
-     EXTERNTARGET=pd_darwin
- fi
- 
  if test x$oss == xyes; then
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
--- 114,117 ----
***************
*** 139,142 ****
--- 130,137 ----
    AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
    if test x$jack != xno; then
+       if test `uname -s` = Linux; then
+           if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+           if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+       fi
        if test `uname -s` = Darwin; then
            LDFLAGS=$LDFLAGS" -framework Jack"
***************
*** 159,162 ****
--- 154,158 ----
  if test x$portmidi == xyes; then
      MIDISRC="s_midi_pm.c"
+     MIDIFLAGS="-DUSEAPI_PORTMIDI"
      if test `uname -s` = Darwin; then
          LDFLAGS=$LDFLAGS" -framework CoreMIDI"
***************
*** 164,167 ****
--- 160,165 ----
  fi
+ MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
+ 
  AC_OUTPUT(makefile)