[arch-commits] Commit in maxcso (5 files)

Sat Apr 4 05:34:33 UTC 2020

Date: Saturday, April 4, 2020 @ 05:34:33
  Author: alucryd
Revision: 611547

archrelease: copy trunk to community-x86_64

Added:
  maxcso/repos/
  maxcso/repos/community-x86_64/
  maxcso/repos/community-x86_64/PKGBUILD
    (from rev 611546, maxcso/trunk/PKGBUILD)
  maxcso/repos/community-x86_64/maxcso-system-flags.patch
    (from rev 611546, maxcso/trunk/maxcso-system-flags.patch)
  maxcso/repos/community-x86_64/maxcso-system-zopfli.patch
    (from rev 611546, maxcso/trunk/maxcso-system-zopfli.patch)

----------------------------+
 PKGBUILD                   |   46 ++++++++++++++++++++++++++++
 maxcso-system-flags.patch  |   33 ++++++++++++++++++++
 maxcso-system-zopfli.patch |   69 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+)

Copied: maxcso/repos/community-x86_64/PKGBUILD (from rev 611546, maxcso/trunk/PKGBUILD)
===================================================================

--- repos/community-x86_64/PKGBUILD	                        (rev 0)
+++ repos/community-x86_64/PKGBUILD	2020-04-04 05:34:33 UTC (rev 611547)
@@ -0,0 +1,46 @@
+# Maintainer: Gabriel Rauter <rauter.gabriel at gmail.com>
+
+pkgname=maxcso
+pkgver=1.11.0
+pkgrel=2
+pkgdesc="A fast ISO to CSO compression program for use with PSP and PS2 emulators"
+arch=(x86_64)
+url=https://github.com/unknownbrackets/maxcso
+license=(custom:ISCL)
+depends=(
+  gcc-libs
+  glibc
+  libuv
+  libzopfli.so
+  lz4
+  zlib
+)
+makedepends=(git)
+source=(
+  git+https://github.com/unknownbrackets/maxcso.git#tag=deb79236ea47feee30359e3dc8c865ed2dc6393c
+  maxcso-system-flags.patch
+  maxcso-system-zopfli.patch
+)
+sha256sums=('SKIP'
+            '9500875013db8ad18350cc0a36751fec37de80cde06e91e2999a421e53af8416'
+            'ceae42c12bc686dba1dae8b0df1f32e6063ba25d7edebfaaa94af85a9e8f24f7')
+
+prepare() {
+  cd maxcso
+
+  git cherry-pick -n 65f456a439b484e8da31831b6a3f0f96e8bb21bf
+  git cherry-pick -n 942a9a62421bfa3cf62b5c0992a272f95b802179
+  patch -Np1 -i ../maxcso-system-flags.patch
+  patch -Np1 -i ../maxcso-system-zopfli.patch
+}
+
+build() {
+  make -C maxcso
+}
+
+package() {
+  make DESTDIR="${pkgdir}" PREFIX=/usr -C maxcso install
+  install -Dm 644 maxcso/LICENSE.md -t "${pkgdir}"/usr/share/licenses/maxcso/
+}
+
+#vim: ts=2 sw=2 et:

Copied: maxcso/repos/community-x86_64/maxcso-system-flags.patch (from rev 611546, maxcso/trunk/maxcso-system-flags.patch)
===================================================================
--- repos/community-x86_64/maxcso-system-flags.patch	                        (rev 0)
+++ repos/community-x86_64/maxcso-system-flags.patch	2020-04-04 05:34:33 UTC (rev 611547)
@@ -0,0 +1,33 @@
+From 74d97c59d381253cca74c862689b4e22a2708f9f Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at archlinux.org>
+Date: Sat, 4 Apr 2020 07:20:40 +0200
+Subject: [PATCH] use system flags
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4767d84..0d0fd5a3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,8 +5,8 @@ MANDIR ?= $(PREFIX)/share/man
+ CC ?= gcc
+ CXX ?= g++
+ 
+-CFLAGS ?= -O2
+-CXXFLAGS ?= $(CFLAGS)
++CFLAGS ?= ${CFLAGS}
++CXXFLAGS ?= ${CXXFLAGS}
+ 
+ SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1
+ SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \
+@@ -31,7 +31,7 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ 	$(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $<
+ 
+ maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a
+-	$(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ -luv -llz4 -lz
++	$(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ ${LDFLAGS} -luv -llz4 -lz
+ 
+ 7zip/7zip.a:
+ 	$(MAKE) -C 7zip 7zip.a

Copied: maxcso/repos/community-x86_64/maxcso-system-zopfli.patch (from rev 611546, maxcso/trunk/maxcso-system-zopfli.patch)
===================================================================
--- repos/community-x86_64/maxcso-system-zopfli.patch	                        (rev 0)
+++ repos/community-x86_64/maxcso-system-zopfli.patch	2020-04-04 05:34:33 UTC (rev 611547)
@@ -0,0 +1,69 @@
+From d1a3d53ab7b34e672701df2a0fd2733a4db1d174 Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at archlinux.org>
+Date: Sat, 4 Apr 2020 07:22:04 +0200
+Subject: [PATCH] use system zopfli
+
+---
+ Makefile       | 15 ++++-----------
+ src/sector.cpp |  2 +-
+ 2 files changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3564157a..1c6be068 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,20 +9,13 @@ CFLAGS ?= ${CFLAGS} -O2
+ CXXFLAGS ?= $(CFLAGS)
+ 
+ SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1
+-SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \
++SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -I7zip -DNDEBUG=1 \
+ 	-Wno-unused-parameter -Wno-unused-variable -pthread
+ 
+ SRC_CXX_SRC = $(wildcard src/*.cpp)
+ SRC_CXX_OBJ = $(SRC_CXX_SRC:.cpp=.o)
+ CLI_CXX_SRC = $(wildcard cli/*.cpp)
+ CLI_CXX_OBJ = $(CLI_CXX_SRC:.cpp=.o)
+-ZOPFLI_C_SRC = zopfli/src/zopfli/blocksplitter.c zopfli/src/zopfli/cache.c \
+-               zopfli/src/zopfli/deflate.c zopfli/src/zopfli/gzip_container.c \
+-               zopfli/src/zopfli/hash.c zopfli/src/zopfli/katajainen.c \
+-               zopfli/src/zopfli/lz77.c zopfli/src/zopfli/squeeze.c \
+-               zopfli/src/zopfli/tree.c zopfli/src/zopfli/util.c \
+-               zopfli/src/zopfli/zlib_container.c zopfli/src/zopfli/zopfli_lib.c
+-ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ 
+ %.o: %.cpp
+ 	$(CXX) -c $(SRC_CXXFLAGS) $(CXXFLAGS) -o $@ $<
+@@ -30,8 +23,8 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ %.o: %.c
+ 	$(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $<
+ 
+-maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a
+-	$(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ ${LDFLAGS} -luv -llz4 -lz
++maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) 7zip/7zip.a
++	$(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ ${LDFLAGS} -luv -llz4 -lz -lzopfli
+ 
+ 7zip/7zip.a:
+ 	$(MAKE) -C 7zip 7zip.a
+@@ -49,7 +42,7 @@ uninstall:
+ 	rm -f $(DESTDIR)$(MANDIR)/man1/maxcso.1
+ 
+ clean:
+-	rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) maxcso
++	rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) maxcso
+ 	$(MAKE) -C 7zip clean
+ 
+ all: maxcso
+diff --git a/src/sector.cpp b/src/sector.cpp
+index e5f0106c..a0af503e 100644
+--- a/src/sector.cpp
++++ b/src/sector.cpp
+@@ -3,7 +3,7 @@
+ #include "compress.h"
+ #include "cso.h"
+ #include "buffer_pool.h"
+-#include "zopfli/zopfli.h"
++#include "zopfli.h"
+ #ifndef NO_DEFLATE7Z
+ #include "deflate7z.h"
+ #endif

