net/freeswitch-stable/patches/313-use-system-tiff.patch

   1 commit 4a7c459e37d77b05f258001ccae99935fb660caf
   2 Author: Mike Jerris <mike@jerris.com>
   3 Date:   Wed Mar 15 15:02:04 2017 -0500
   4
   5     FS-10074: [libtiff] stop using embedded libtiff.  Build now requires system libtiff
   6
   7 --- a/src/mod/endpoints/mod_gsmopen/Makefile.am
   8 +++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
   9 @@ -1,10 +1,6 @@
  10  include $(top_srcdir)/build/modmake.rulesam
  11  MODNAME=mod_gsmopen
  12
  13 -TIFF_DIR=$(switch_srcdir)/libs/tiff-4.0.2
  14 -TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-4.0.2
  15 -TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
  16 -
  17  SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
  18  SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
  19  SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
  20 @@ -12,16 +8,12 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libsp
  21  mod_LTLIBRARIES = mod_gsmopen.la
  22  mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp
  23  mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
  24 -mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
  25 -mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
  26 +mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I.
  27 +mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA)
  28  mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
  29
  30 -BUILT_SOURCES = $(TIFF_LA) $(SPANDSP_LA)
  31 -
  32 -$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
  33 -       cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS) -I$(TIFF_BUILDDIR)/libtiff -I$(TIFF_DIR)/libtiff" CFLAGS="$(CFLAGS)"
  34 -       $(TOUCH_TARGET)
  35 +BUILT_SOURCES = $(SPANDSP_LA)
  36
  37 -$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
  38 -       cd $(TIFF_BUILDDIR) && $(MAKE)
  39 +$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
  40 +       cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
  41         $(TOUCH_TARGET)