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

   1 commit 7a4c76119114b82d26dab5d5adfe5a2429e32434
   2 Author: Mike Jerris <mike@jerris.com>
   3 Date:   Thu Mar 16 11:29:08 2017 -0500
   4
   5     FS-10074: [libtiff] remove more libtiff references
   6
   7 --- a/debian/copyright
   8 +++ b/debian/copyright
   9 @@ -1700,27 +1700,6 @@ Copyright: 2007 <robs@users.sourceforge.
  10   2007-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
  11  License: LGPL-2+
  12
  13 -Files: libs/tiff-4.0.2/*
  14 -Copyright: 1988-1997 Sam Leffler
  15 - 1991-1997 Silicon Graphics, Inc.
  16 - 2006-2010 Richard Nolde
  17 - 1999-2000 Frank Warmerdam
  18 - 1990 by Digital Equipment Corporation, Maynard, Massachusetts.
  19 - 1990 by Sun Microsystems, Inc.
  20 - Joris Van Damme <info@awaresystems.be>
  21 - AWare Systems <http://www.awaresystems.be/>
  22 -License: MIT/X11 (BSD like)
  23 -
  24 -Files: libs/tiff-4.0.2/port/getopt.c
  25 - libs/tiff-4.0.2/port/strcasecmp.c
  26 - libs/tiff-4.0.2/port/lfind.c
  27 -Copyright: 1987, 1993, 1994, The Regents of the University of California.
  28 -License: BSD-3-clause
  29 -
  30 -Files: libs/tiff-4.0.2/port/strtoull.c
  31 -Copyright: 1992, 1993, The Regents of the University of California.
  32 -License: BSD-4-clause
  33 -
  34  Files: src/switch_dso.c
  35  Copyright: 2008 Michael Jerris
  36  License: BSD-like
  37 --- a/debian/license-reconcile.yml
  38 +++ b/debian/license-reconcile.yml
  39 @@ -186,21 +186,6 @@ Rules:
  40     Copyright: 1999-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
  41     Justification: prevent false-psitive copyright detection
  42    -
  43 -   Glob: libs/tiff-4.0.2/libtiff/tif_tile.c
  44 -   Matches: Copyright\s(c)\s1991-1997\sSam\sLeffler
  45 -   Matches: copyright\snotices\sand\sthis\spermission\snotice\sappear\sin
  46 -   Copyright: 1991-1997 Sam Leffler
  47 -  -
  48 -   Glob: libs/tiff-4.0.2/*
  49 -   Matches: Additions\s\(c\)\sRichard\sNolde\s2006-2010
  50 -   Matches: copyright\snotices\sand\sthis\spermission\snotice\sappear\sin
  51 -   Copyright: 2006-2010 Richard Nolde
  52 -  -
  53 -   Glob: libs/tiff-4.0.2/libtiff/tiffvers.h
  54 -   Matches: 1988-1996\sSam\sLeffler..Copyright\s\(c\)\s1991-1996\sSilicon\sGraphics,\sInc.
  55 -   Copyright: 1991-1996 Sam Leffler
  56 -   Copyright: 1991-1996 Silicon Graphics, Inc
  57 -  -
  58     Glob: src/mod/endpoints/mod_khomp/*
  59     Matches: The\scontents\sof\sthis\sfile\sare\ssubject\sto\sthe\sMozilla\sPublic\sLicense\sVersion\s1.1
  60     Matches: Alternatively,\sthe\scontents\sof\sthis\sfile\smay\sbe\sused\sunder\sthe\sterms\sof\sthe
  61 --- a/docs/Doxygen.conf
  62 +++ b/docs/Doxygen.conf
  63 @@ -1240,15 +1240,9 @@ SEARCH_INCLUDES        = YES
  64  # contain include files that are not input files but should be processed by
  65  # the preprocessor.
  66
  67 -INCLUDE_PATH           =../libs/apr ../libs/apr-util \
  68 -                       ../libs/iksemel ../libs/ilbc ../libs/js \
  69 -                       ../libs/libg722_1 ../libs/libnatpmp \
  70 -                       ../libs/libsndfile ../libs/miniupnpc  \
  71 -                       ../libs/portaudio ../libs/sofia-sip ../libs/spandsp \
  72 -                       ../libs/srtp \
  73 -                       ../libs/tiff-4.0.2 ../libs/udns \
  74 -                       ../libs/unimrcp ../libs/voipcodecs ../libs/win32 \
  75 -                       ../libs/xmlrpc-c
  76 +INCLUDE_PATH           =../libs/apr ../libs/apr-util ../libs/iksemel ../libs/libnatpmp \
  77 +                       ../libs/miniupnpc ../libs/sofia-sip ../libs/spandsp \
  78 +                       ../libs/srtp ../libs/unimrcp ../libs/win32 ../libs/xmlrpc-c
  79
  80  # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
  81  # patterns (like *.h and *.hpp) to filter out the header-files in the
  82 --- a/rebootstrap.sh
  83 +++ b/rebootstrap.sh
  84 @@ -8,7 +8,7 @@ BGJOB=false
  85  VERBOSE=false
  86  BASEDIR=`pwd`;
  87  LIBDIR=${BASEDIR}/libs;
  88 -SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp tiff-4.0.2 fs";
  89 +SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp fs";
  90
  91  while getopts 'jhd:v' o; do
  92    case "$o" in