advancecomp-system-libs.patch

   1 --- advancecomp-1.23/Makefile.am.orig   2016-11-21 18:28:02.000000000 +0100
   2 +++ advancecomp-1.23/Makefile.am        2016-12-18 22:10:03.761097301 +0100
   3 @@ -21,32 +21,9 @@
   4         7z/WindowIn.cc \
   5         7z/WindowOut.cc
   6
   7 -libdeflate_SOURCES = \
   8 -       libdeflate/adler32.c \
   9 -       libdeflate/aligned_malloc.c \
  10 -       libdeflate/crc32.c \
  11 -       libdeflate/deflate_compress.c \
  12 -       libdeflate/deflate_decompress.c \
  13 -       libdeflate/gzip_compress.c \
  14 -       libdeflate/gzip_decompress.c \
  15 -       libdeflate/x86_cpu_features.c \
  16 -       libdeflate/zlib_compress.c \
  17 -       libdeflate/zlib_decompress.c
  18 -
  19 -zopfli_SOURCES = \
  20 -       zopfli/blocksplitter.c \
  21 -       zopfli/cache.c \
  22 -       zopfli/deflate.c \
  23 -       zopfli/gzip_container.c \
  24 -       zopfli/hash.c \
  25 -       zopfli/katajainen.c \
  26 -       zopfli/lz77.c \
  27 -       zopfli/squeeze.c \
  28 -       zopfli/tree.c \
  29 -       zopfli/util.c \
  30 -       zopfli/zlib_container.c \
  31 -       zopfli/zopfli.h \
  32 -       zopfli/zopfli_lib.c
  33 +libdeflate_LIBS = -ldeflate
  34 +zopfli_LIBS = -lzopfli
  35 +LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
  36
  37  advzip_SOURCES = \
  38         rezip.cc \
  39 @@ -58,9 +35,7 @@
  40         zipsh.cc \
  41         getopt.c \
  42         snprintf.c \
  43 -       $(7z_SOURCES) \
  44 -       $(libdeflate_SOURCES) \
  45 -       $(zopfli_SOURCES)
  46 +       $(7z_SOURCES)
  47
  48  advpng_SOURCES = \
  49         repng.cc \
  50 @@ -75,9 +50,7 @@
  51         lib/png.c \
  52         lib/error.c \
  53         lib/snstring.c \
  54 -       $(7z_SOURCES) \
  55 -       $(libdeflate_SOURCES) \
  56 -       $(zopfli_SOURCES)
  57 +       $(7z_SOURCES)
  58
  59  advmng_SOURCES = \
  60         remng.cc \
  61 @@ -95,9 +68,7 @@
  62         lib/mng.c \
  63         lib/error.c \
  64         lib/snstring.c \
  65 -       $(7z_SOURCES) \
  66 -       $(libdeflate_SOURCES) \
  67 -       $(zopfli_SOURCES)
  68 +       $(7z_SOURCES)
  69
  70  advdef_SOURCES = \
  71         redef.cc \
  72 @@ -113,9 +84,7 @@
  73         lib/snstring.c \
  74         lib/png.c \
  75         lib/mng.c \
  76 -       $(7z_SOURCES) \
  77 -       $(libdeflate_SOURCES) \
  78 -       $(zopfli_SOURCES)
  79 +       $(7z_SOURCES)
  80
  81  EXTRA_DIST = \
  82         README AUTHORS HISTORY INSTALL COPYING \
  83 --- advancecomp-1.23/compress.h.orig    2016-09-26 22:04:03.000000000 +0200
  84 +++ advancecomp-1.23/compress.h 2016-12-18 22:11:26.444429691 +0100
  85 @@ -24,11 +24,11 @@
  86  #include "7z/7z.h"
  87
  88  extern "C" {
  89 -#include "libdeflate/libdeflate.h"
  90 +#include <libdeflate.h>
  91  }
  92
  93  extern "C" {
  94 -#include "zopfli/zopfli.h"
  95 +#include <zopfli.h>
  96  }
  97
  98  #if USE_BZIP2