openkylin
/
libwebp
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 01:26:14 +08:00
parent 8d51a8678f
commit 8301e9dc0e
3 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
debian/patches/big-endian vendored
View File

@ -1,20 +1,23 @@
Description: big endian fixes
Webp 0.6.1 was totally busted on big endian machines. Backporting
the fixes, which will be part of 0.6.2. Close coordination with
upstream for this.
From: Jeff Breidenbach <jab@debian.org>
Date: Sat, 14 May 2022 01:26:14 +0800
Subject: big endian fixes
Webp 0.6.1 was totally busted on big endian machines. Backporting
the fixes, which will be part of 0.6.2. Close coordination with
upstream for this.
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
imageio/webpdec.c | 8 ++++++
src/dsp/alpha_processing.c | 20 +++++++++++++++
src/dsp/alpha_processing_mips_dsp_r2.c | 46 ++++++++++++++++++++++++++++++++++
src/dsp/dsp.h | 14 +++++++++++
src/enc/picture_csp_enc.c | 37 +++++++++++++++++----------
src/utils/endian_inl_utils.h | 7 ------
6 files changed, 112 insertions(+), 20 deletions(-)
Origin: upstream
Forwarded: yes
Reviewed-By: James Zern, Jeff Breidenbach
Last-Update: 2018-02-23
--- libwebp-0.6.1.orig/imageio/webpdec.c
+++ libwebp-0.6.1/imageio/webpdec.c
diff --git a/imageio/webpdec.c b/imageio/webpdec.c
index f49a91a..06c72ba 100644
--- a/imageio/webpdec.c
+++ b/imageio/webpdec.c
@@ -9,6 +9,10 @@
//
// WebP decode.
@ -26,7 +29,7 @@ Last-Update: 2018-02-23
#include "./webpdec.h"
#include <stdio.h>
@@ -162,7 +166,11 @@ int ReadWebP(const uint8_t* const data,
@@ -162,7 +166,11 @@ int ReadWebP(const uint8_t* const data, size_t data_size,
break;
}
if (pic->use_argb) {
@ -38,9 +41,11 @@ Last-Update: 2018-02-23
output_buffer->u.RGBA.rgba = (uint8_t*)pic->argb;
output_buffer->u.RGBA.stride = pic->argb_stride * sizeof(uint32_t);
output_buffer->u.RGBA.size = output_buffer->u.RGBA.stride * pic->height;
--- libwebp-0.6.1.orig/src/dsp/alpha_processing.c
+++ libwebp-0.6.1/src/dsp/alpha_processing.c
@@ -366,6 +366,16 @@ static WEBP_INLINE uint32_t MakeARGB32(i
diff --git a/src/dsp/alpha_processing.c b/src/dsp/alpha_processing.c
index 590e3bc..995b434 100644
--- a/src/dsp/alpha_processing.c
+++ b/src/dsp/alpha_processing.c
@@ -366,6 +366,16 @@ static WEBP_INLINE uint32_t MakeARGB32(int a, int r, int g, int b) {
return (((uint32_t)a << 24) | (r << 16) | (g << 8) | b);
}
@ -57,7 +62,7 @@ Last-Update: 2018-02-23
static void PackRGB_C(const uint8_t* r, const uint8_t* g, const uint8_t* b,
int len, int step, uint32_t* out) {
int i, offset = 0;
@@ -381,6 +391,10 @@ int (*WebPDispatchAlpha)(const uint8_t*,
@@ -381,6 +391,10 @@ int (*WebPDispatchAlpha)(const uint8_t*, int, int, int, uint8_t*, int);
void (*WebPDispatchAlphaToGreen)(const uint8_t*, int, int, int, uint32_t*, int);
int (*WebPExtractAlpha)(const uint8_t*, int, int, int, uint8_t*, int);
void (*WebPExtractGreen)(const uint32_t* argb, uint8_t* alpha, int size);
@ -68,7 +73,7 @@ Last-Update: 2018-02-23
void (*WebPPackRGB)(const uint8_t* r, const uint8_t* g, const uint8_t* b,
int len, int step, uint32_t* out);
@@ -405,6 +419,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitA
@@ -405,6 +419,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitAlphaProcessing(void) {
WebPMultRow = WebPMultRow_C;
WebPApplyAlphaMultiply4444 = ApplyAlphaMultiply_16b_C;
@ -78,7 +83,7 @@ Last-Update: 2018-02-23
WebPPackRGB = PackRGB_C;
#if !WEBP_NEON_OMIT_C_CODE
WebPApplyAlphaMultiply = ApplyAlphaMultiply_C;
@@ -451,6 +468,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitA
@@ -451,6 +468,9 @@ WEBP_TSAN_IGNORE_FUNCTION void WebPInitAlphaProcessing(void) {
assert(WebPDispatchAlphaToGreen != NULL);
assert(WebPExtractAlpha != NULL);
assert(WebPExtractGreen != NULL);
@ -88,9 +93,11 @@ Last-Update: 2018-02-23
assert(WebPPackRGB != NULL);
assert(WebPHasAlpha8b != NULL);
assert(WebPHasAlpha32b != NULL);
--- libwebp-0.6.1.orig/src/dsp/alpha_processing_mips_dsp_r2.c
+++ libwebp-0.6.1/src/dsp/alpha_processing_mips_dsp_r2.c
@@ -125,6 +125,49 @@ static void MultARGBRow_MIPSdspR2(uint32
diff --git a/src/dsp/alpha_processing_mips_dsp_r2.c b/src/dsp/alpha_processing_mips_dsp_r2.c
index e0dc91b..0090e87 100644
--- a/src/dsp/alpha_processing_mips_dsp_r2.c
+++ b/src/dsp/alpha_processing_mips_dsp_r2.c
@@ -125,6 +125,49 @@ static void MultARGBRow_MIPSdspR2(uint32_t* const ptr, int width,
}
}
@ -140,7 +147,7 @@ Last-Update: 2018-02-23
static void PackRGB_MIPSdspR2(const uint8_t* r, const uint8_t* g,
const uint8_t* b, int len, int step,
uint32_t* out) {
@@ -172,6 +215,9 @@ extern void WebPInitAlphaProcessingMIPSd
@@ -172,6 +215,9 @@ extern void WebPInitAlphaProcessingMIPSdspR2(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPInitAlphaProcessingMIPSdspR2(void) {
WebPDispatchAlpha = DispatchAlpha_MIPSdspR2;
WebPMultARGBRow = MultARGBRow_MIPSdspR2;
@ -150,8 +157,10 @@ Last-Update: 2018-02-23
WebPPackRGB = PackRGB_MIPSdspR2;
}
--- libwebp-0.6.1.orig/src/dsp/dsp.h
+++ libwebp-0.6.1/src/dsp/dsp.h
diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
index 99eefe0..5146949 100644
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@@ -166,6 +166,13 @@ extern "C" {
#define WEBP_SWAP_16BIT_CSP 0
#endif
@ -166,7 +175,7 @@ Last-Update: 2018-02-23
typedef enum {
kSSE2,
kSSE3,
@@ -578,6 +585,13 @@ void WebPMultRow_C(uint8_t* const ptr, c
@@ -578,6 +585,13 @@ void WebPMultRow_C(uint8_t* const ptr, const uint8_t* const alpha,
int width, int inverse);
void WebPMultARGBRow_C(uint32_t* const ptr, int width, int inverse);
@ -180,8 +189,10 @@ Last-Update: 2018-02-23
// RGB packing function. 'step' can be 3 or 4. r/g/b input is rgb or bgr order.
extern void (*WebPPackRGB)(const uint8_t* r, const uint8_t* g, const uint8_t* b,
int len, int step, uint32_t* out);
--- libwebp-0.6.1.orig/src/enc/picture_csp_enc.c
+++ libwebp-0.6.1/src/enc/picture_csp_enc.c
diff --git a/src/enc/picture_csp_enc.c b/src/enc/picture_csp_enc.c
index d531dd0..415022d 100644
--- a/src/enc/picture_csp_enc.c
+++ b/src/enc/picture_csp_enc.c
@@ -28,11 +28,11 @@
// If defined, use table to compute x / alpha.
#define USE_INVERSE_ALPHA_TABLE
@ -199,7 +210,7 @@ Last-Update: 2018-02-23
//------------------------------------------------------------------------------
// Detection of non-trivial transparency
@@ -61,7 +61,7 @@ int WebPPictureHasTransparency(const Web
@@ -61,7 +61,7 @@ int WebPPictureHasTransparency(const WebPPicture* picture) {
return CheckNonOpaque(picture->a, picture->width, picture->height,
1, picture->a_stride);
} else {
@ -208,7 +219,7 @@ Last-Update: 2018-02-23
return CheckNonOpaque((const uint8_t*)picture->argb + alpha_offset,
picture->width, picture->height,
4, picture->argb_stride * sizeof(*picture->argb));
@@ -990,10 +990,10 @@ static int PictureARGBToYUVA(WebPPicture
@@ -990,10 +990,10 @@ static int PictureARGBToYUVA(WebPPicture* picture, WebPEncCSP colorspace,
return WebPEncodingSetError(picture, VP8_ENC_ERROR_INVALID_CONFIGURATION);
} else {
const uint8_t* const argb = (const uint8_t*)picture->argb;
@ -223,7 +234,7 @@ Last-Update: 2018-02-23
picture->colorspace = WEBP_YUV420;
return ImportYUVAFromRGBA(r, g, b, a, 4, 4 * picture->argb_stride,
@@ -1044,7 +1044,8 @@ int WebPPictureYUVAToARGB(WebPPicture* p
@@ -1044,7 +1044,8 @@ int WebPPictureYUVAToARGB(WebPPicture* picture) {
const int argb_stride = 4 * picture->argb_stride;
uint8_t* dst = (uint8_t*)picture->argb;
const uint8_t *cur_u = picture->u, *cur_v = picture->v, *cur_y = picture->y;
@ -233,7 +244,7 @@ Last-Update: 2018-02-23
// First row, with replicated top samples.
upsample(cur_y, NULL, cur_u, cur_v, cur_u, cur_v, dst, NULL, width);
@@ -1087,6 +1088,7 @@ static int Import(WebPPicture* const pic
@@ -1087,6 +1088,7 @@ static int Import(WebPPicture* const picture,
const uint8_t* rgb, int rgb_stride,
int step, int swap_rb, int import_alpha) {
int y;
@ -241,7 +252,7 @@ Last-Update: 2018-02-23
const uint8_t* r_ptr = rgb + (swap_rb ? 2 : 0);
const uint8_t* g_ptr = rgb + 1;
const uint8_t* b_ptr = rgb + (swap_rb ? 0 : 2);
@@ -1104,16 +1106,25 @@ static int Import(WebPPicture* const pic
@@ -1104,16 +1106,25 @@ static int Import(WebPPicture* const picture,
WebPInitAlphaProcessing();
if (import_alpha) {
@ -269,8 +280,10 @@ Last-Update: 2018-02-23
}
rgb += rgb_stride;
dst += picture->argb_stride;
--- libwebp-0.6.1.orig/src/utils/endian_inl_utils.h
+++ libwebp-0.6.1/src/utils/endian_inl_utils.h
diff --git a/src/utils/endian_inl_utils.h b/src/utils/endian_inl_utils.h
index 4b2f91d..3630a29 100644
--- a/src/utils/endian_inl_utils.h
+++ b/src/utils/endian_inl_utils.h
@@ -19,13 +19,6 @@
#include "src/dsp/dsp.h"
#include "src/webp/types.h"

21
debian/patches/fix-lintian-warning vendored
View File

@ -1,15 +1,22 @@
Description: Fix lintian warning on manpage
Fix this lintian warning
manpage-has-errors-from-man
usr/share/man/man1/img2webp.1.gz 44: warning: macro `loop' not defined
From: Jeff Breidenbach <jab@debian.org>
Date: Sat, 14 May 2022 01:26:14 +0800
Subject: Fix lintian warning on manpage
Fix this lintian warning
manpage-has-errors-from-man
usr/share/man/man1/img2webp.1.gz 44: warning: macro `loop' not defined
Origin: other
Reviewed-By: Jeff Breidenbach <jab@debian.org>
Last-Update: 2018-03-01
---
man/img2webp.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- libwebp-0.6.1.orig/man/img2webp.1
+++ libwebp-0.6.1/man/img2webp.1
@@ -40,8 +40,8 @@ lossy or lossless compression for each f
diff --git a/man/img2webp.1 b/man/img2webp.1
index 835ca37..c12e240 100644
--- a/man/img2webp.1
+++ b/man/img2webp.1
@@ -40,8 +40,8 @@ lossy or lossless compression for each frame heuristically. This global
option disables the local option \fB-lossy\fP and \fB-lossless\fP .
.TP
.BI \-loop " int

38
debian/patches/soname_override vendored
View File

@ -1,28 +1,22 @@
Description: <short summary of the patch>
Upstream bumped soname, but didn't break ABI. Bump them back down
so we can avoid a package transition.
.
libwebp (0.6.0-1) unstable; urgency=medium
.
* New upstream release
Author: Jeff Breidenbach <jab@debian.org>
From: Jeff Breidenbach <jab@debian.org>
Date: Sat, 14 May 2022 01:26:14 +0800
Subject: <short summary of the patch>
Upstream bumped soname, but didn't break ABI. Bump them back down
so we can avoid a package transition.
libwebp (0.6.0-1) unstable; urgency=medium
* New upstream release
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- libwebp-0.6.0.orig/src/Makefile.am
+++ libwebp-0.6.0/src/Makefile.am
@@ -35,7 +35,7 @@ libwebp_la_LIBADD += utils/libwebputils.
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b5f26d..e6f6591 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ libwebp_la_LIBADD += utils/libwebputils.la
# other than the ones listed on the command line, i.e., after linking, it will
# not have unresolved symbols. Some platforms (Windows among them) require all
# symbols in shared libraries to be resolved at library creation.