Attachment 243564 Details for Bug 272676 – Patch for dzip

[patch] Patch for dzip

dzip-31.patch (text/plain), 4.54 KB, created by Daniel Engberg on 2023-07-23 10:56:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-07-23 10:56:58 UTC

Size: 4.54 KB

patch

obsolete

>diff --git a/archivers/dzip/Makefile b/archivers/dzip/Makefile
>index a5b584b37d2d..ef51193e14ea 100644
>--- a/archivers/dzip/Makefile
>+++ b/archivers/dzip/Makefile
>@@ -1,40 +1,29 @@
> PORTNAME=	dzip
>-PORTVERSION=	2.9
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	3.1
> CATEGORIES=	archivers games
>-MASTER_SITES=	http://speeddemosarchive.com/dzip/
>-DISTNAME=	dz${PORTVERSION:S/.//g}src
>+
>+PATCH_SITES=	https://github.com/kugelrund/${PORTNAME}/commit/
>+PATCHFILES=	92839ee4563a8a374ea45768a32cadd89432efc7.patch:-p1
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	File compression utility specializing in Quake demo compression
>-WWW=		https://speeddemosarchive.com/dzip/
>-
>-LICENSE=	ZLIB
>+WWW=		https://github.com/kugelrund/dzip
> 
>-USES=		cpe dos2unix zip
>+LICENSE=	MPL20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+USES=		cmake compiler:c++11-lang cpe
> CPE_VENDOR=	evan_wagner
> 
>-NO_WRKSUBDIR=	yes
>-MAKEFILE=	${WRKSRC}/Makefile.linux
>-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
>-ALL_TARGET=	${PORTNAME}
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	kugelrund
> 
> PLIST_FILES=	bin/${PORTNAME}
> PORTDOCS=	Readme
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-extract: .SILENT
>-	${REINPLACE_CMD} -e 's/ifdef BIG_ENDIAN/if BYTE_ORDER == BIG_ENDIAN/' \
>-		-e 's/ifndef BIG_ENDIAN/if BYTE_ORDER == LITTLE_ENDIAN/' \
>-			${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
>-	${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' \
>-		${WRKSRC}/dzip.h
>-	${REINPLACE_CMD} -e '21d;23d' ${WRKSRC}/dzipcon.h
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
>-
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>diff --git a/archivers/dzip/distinfo b/archivers/dzip/distinfo
>index 5c6e34708ad7..9eb768f936ab 100644
>--- a/archivers/dzip/distinfo
>+++ b/archivers/dzip/distinfo
>@@ -1,2 +1,5 @@
>-SHA256 (dz29src.zip) = de858f6a811096ebd099301cb4acd21eaf9eb1b3f95c1b21ec9e910bcf6f0f17
>-SIZE (dz29src.zip) = 100354
>+TIMESTAMP = 1690098385
>+SHA256 (kugelrund-dzip-v3.1_GH0.tar.gz) = 9f057e35ef5ddda1a0911b8f877a41b2934669377cb053b45364ddb72716b520
>+SIZE (kugelrund-dzip-v3.1_GH0.tar.gz) = 117213
>+SHA256 (92839ee4563a8a374ea45768a32cadd89432efc7.patch) = 32e0dc9fccc9da646b377f8a11622fb9e66833c425b5cf9c25d816099a2d17fa
>+SIZE (92839ee4563a8a374ea45768a32cadd89432efc7.patch) = 1684
>diff --git a/archivers/dzip/files/patch-crc32.c b/archivers/dzip/files/patch-crc32.c
>new file mode 100644
>index 000000000000..3bdeb4750777
>--- /dev/null
>+++ b/archivers/dzip/files/patch-crc32.c
>@@ -0,0 +1,29 @@
>+--- crc32.c.orig	2023-07-23 08:10:00 UTC
>++++ crc32.c
>+@@ -1,10 +1,12 @@
>++#include <stdint.h>
>++
>+ unsigned long crctable[256];
>+ unsigned long crcval;
>+ 
>+-unsigned long crc_reflect(unsigned long x, int bits)
>++unsigned long crc_reflect(uint32_t x, int bits)
>+ {
>+-	int i;
>+-	unsigned long v = 0, b = 1UL << (bits - 1);
>++	uint32_t i;
>++	uint32_t v = 0, b = 1 << (bits - 1);
>+ 
>+ 	for (i = 0; i < bits; i++)
>+ 	{
>+@@ -16,8 +18,8 @@ unsigned long crc_reflect(unsigned long x, int bits)
>+ 
>+ void crc_init(void)
>+ {
>+-	unsigned long crcpol = 0x04c11db7;
>+-	unsigned long i, j, k;
>++	uint32_t crcpol = 0x04c11db7;
>++	uint32_t i, j, k;
>+ 
>+ 	for (i = 0; i < 256; i++)
>+ 	{
>diff --git a/archivers/dzip/files/patch-delete.c b/archivers/dzip/files/patch-delete.c
>new file mode 100644
>index 000000000000..40379c580afb
>--- /dev/null
>+++ b/archivers/dzip/files/patch-delete.c
>@@ -0,0 +1,13 @@
>+--- delete.c.orig	2023-07-23 08:13:50 UTC
>++++ delete.c
>+@@ -87,9 +87,7 @@ void dzDeleteFiles (uInt *list, uInt num, void (*Progr
>+ 
>+ int intcmp (const void *arg1, const void *arg2)
>+ {
>+-	const uInt lhs = *(const uInt*)arg1;
>+-	const uInt rhs = *(const uInt*)arg2;
>+-	if (lhs < rhs) return -1;
>++	if (*(uInt *)arg1 < *(uInt *)arg2) return -1;
>+ 	return 1;
>+ }
>+ 
>diff --git a/archivers/dzip/files/patch-dzip.h b/archivers/dzip/files/patch-dzip.h
>new file mode 100644
>index 000000000000..9d0e3ee4d915
>--- /dev/null
>+++ b/archivers/dzip/files/patch-dzip.h
>@@ -0,0 +1,10 @@
>+--- dzip.h.orig	2023-07-23 07:59:50 UTC
>++++ dzip.h
>+@@ -1,6 +1,7 @@
>+ #include <stdint.h>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>++#include <machine/endian.h>
>+ #include <string.h>
>+ 
>+ #include <zlib.h>
>diff --git a/archivers/dzip/files/patch-dzipcon.h b/archivers/dzip/files/patch-dzipcon.h
>new file mode 100644
>index 000000000000..10397285308c
>--- /dev/null
>+++ b/archivers/dzip/files/patch-dzipcon.h
>@@ -0,0 +1,12 @@
>+--- dzipcon.h.orig	2023-07-23 08:01:13 UTC
>++++ dzipcon.h
>+@@ -18,9 +18,7 @@
>+ 	#include <unistd.h>
>+ 
>+ 	/* adjust if target platform supports large files */
>+-	#ifndef sparc
>+ 	#define stat64 stat
>+-	#endif
>+ 
>+ 	#define CreateDir(x) mkdir(x->name, 0x1ff)
>+

Actions: View | Diff

Attachments on bug 272676: 243564