[med-svn] [libzstd] 04/04: Refresh patches
Kevin Murray
daube-guest at moszumanska.debian.org
Tue Feb 2 06:39:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
daube-guest pushed a commit to branch master
in repository libzstd.
commit 59c9d9d0b1382941f26ac5b606834bbccad41a4a
Author: Kevin Murray <spam at kdmurray.id.au>
Date: Tue Feb 2 01:25:46 2016 +0200
Refresh patches
---
.../0003-Use-prefix-of-usr-not-usr-local.patch | 22 ++-
.../0004-Add-symlinks-for-extra-manpages.patch | 206 +++++++++++++++++++--
.../0005-Append-to-CPPFLAGS-don-t-overwrite.patch | 22 ++-
3 files changed, 218 insertions(+), 32 deletions(-)
diff --git a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
index 8780794..cc58173 100644
--- a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
+++ b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
@@ -7,9 +7,11 @@ Subject: Use prefix of /usr not /usr/local
programs/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -39,7 +39,7 @@
+Index: libzstd/lib/Makefile
+===================================================================
+--- libzstd.orig/lib/Makefile
++++ libzstd/lib/Makefile
+@@ -43,7 +43,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT))
VERSION?= $(LIBVER)
DESTDIR?=
@@ -17,15 +19,17 @@ Subject: Use prefix of /usr not /usr/local
+PREFIX ?= /usr
CPPFLAGS= -I.
CFLAGS ?= -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -33,7 +33,7 @@
- VERSION?= 0.4.5
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
+Index: libzstd/programs/Makefile
+===================================================================
+--- libzstd.orig/programs/Makefile
++++ libzstd/programs/Makefile
+@@ -42,7 +42,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT))
+ VERSION?= $(LIBVER)
DESTDIR?=
-PREFIX ?= /usr/local
+PREFIX ?= /usr
CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
CFLAGS ?= -O3 # -falign-loops=32 # not always beneficial
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
+ CFLAGS += -std=c99 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wstrict-prototypes -Wundef
diff --git a/debian/patches/0004-Add-symlinks-for-extra-manpages.patch b/debian/patches/0004-Add-symlinks-for-extra-manpages.patch
index 29fb824..e6d0d95 100644
--- a/debian/patches/0004-Add-symlinks-for-extra-manpages.patch
+++ b/debian/patches/0004-Add-symlinks-for-extra-manpages.patch
@@ -9,19 +9,197 @@ Subject: Add symlinks for extra manpages
create mode 120000 programs/unzstd.1
create mode 120000 programs/zstdcat.1
-diff --git a/programs/unzstd.1 b/programs/unzstd.1
-new file mode 120000
-index 0000000..e66191d
+Index: libzstd/programs/unzstd.1
+===================================================================
--- /dev/null
-+++ b/programs/unzstd.1
-@@ -0,0 +1 @@
-+zstd.1
-\ No newline at end of file
-diff --git a/programs/zstdcat.1 b/programs/zstdcat.1
-new file mode 120000
-index 0000000..e66191d
++++ libzstd/programs/unzstd.1
+@@ -0,0 +1,92 @@
++\"
++\" zstd.1: This is a manual page for 'zstd' program. This file is part of the
++\" zstd <http://www.zstd.net/> project.
++\" Author: Yann Collet
++\"
++
++\" No hyphenation
++.hy 0
++.nr HY 0
++
++.TH zstd "1" "2015-08-22" "zstd" "User Commands"
++.SH NAME
++\fBzstd, unzstd, zstdcat\fR - Compress or decompress .zst files
++
++.SH SYNOPSIS
++.TP 5
++\fBzstd\fR [\fBOPTIONS\fR] [-|INPUT-FILE] <OUTPUT-FILE>
++.PP
++.B unzstd
++is equivalent to
++.BR "zstd \-d"
++.br
++.B zstdcat
++is equivalent to
++.BR "zstd \-dc"
++.br
++
++.SH DESCRIPTION
++.PP
++\fBzstd\fR is a fast lossless compression algorithm.
++It is based on the \fBLZ77\fR family, with FSE & huff0 entropy stage.
++zstd offers compression speed > 200 MB/s per core.
++It also features a fast decoder, with speed > 500 MB/s per core.
++
++\fBzstd\fR command line is generally similar to gzip, but features the following differences :
++ - Original files are preserved
++ - By default, \fBzstd file1 file2\fR means : compress file1 \fBinto\fR file2.
++ Use \fB-m\fR command if you want : compress file1 into file1.zstd and file2 into file2.zst
++ - By default, when compressing files, \fBzstd\fR displays advancement notification and result summary.
++ Use \fB-q\fR to turn them off
++
++
++\fBzstd\fR supports the following options :
++
++.SH OPTIONS
++.TP
++.B \-#
++ # compression level [1-19](default:1)
++.TP
++.B \-d
++ decompression
++.TP
++.B \-f
++ overwrite output without prompting
++.TP
++.BR \-m ", " --multiple
++ multiple files mode
++ In this mode, multiple files on the command line means compression or decompression of each named file
++ Notifications are also turned off by default
++.TP
++.B \-D
++ Use next file as dictionary content for compress / decompression
++.TP
++.BR \-h/\-H ", " --help
++ display help/long help and exit
++.TP
++.BR \-V ", " --version
++ display Version number and exit
++.TP
++.BR \-v ", " --verbose
++ verbose mode
++.TP
++.BR \-q ", " --quiet
++ suppress warnings and notifications; specify twice to suppress errors too
++.TP
++.B \-c
++ force write to standard output, even if it is the console
++.TP
++.B \-z
++ force compression
++.TP
++.B \-b#
++ benchmark file(s) using compression level #
++.TP
++.B \-i#
++ iteration loops [1-9](default : 3), benchmark mode only
++
++.SH BUGS
++Report bugs at:- https://github.com/Cyan4973/zstd/issues
++
++.SH AUTHOR
++Yann Collet
+Index: libzstd/programs/zstdcat.1
+===================================================================
--- /dev/null
-+++ b/programs/zstdcat.1
-@@ -0,0 +1 @@
-+zstd.1
-\ No newline at end of file
++++ libzstd/programs/zstdcat.1
+@@ -0,0 +1,92 @@
++\"
++\" zstd.1: This is a manual page for 'zstd' program. This file is part of the
++\" zstd <http://www.zstd.net/> project.
++\" Author: Yann Collet
++\"
++
++\" No hyphenation
++.hy 0
++.nr HY 0
++
++.TH zstd "1" "2015-08-22" "zstd" "User Commands"
++.SH NAME
++\fBzstd, unzstd, zstdcat\fR - Compress or decompress .zst files
++
++.SH SYNOPSIS
++.TP 5
++\fBzstd\fR [\fBOPTIONS\fR] [-|INPUT-FILE] <OUTPUT-FILE>
++.PP
++.B unzstd
++is equivalent to
++.BR "zstd \-d"
++.br
++.B zstdcat
++is equivalent to
++.BR "zstd \-dc"
++.br
++
++.SH DESCRIPTION
++.PP
++\fBzstd\fR is a fast lossless compression algorithm.
++It is based on the \fBLZ77\fR family, with FSE & huff0 entropy stage.
++zstd offers compression speed > 200 MB/s per core.
++It also features a fast decoder, with speed > 500 MB/s per core.
++
++\fBzstd\fR command line is generally similar to gzip, but features the following differences :
++ - Original files are preserved
++ - By default, \fBzstd file1 file2\fR means : compress file1 \fBinto\fR file2.
++ Use \fB-m\fR command if you want : compress file1 into file1.zstd and file2 into file2.zst
++ - By default, when compressing files, \fBzstd\fR displays advancement notification and result summary.
++ Use \fB-q\fR to turn them off
++
++
++\fBzstd\fR supports the following options :
++
++.SH OPTIONS
++.TP
++.B \-#
++ # compression level [1-19](default:1)
++.TP
++.B \-d
++ decompression
++.TP
++.B \-f
++ overwrite output without prompting
++.TP
++.BR \-m ", " --multiple
++ multiple files mode
++ In this mode, multiple files on the command line means compression or decompression of each named file
++ Notifications are also turned off by default
++.TP
++.B \-D
++ Use next file as dictionary content for compress / decompression
++.TP
++.BR \-h/\-H ", " --help
++ display help/long help and exit
++.TP
++.BR \-V ", " --version
++ display Version number and exit
++.TP
++.BR \-v ", " --verbose
++ verbose mode
++.TP
++.BR \-q ", " --quiet
++ suppress warnings and notifications; specify twice to suppress errors too
++.TP
++.B \-c
++ force write to standard output, even if it is the console
++.TP
++.B \-z
++ force compression
++.TP
++.B \-b#
++ benchmark file(s) using compression level #
++.TP
++.B \-i#
++ iteration loops [1-9](default : 3), benchmark mode only
++
++.SH BUGS
++Report bugs at:- https://github.com/Cyan4973/zstd/issues
++
++.SH AUTHOR
++Yann Collet
diff --git a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
index f240954..02de3f6 100644
--- a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
+++ b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
@@ -7,9 +7,11 @@ Subject: Append to CPPFLAGS, don't overwrite
programs/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -40,8 +40,8 @@
+Index: libzstd/lib/Makefile
+===================================================================
+--- libzstd.orig/lib/Makefile
++++ libzstd/lib/Makefile
+@@ -44,8 +44,8 @@ VERSION?= $(LIBVER)
DESTDIR?=
PREFIX ?= /usr
@@ -17,19 +19,21 @@ Subject: Append to CPPFLAGS, don't overwrite
-CFLAGS ?= -O3
+CPPFLAGS += -I.
+CFLAGS += -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -34,8 +34,8 @@
+Index: libzstd/programs/Makefile
+===================================================================
+--- libzstd.orig/programs/Makefile
++++ libzstd/programs/Makefile
+@@ -43,8 +43,8 @@ VERSION?= $(LIBVER)
DESTDIR?=
PREFIX ?= /usr
-CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
-CFLAGS ?= -O3 # -falign-loops=32 # not always beneficial
+CPPFLAGS += -I../lib -DZSTD_VERSION=\"$(VERSION)\"
-+CFLAGS += -O3 # -falign-loops=32 # not always beneficial
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
++CFLAGS += -O3 # -falign-loops=32 # not always beneficial
+ CFLAGS += -std=c99 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wstrict-prototypes -Wundef
FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git
More information about the debian-med-commit
mailing list