maxcso/repos/community-x86_64/maxcso-system-libs.patch

   1 diff '--color=auto' -rupN maxcso.orig/Makefile maxcso/Makefile
   2 --- maxcso.orig/Makefile        2021-09-02 11:25:45.865244668 +0200
   3 +++ maxcso/Makefile     2021-09-02 11:26:59.628790478 +0200
   4 @@ -10,20 +10,13 @@ CXXFLAGS ?= ${CXXFLAGS}
   5  LDFLAGS ?= ${LDFLAGS}
   6
   7  SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1
   8 -SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \
   9 -       -Ilibdeflate -Wno-unused-parameter -Wno-unused-variable -pthread
  10 +SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -I7zip -DNDEBUG=1 \
  11 +       -Wno-unused-parameter -Wno-unused-variable -pthread
  12
  13  SRC_CXX_SRC = $(wildcard src/*.cpp)
  14  SRC_CXX_OBJ = $(SRC_CXX_SRC:.cpp=.o)
  15  CLI_CXX_SRC = $(wildcard cli/*.cpp)
  16  CLI_CXX_OBJ = $(CLI_CXX_SRC:.cpp=.o)
  17 -ZOPFLI_C_SRC = zopfli/src/zopfli/blocksplitter.c zopfli/src/zopfli/cache.c \
  18 -               zopfli/src/zopfli/deflate.c zopfli/src/zopfli/gzip_container.c \
  19 -               zopfli/src/zopfli/hash.c zopfli/src/zopfli/katajainen.c \
  20 -               zopfli/src/zopfli/lz77.c zopfli/src/zopfli/squeeze.c \
  21 -               zopfli/src/zopfli/tree.c zopfli/src/zopfli/util.c \
  22 -               zopfli/src/zopfli/zlib_container.c zopfli/src/zopfli/zopfli_lib.c
  23 -ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
  24
  25  %.o: %.cpp
  26         $(CXX) -c $(SRC_CXXFLAGS) $(CXXFLAGS) -o $@ $<
  27 @@ -31,16 +24,12 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
  28  %.o: %.c
  29         $(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $<
  30
  31 -# TODO: Perhaps detect and use system libdeflate if available.
  32 -maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a libdeflate/libdeflate.a
  33 -       $(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -luv -llz4 -lz
  34 +maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) 7zip/7zip.a
  35 +       $(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -luv -llz4 -lz -lzopfli -ldeflate
  36
  37  7zip/7zip.a:
  38         $(MAKE) -C 7zip 7zip.a
  39
  40 -libdeflate/libdeflate.a:
  41 -       $(MAKE) -C libdeflate libdeflate.a
  42 -
  43  install: all
  44         mkdir -p $(DESTDIR)$(BINDIR)
  45         mkdir -p $(DESTDIR)$(MANDIR)/man1
  46 @@ -54,7 +43,7 @@ uninstall:
  47         rm -f $(DESTDIR)$(MANDIR)/man1/maxcso.1
  48
  49  clean:
  50 -       rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) maxcso
  51 +       rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) maxcso
  52         $(MAKE) -C 7zip clean
  53
  54  all: maxcso
  55 diff '--color=auto' -rupN maxcso.orig/src/sector.cpp maxcso/src/sector.cpp
  56 --- maxcso.orig/src/sector.cpp  2021-09-02 11:25:45.858577379 +0200
  57 +++ maxcso/src/sector.cpp       2021-09-02 11:27:27.438050698 +0200
  58 @@ -3,7 +3,7 @@
  59  #include "compress.h"
  60  #include "cso.h"
  61  #include "buffer_pool.h"
  62 -#include "zopfli/zopfli.h"
  63 +#include "zopfli.h"
  64  #include "libdeflate.h"
  65  #ifndef NO_DEFLATE7Z
  66  #include "deflate7z.h"