Re: UPDATE archivers/zopfli
On Sat, Jun 09 2018, Jeremie Courreges-Anglas wrote:
> On Sat, Jun 09 2018, Björn Ketelaars wrote:
>> Enclosed diff brings zopfli to 1.0.2, which fixes some bugs. If
>> I understand [0] correctly, this version should build, and work on the
>> previously excluded m88k. However, I'm unable to test.
>>
>> Built, and tested on amd64.
>>
>> Comments/OKs?
>
> ok jca@
I gave it a try on sparc64, where it crashes (SIGBUS). This already
happens with the in-tree version. The diff below works around the
problem (not portable, shouldn't be pushed upstream as-is). Feel free
to add it to your update.
Index: patches/patch-src_zopfli_lz77_c
===
--- /dev/null
+++ patches/patch-src_zopfli_lz77_c
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Unbreak on architectures with strict alignement requirements.
+
+Index: src/zopfli/lz77.c
+--- src/zopfli/lz77.c.orig
src/zopfli/lz77.c
+@@ -299,6 +299,7 @@ static const unsigned char* GetMatch(const unsigned ch
+ const unsigned char* end,
+ const unsigned char* safe_end) {
+
++#ifndef __STRICT_ALIGNMENT
+ if (sizeof(size_t) == 8) {
+ /* 8 checks at once per array bounds check (size_t is 64-bit). */
+ while (scan < safe_end && *((size_t*)scan) == *((size_t*)match)) {
+@@ -312,7 +313,9 @@ static const unsigned char* GetMatch(const unsigned ch
+ scan += 4;
+ match += 4;
+ }
+- } else {
++ } else
++#endif /* ! __STRICT_ALIGNMENT */
++ {
+ /* do 8 checks at once per array bounds check. */
+ while (scan < safe_end && *scan == *match && *++scan == *++match
+ && *++scan == *++match && *++scan == *++match
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE archivers/zopfli
On Sat, Jun 09 2018, Björn Ketelaars wrote: > Enclosed diff brings zopfli to 1.0.2, which fixes some bugs. If > I understand [0] correctly, this version should build, and work on the > previously excluded m88k. However, I'm unable to test. > > Built, and tested on amd64. > > Comments/OKs? ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
UPDATE archivers/zopfli
Enclosed diff brings zopfli to 1.0.2, which fixes some bugs. If
I understand [0] correctly, this version should build, and work on the
previously excluded m88k. However, I'm unable to test.
Built, and tested on amd64.
Comments/OKs?
[0]
https://github.com/google/zopfli/commit/2270ffe3c107345d983b66b1f26a80b7ab528ac4#diff-53ba42f17ad54bd8994b702d97593987
Index: Makefile
===
RCS file: /cvs/ports/archivers/zopfli/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile18 Apr 2017 13:09:23 - 1.4
+++ Makefile9 Jun 2018 04:55:08 -
@@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2017/04/18 13:09:23 sthen Exp $
-# __builtin_clz
-NOT_FOR_ARCHS= ${GCC3_ARCHS}
-
COMMENT = deflate-compatible compression format
GH_ACCOUNT = google
GH_PROJECT = zopfli
-GH_TAGNAME = zopfli-1.0.1
+GH_TAGNAME = zopfli-1.0.2
DISTNAME = ${GH_TAGNAME}
CATEGORIES = archivers
Index: distinfo
===
RCS file: /cvs/ports/archivers/zopfli/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Apr 2017 13:09:23 - 1.3
+++ distinfo9 Jun 2018 04:55:08 -
@@ -1,2 +1,2 @@
-SHA256 (zopfli-1.0.1.tar.gz) = KXQ9cnpODs0bk+C/iUds7rZi6AmrLmqwB6CwNEgA6bQ=
-SIZE (zopfli-1.0.1.tar.gz) = 128178
+SHA256 (zopfli-1.0.2.tar.gz) = SlcDB8NxctiU7E75O26OOqzEAeeMvMUc+FshLbw3mlU=
+SIZE (zopfli-1.0.2.tar.gz) = 136035
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/archivers/zopfli/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile 18 Apr 2017 13:09:23 - 1.1
+++ patches/patch-Makefile 9 Jun 2018 04:55:08 -
@@ -1,13 +1,14 @@
$OpenBSD: patch-Makefile,v 1.1 2017/04/18 13:09:23 sthen Exp $
Makefile.orig Tue Apr 18 14:06:16 2017
-+++ Makefile Tue Apr 18 14:06:23 2017
+Index: Makefile
+--- Makefile.orig
Makefile
@@ -1,8 +1,8 @@
CC = gcc
CXX = g++
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS)
++CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS)
-Wno-unused-function
+CXXFLAGS = -W -Wall -Wextra -ansi -pedantic $(COPTFLAGS)
ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
UPDATE: archivers/zopfli
Going through portroach (maintainer: ports@openbsd.org). Starting small...
Attached patch for archivers/zopfli to latest version
ok?
Index: Makefile
===
RCS file: /cvs/ports/archivers/zopfli/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile18 Apr 2017 13:09:23 - 1.4
+++ Makefile5 Jun 2018 22:51:34 -
@@ -7,7 +7,7 @@ COMMENT = deflate-compatible compressio
GH_ACCOUNT = google
GH_PROJECT = zopfli
-GH_TAGNAME = zopfli-1.0.1
+GH_TAGNAME = zopfli-1.0.2
DISTNAME = ${GH_TAGNAME}
CATEGORIES = archivers
Index: distinfo
===
RCS file: /cvs/ports/archivers/zopfli/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Apr 2017 13:09:23 - 1.3
+++ distinfo5 Jun 2018 22:51:34 -
@@ -1,2 +1,2 @@
-SHA256 (zopfli-1.0.1.tar.gz) = KXQ9cnpODs0bk+C/iUds7rZi6AmrLmqwB6CwNEgA6bQ=
-SIZE (zopfli-1.0.1.tar.gz) = 128178
+SHA256 (zopfli-1.0.2.tar.gz) = SlcDB8NxctiU7E75O26OOqzEAeeMvMUc+FshLbw3mlU=
+SIZE (zopfli-1.0.2.tar.gz) = 136035
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/archivers/zopfli/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile 18 Apr 2017 13:09:23 - 1.1
+++ patches/patch-Makefile 5 Jun 2018 22:51:34 -
@@ -4,10 +4,10 @@ $OpenBSD: patch-Makefile,v 1.1 2017/04/1
@@ -1,8 +1,8 @@
CC = gcc
CXX = g++
-
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
+
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS)
++CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -Wno-unused-function
$(COPTFLAGS)
+CXXFLAGS = -W -Wall -Wextra -ansi -pedantic $(COPTFLAGS)
ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
