[arch-commits] Commit in maxcso/repos (4 files)

Sun Mar 6 16:06:08 UTC 2022

Date: Sunday, March 6, 2022 @ 16:06:07
  Author: felixonmars
Revision: 1142710

archrelease: copy trunk to community-staging-x86_64

Added:
  maxcso/repos/community-staging-x86_64/
  maxcso/repos/community-staging-x86_64/PKGBUILD
    (from rev 1142706, maxcso/trunk/PKGBUILD)
  maxcso/repos/community-staging-x86_64/maxcso-system-flags.patch
    (from rev 1142706, maxcso/trunk/maxcso-system-flags.patch)
  maxcso/repos/community-staging-x86_64/maxcso-system-libs.patch
    (from rev 1142706, maxcso/trunk/maxcso-system-libs.patch)

---------------------------+
 PKGBUILD                  |   51 ++++++++++++++++++++++++++++++++++
 maxcso-system-flags.patch |   24 ++++++++++++++++
 maxcso-system-libs.patch  |   66 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+)

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

--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2022-03-06 16:06:07 UTC (rev 1142710)
@@ -0,0 +1,51 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Gabriel Rauter <rauter.gabriel at gmail.com>
+
+pkgname=maxcso
+pkgver=1.13.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
+  libdeflate.so
+  libuv
+  libzopfli.so
+  lz4
+  zlib
+)
+makedepends=(git)
+_tag=80e6e8349814dd5c96e6504140d09afd4ecde1fe
+source=(
+  git+https://github.com/unknownbrackets/maxcso.git#tag=${_tag}
+  maxcso-system-flags.patch
+  maxcso-system-libs.patch
+)
+b2sums=('SKIP'
+        '5619e8dcc204dd130f724fb7f08009cfad5d122ffbafa42fe64e3776fd4a25894d9a6a0333192b091bdcf0051e5e4f8cb1f9bf177294d6e822440ac9baa8b23a'
+        '9f136c8091ad19b842e02e74e780b1e865afe2e71af010c58e28cb23a79e6d8470eb049a8c571588266c597dbdd525ce5999fe71c6f1aec41d6c4d32cf71d983')
+
+prepare() {
+  cd maxcso
+  patch -Np1 -i ../maxcso-system-flags.patch
+  patch -Np1 -i ../maxcso-system-libs.patch
+}
+
+pkgver() {
+  cd maxcso
+  git describe --tags | sed 's/^v//'
+}
+
+build() {
+  make PREFIX=/usr -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-staging-x86_64/maxcso-system-flags.patch (from rev 1142706, maxcso/trunk/maxcso-system-flags.patch)
===================================================================
--- community-staging-x86_64/maxcso-system-flags.patch	                        (rev 0)
+++ community-staging-x86_64/maxcso-system-flags.patch	2022-03-06 16:06:07 UTC (rev 1142710)
@@ -0,0 +1,24 @@
+diff '--color=auto' -rupN maxcso.orig/Makefile maxcso/Makefile
+--- maxcso.orig/Makefile	2021-09-02 11:23:11.924222645 +0200
++++ maxcso/Makefile	2021-09-02 11:24:58.177464161 +0200
+@@ -5,8 +5,9 @@ MANDIR ?= $(PREFIX)/share/man
+ CC ?= gcc
+ CXX ?= g++
+ 
+-CFLAGS ?= -O2
+-CXXFLAGS ?= $(CFLAGS)
++CFLAGS ?= ${CFLAGS}
++CXXFLAGS ?= ${CXXFLAGS}
++LDFLAGS ?= ${LDFLAGS}
+ 
+ SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1
+ SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \
+@@ -32,7 +33,7 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ 
+ # TODO: Perhaps detect and use system libdeflate if available.
+ maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a libdeflate/libdeflate.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-staging-x86_64/maxcso-system-libs.patch (from rev 1142706, maxcso/trunk/maxcso-system-libs.patch)
===================================================================
--- community-staging-x86_64/maxcso-system-libs.patch	                        (rev 0)
+++ community-staging-x86_64/maxcso-system-libs.patch	2022-03-06 16:06:07 UTC (rev 1142710)
@@ -0,0 +1,66 @@
+diff '--color=auto' -rupN maxcso.orig/Makefile maxcso/Makefile
+--- maxcso.orig/Makefile	2021-09-02 11:25:45.865244668 +0200
++++ maxcso/Makefile	2021-09-02 11:26:59.628790478 +0200
+@@ -10,20 +10,13 @@ CXXFLAGS ?= ${CXXFLAGS}
+ LDFLAGS ?= ${LDFLAGS}
+ 
+ SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1
+-SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \
+-	-Ilibdeflate -Wno-unused-parameter -Wno-unused-variable -pthread
++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 $@ $<
+@@ -31,16 +24,12 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
+ %.o: %.c
+ 	$(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $<
+ 
+-# TODO: Perhaps detect and use system libdeflate if available.
+-maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a libdeflate/libdeflate.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 -ldeflate
+ 
+ 7zip/7zip.a:
+ 	$(MAKE) -C 7zip 7zip.a
+ 
+-libdeflate/libdeflate.a:
+-	$(MAKE) -C libdeflate libdeflate.a
+-
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+@@ -54,7 +43,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 '--color=auto' -rupN maxcso.orig/src/sector.cpp maxcso/src/sector.cpp
+--- maxcso.orig/src/sector.cpp	2021-09-02 11:25:45.858577379 +0200
++++ maxcso/src/sector.cpp	2021-09-02 11:27:27.438050698 +0200
+@@ -3,7 +3,7 @@
+ #include "compress.h"
+ #include "cso.h"
+ #include "buffer_pool.h"
+-#include "zopfli/zopfli.h"
++#include "zopfli.h"
+ #include "libdeflate.h"
+ #ifndef NO_DEFLATE7Z
+ #include "deflate7z.h"

