advancecomp-system-libs.patch

   1 --- advancecomp-2.6/Makefile.am.orig    2023-10-10 17:01:16.000000000 +0200
   2 +++ advancecomp-2.6/Makefile.am 2024-04-17 18:59:18.464658604 +0200
   3 @@ -21,34 +21,10 @@ bin_PROGRAMS = advzip advpng advmng advd
   4         7z/WindowIn.cc \
   5         7z/WindowOut.cc
   6
   7 -libdeflate_SOURCES = \
   8 -       libdeflate/arm/cpu_features.c \
   9 -       libdeflate/x86/cpu_features.c \
  10 -       libdeflate/adler32.c \
  11 -       libdeflate/crc32.c \
  12 -       libdeflate/deflate_compress.c\
  13 -       libdeflate/deflate_decompress.c \
  14 -       libdeflate/gzip_compress.c \
  15 -       libdeflate/gzip_decompress.c \
  16 -       libdeflate/utils.c \
  17 -       libdeflate/zlib_compress.c \
  18 -       libdeflate/zlib_decompress.c
  19 -
  20 -
  21 -zopfli_SOURCES = \
  22 -       zopfli/blocksplitter.c \
  23 -       zopfli/cache.c \
  24 -       zopfli/deflate.c \
  25 -       zopfli/gzip_container.c \
  26 -       zopfli/hash.c \
  27 -       zopfli/katajainen.c \
  28 -       zopfli/lz77.c \
  29 -       zopfli/squeeze.c \
  30 -       zopfli/tree.c \
  31 -       zopfli/util.c \
  32 -       zopfli/zlib_container.c \
  33 -       zopfli/zopfli.h \
  34 -       zopfli/zopfli_lib.c
  35 +libdeflate_LIBS = -ldeflate
  36 +
  37 +
  38 +zopfli_LIBS = -lzopfli
  39
  40  advzip_SOURCES = \
  41         rezip.cc \
  42 @@ -62,8 +38,8 @@ advzip_SOURCES = \
  43         snprintf.c \
  44         portable.c \
  45         $(7z_SOURCES) \
  46 -       $(libdeflate_SOURCES) \
  47 -       $(zopfli_SOURCES)
  48 +       $(nil)
  49 +advzip_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
  50
  51  advpng_SOURCES = \
  52         repng.cc \
  53 @@ -79,8 +55,8 @@ advpng_SOURCES = \
  54         lib/error.c \
  55         lib/snstring.c \
  56         $(7z_SOURCES) \
  57 -       $(libdeflate_SOURCES) \
  58 -       $(zopfli_SOURCES)
  59 +       $(nil)
  60 +advpng_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
  61
  62  advmng_SOURCES = \
  63         remng.cc \
  64 @@ -101,8 +75,8 @@ advmng_SOURCES = \
  65         lib/error.c \
  66         lib/snstring.c \
  67         $(7z_SOURCES) \
  68 -       $(libdeflate_SOURCES) \
  69 -       $(zopfli_SOURCES)
  70 +       $(nil)
  71 +advmng_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
  72
  73  advdef_SOURCES = \
  74         redef.cc \
  75 @@ -120,8 +93,8 @@ advdef_SOURCES = \
  76         lib/png.c \
  77         lib/mng.c \
  78         $(7z_SOURCES) \
  79 -       $(libdeflate_SOURCES) \
  80 -       $(zopfli_SOURCES)
  81 +       $(nil)
  82 +advdef_LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
  83
  84  # Add the .version file in the distribution
  85  dist-hook:
  86 --- advancecomp-1.23/compress.h.orig    2016-09-26 22:04:03.000000000 +0200
  87 +++ advancecomp-1.23/compress.h 2016-12-18 22:11:26.444429691 +0100
  88 @@ -24,11 +24,11 @@
  89  #include "7z/7z.h"
  90
  91  extern "C" {
  92 -#include "libdeflate/libdeflate.h"
  93 +#include <libdeflate.h>
  94  }
  95
  96  extern "C" {
  97 -#include "zopfli/zopfli.h"
  98 +#include <zopfli.h>
  99  }
 100
 101  #if USE_BZIP2