pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/freeimage
Module Name: pkgsrc
Committed By: he
Date: Tue Dec 26 11:55:02 UTC 2017
Modified Files:
pkgsrc/graphics/freeimage: Makefile distinfo
pkgsrc/graphics/freeimage/patches:
patch-Source_LibOpenJPEG_opj__malloc.h
Added Files:
pkgsrc/graphics/freeimage/patches:
patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c
patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c
Log Message:
Add a couple of patches to adapt to newer C++ where R"some string" now
has special meaning, and add a comment to an existing patch.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/freeimage/Makefile \
pkgsrc/graphics/freeimage/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c \
pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/freeimage/Makefile
diff -u pkgsrc/graphics/freeimage/Makefile:1.5 pkgsrc/graphics/freeimage/Makefile:1.6
--- pkgsrc/graphics/freeimage/Makefile:1.5 Fri Aug 11 15:26:20 2017
+++ pkgsrc/graphics/freeimage/Makefile Tue Dec 26 11:55:01 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/08/11 15:26:20 nros Exp $
+# $NetBSD: Makefile,v 1.6 2017/12/26 11:55:01 he Exp $
DISTNAME= FreeImage3170
PKGNAME= freeimage-3.17.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeimage/}
EXTRACT_SUFX= .zip
Index: pkgsrc/graphics/freeimage/distinfo
diff -u pkgsrc/graphics/freeimage/distinfo:1.5 pkgsrc/graphics/freeimage/distinfo:1.6
--- pkgsrc/graphics/freeimage/distinfo:1.5 Sat Jul 8 08:08:25 2017
+++ pkgsrc/graphics/freeimage/distinfo Tue Dec 26 11:55:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/07/08 08:08:25 nros Exp $
+$NetBSD: distinfo,v 1.6 2017/12/26 11:55:01 he Exp $
SHA1 (FreeImage3170.zip) = 6752c83798c2f81dee71a2e8bb11657068672669
RMD160 (FreeImage3170.zip) = c4e87846098327ee346c49ae81b6036f6d9ab36d
@@ -8,4 +8,6 @@ SHA1 (patch-Makefile) = 196331f954913d5b
SHA1 (patch-Makefile.fip) = c12dd636f83f774a11c91c4e3373176fd27e562d
SHA1 (patch-Source_FreeImage_PluginPCX.cpp) = 26853626d1dc6a52804f946fd0576269de380512
SHA1 (patch-Source_FreeImage_PluginXPM.cpp) = eac7be24c3d64593feebdb548df8a404db66c113
-SHA1 (patch-Source_LibOpenJPEG_opj__malloc.h) = 4ba7924e5ce04b98c9c249bc31df600b7fbdcde3
+SHA1 (patch-Source_LibOpenJPEG_opj__malloc.h) = 7e8b65d17cf1f0ed295964d477b96acac56bd927
+SHA1 (patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c) = 9725fa20d545e6482f4396487b70c104ddb37ce6
+SHA1 (patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c) = bd569e2b2fa7b79a3651f53352fc8e5d26d0b2d3
Index: pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h
diff -u pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h:1.1 pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h:1.2
--- pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h:1.1 Thu Feb 12 22:40:05 2015
+++ pkgsrc/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj__malloc.h Tue Dec 26 11:55:01 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-Source_LibOpenJPEG_opj__malloc.h,v 1.1 2015/02/12 22:40:05 snj Exp $
+$NetBSD: patch-Source_LibOpenJPEG_opj__malloc.h,v 1.2 2017/12/26 11:55:01 he Exp $
+
+Add a case for NetBSD.
--- Source/LibOpenJPEG/opj_malloc.h.orig 2015-02-12 12:40:33.000000000 -0800
+++ Source/LibOpenJPEG/opj_malloc.h 2015-02-12 12:42:08.000000000 -0800
Added files:
Index: pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c
diff -u /dev/null pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c:1.1
--- /dev/null Tue Dec 26 11:55:02 2017
+++ pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c Tue Dec 26 11:55:01 2017
@@ -0,0 +1,44 @@
+$NetBSD: patch-Source_LibWebP_src_dsp_dsp.upsampling_mips_dsp_r2.c,v 1.1 2017/12/26 11:55:01 he Exp $
+
+Adapt to newer C++ where R"some string" has new meaning.
+
+--- Source/LibWebP/./src/dsp/dsp.upsampling_mips_dsp_r2.c.orig 2015-02-20 02:34:36.000000000 +0000
++++ Source/LibWebP/./src/dsp/dsp.upsampling_mips_dsp_r2.c
+@@ -21,29 +21,29 @@
+
+ #if !defined(WEBP_YUV_USE_TABLE)
+
+-#define YUV_TO_RGB(Y, U, V, R, G, B) do { \
++#define YUV_TO_RGB(Y, U, V, Red, G, B) do { \
+ const int t1 = kYScale * Y; \
+ const int t2 = kVToG * V; \
+- R = kVToR * V; \
++ Red = kVToR * V; \
+ G = kUToG * U; \
+ B = kUToB * U; \
+- R = t1 + R; \
++ Red = t1 + Red; \
+ G = t1 - G; \
+ B = t1 + B; \
+- R = R + kRCst; \
++ Red = Red + kRCst; \
+ G = G - t2 + kGCst; \
+ B = B + kBCst; \
+ __asm__ volatile ( \
+- "shll_s.w %["#R"], %["#R"], 9 \n\t" \
++ "shll_s.w %["#Red"], %["#Red"], 9 \n\t" \
+ "shll_s.w %["#G"], %["#G"], 9 \n\t" \
+ "shll_s.w %["#B"], %["#B"], 9 \n\t" \
+- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \
++ "precrqu_s.qb.ph %["#Red"], %["#Red"], $zero \n\t" \
+ "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \
+ "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \
+- "srl %["#R"], %["#R"], 24 \n\t" \
++ "srl %["#Red"], %["#Red"], 24 \n\t" \
+ "srl %["#G"], %["#G"], 24 \n\t" \
+ "srl %["#B"], %["#B"], 24 \n\t" \
+- : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \
++ : [Red]"+r"(Red), [G]"+r"(G), [B]"+r"(B) \
+ : \
+ ); \
+ } while (0)
Index: pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c
diff -u /dev/null pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c:1.1
--- /dev/null Tue Dec 26 11:55:02 2017
+++ pkgsrc/graphics/freeimage/patches/patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c Tue Dec 26 11:55:01 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-Source_LibWebP_src_dsp_dsp.yuv_mips_dsp_r2.c,v 1.1 2017/12/26 11:55:01 he Exp $
+
+Adapt to newer C++ where R"some string" has new meaning.
+
+--- Source/LibWebP/./src/dsp/dsp.yuv_mips_dsp_r2.c.orig 2015-02-20 02:34:38.000000000 +0000
++++ Source/LibWebP/./src/dsp/dsp.yuv_mips_dsp_r2.c
+@@ -35,7 +35,7 @@
+ "addu %[temp2], %[temp2], %[temp3] \n\t" \
+ "addu %[temp4], %[temp4], %[t_con_8] \n\t" \
+
+-#define ROW_FUNC_PART_2(R, G, B, K) \
++#define ROW_FUNC_PART_2(Red, G, B, K) \
+ "addu %[temp5], %[temp0], %[temp1] \n\t" \
+ "subu %[temp6], %[temp0], %[temp2] \n\t" \
+ "addu %[temp7], %[temp0], %[temp4] \n\t" \
+@@ -54,7 +54,7 @@
+ "srl %[temp5], %[temp5], 24 \n\t" \
+ "srl %[temp6], %[temp6], 24 \n\t" \
+ "srl %[temp7], %[temp7], 24 \n\t" \
+- "sb %[temp5], "#R"(%[dst]) \n\t" \
++ "sb %[temp5], "#Red"(%[dst]) \n\t" \
+ "sb %[temp6], "#G"(%[dst]) \n\t" \
+ "sb %[temp7], "#B"(%[dst]) \n\t" \
+
Home |
Main Index |
Thread Index |
Old Index