[guy@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50436

User: guy
Date: 2013/07/07 02:11 PM

Log:
 Copy over revisions from trunk:
 
   ------------------------------------------------------------------------
   r50425 | guy | 2013-07-06 16:00:56 -0700 (Sat, 06 Jul 2013) | 6 lines
   
   We need Cairo if we're building on 10.5 *or* if we're building *for*
   10.5 on a later OS.
   
   Fix the download path for libpng, and update the version to the
   currently-available version.
   
   ------------------------------------------------------------------------
   r50421 | guy | 2013-07-06 14:21:54 -0700 (Sat, 06 Jul 2013) | 2 lines
   
   Use consistent 4-space no-tab indentation.
   
   ------------------------------------------------------------------------
   r50418 | guy | 2013-07-06 12:32:07 -0700 (Sat, 06 Jul 2013) | 6 lines
   
   Don't install the GNU autotools on Snow Leopard and earlier; they were
   shipped with those versions of OS X, and I had some problems with the
   newer versions on Snow Leopard (the Makefile was doing weird stuff that
   caused build failures in wsutil, moving .Tlo files to .Plo files; I
   didn't investigate futher).
   
   ------------------------------------------------------------------------
   r50402 | guy | 2013-07-05 23:16:06 -0700 (Fri, 05 Jul 2013) | 7 lines
   
   Add a "-t <target>" flag to set the deployment target OS version; that
   causes a -mmacosx-version-min flag to be used, to keep the compiler and
   linker from using features not supported by that OS version, and causes
   the support libraries to be built against the SDK for that OS version,
   so they don't request library versions later than the one shipped with
   that version.
   
   ------------------------------------------------------------------------
   r50391 | guy | 2013-07-05 16:27:10 -0700 (Fri, 05 Jul 2013) | 2 lines
   
   Get rid of extra blank line.
   
   ------------------------------------------------------------------------
   r50390 | guy | 2013-07-05 16:26:15 -0700 (Fri, 05 Jul 2013) | 2 lines
   
   Add a -u flag to uninstall the support tools and libraries.
   
   ------------------------------------------------------------------------
   r50389 | guy | 2013-07-05 16:19:58 -0700 (Fri, 05 Jul 2013) | 7 lines
   
   LIBFFI_CFLAGS and LIBFFI_LIBS are defined only to suppress the attempt
   to run pkg-config to get their values; they should be set equal to the
   values that would be returned by pkg-config for libffi with the --cflags
   and --libs arguments, respectively.  They should *NOT* include the
   values of CFLAGS and LDFLAGS supplied in the environment; those should
   be handled separately.
   
   ------------------------------------------------------------------------
   r50383 | guy | 2013-07-04 16:16:23 -0700 (Thu, 04 Jul 2013) | 3 lines
   
   Use xcrun --show-sdk-path to find out where the system include files are
   hidden, rather than a "compile a program" hack.
   
   ------------------------------------------------------------------------
   r50196 | guy | 2013-06-27 12:14:41 -0700 (Thu, 27 Jun 2013) | 4 lines
   
   Actually, that's not a clang bug; my test case had a typo.  It's still a
   case where clang is complaining about code that's OK, it's just not OK
   in a way that lets clang determine that it is.
   
   ------------------------------------------------------------------------
   r50186 | guy | 2013-06-27 03:30:33 -0700 (Thu, 27 Jun 2013) | 5 lines
   
   Don't assume the system include files are under /usr/include; trick the
   compiler into saying where they are, and use that.
   
   Patch a bug in PortAudio pa_stable_v19_20111121 that clang found.
   
   ------------------------------------------------------------------------
   r50175 | guy | 2013-06-26 14:29:38 -0700 (Wed, 26 Jun 2013) | 5 lines
   
   Another clang issue to work around:
   
   libgcrypt expects gnu89-style semantics for "inline"; GCC defaults to
   gnu89, but clang defaults to gnu99.
   
   ------------------------------------------------------------------------
   r50174 | guy | 2013-06-26 12:38:47 -0700 (Wed, 26 Jun 2013) | 3 lines
   
   Suppress -Wformat-nonliteral when building GLib, to avoid a clang bug
   where it issues bogus warnings.
   
   ------------------------------------------------------------------------
   r50072 | guy | 2013-06-19 17:27:52 -0700 (Wed, 19 Jun 2013) | 5 lines
   
   Don't assume $(uname) works; it's not a standard Bourne shell feature,
   and we only assume a Bourne-compatible shell.
   
   It's "OS X", not "OsX".
   
   ------------------------------------------------------------------------
   r50070 | eapache | 2013-06-19 16:52:54 -0700 (Wed, 19 Jun 2013) | 8 lines
   
   From Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821
   
   if no make options are given to the macosx-setup.sh script by the user, the
   script sets the number of parallel make jobs to 1.5x CPU cores.
   
   Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh
   on OsX, so people don't have to remember it.
   
   ------------------------------------------------------------------------
   r49995 | gerald | 2013-06-17 16:30:56 -0700 (Mon, 17 Jun 2013) | 2 lines
   
   From Dirk Jagdmann via bug 7525: macosx-setup.sh improvements.
   
   ------------------------------------------------------------------------
   r49263 | tuexen | 2013-05-13 04:46:16 -0700 (Mon, 13 May 2013) | 4 lines
   
   Allow for building 32-bit versions of the libraries used by wireshark.
   This allows to build a 32-bit version of wireshark.

Directory: /trunk-1.10/macosx-support-lib-patches/
  Changes    Path                             Action
  +11 -0     portaudio-pa_mac_core.c.patch    Added

Directory: /trunk-1.10/
  Changes    Path               Action
  +1 -0      Makefile.am        Modified
  +6 -1      autogen.sh         Modified
  +887 -415  macosx-setup.sh    Modified