[arch-commits] Commit in maxcso/repos/community-x86_64 (6 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Thu Sep 2 09:31:55 UTC 2021
Date: Thursday, September 2, 2021 @ 09:31:55
Author: alucryd
Revision: 1010548
archrelease: copy trunk to community-x86_64
Added:
maxcso/repos/community-x86_64/PKGBUILD
(from rev 1010547, maxcso/trunk/PKGBUILD)
maxcso/repos/community-x86_64/maxcso-system-flags.patch
(from rev 1010547, maxcso/trunk/maxcso-system-flags.patch)
maxcso/repos/community-x86_64/maxcso-system-libs.patch
(from rev 1010547, maxcso/trunk/maxcso-system-libs.patch)
Deleted:
maxcso/repos/community-x86_64/PKGBUILD
maxcso/repos/community-x86_64/maxcso-system-flags.patch
maxcso/repos/community-x86_64/maxcso-system-zopfli.patch
----------------------------+
PKGBUILD | 102 +++++++++++++++++++++----------------------
maxcso-system-flags.patch | 57 ++++++++++--------------
maxcso-system-libs.patch | 66 +++++++++++++++++++++++++++
maxcso-system-zopfli.patch | 69 -----------------------------
4 files changed, 141 insertions(+), 153 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-09-02 09:30:49 UTC (rev 1010547)
+++ PKGBUILD 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -1,51 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Gabriel Rauter <rauter.gabriel at gmail.com>
-
-pkgname=maxcso
-pkgver=1.12.0
-pkgrel=1
-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=d80e89540f75afc654ea191fa2d8c629189d90a2
- maxcso-system-flags.patch
- maxcso-system-zopfli.patch
-)
-sha256sums=('SKIP'
- '9500875013db8ad18350cc0a36751fec37de80cde06e91e2999a421e53af8416'
- 'ceae42c12bc686dba1dae8b0df1f32e6063ba25d7edebfaaa94af85a9e8f24f7')
-
-pkgver() {
- cd maxcso
-
- git describe --tags | sed 's/^v//'
-}
-
-prepare() {
- cd maxcso
-
- 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/PKGBUILD (from rev 1010547, maxcso/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -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=1
+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:
Deleted: maxcso-system-flags.patch
===================================================================
--- maxcso-system-flags.patch 2021-09-02 09:30:49 UTC (rev 1010547)
+++ maxcso-system-flags.patch 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -1,33 +0,0 @@
-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-flags.patch (from rev 1010547, maxcso/trunk/maxcso-system-flags.patch)
===================================================================
--- maxcso-system-flags.patch (rev 0)
+++ maxcso-system-flags.patch 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -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-x86_64/maxcso-system-libs.patch (from rev 1010547, maxcso/trunk/maxcso-system-libs.patch)
===================================================================
--- maxcso-system-libs.patch (rev 0)
+++ maxcso-system-libs.patch 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -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"
Deleted: maxcso-system-zopfli.patch
===================================================================
--- maxcso-system-zopfli.patch 2021-09-02 09:30:49 UTC (rev 1010547)
+++ maxcso-system-zopfli.patch 2021-09-02 09:31:55 UTC (rev 1010548)
@@ -1,69 +0,0 @@
-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
More information about the arch-commits
mailing list