summaryrefslogtreecommitdiff
path: root/dev-perl/Tk-JPEG-Lite
diff options
context:
space:
mode:
Diffstat (limited to 'dev-perl/Tk-JPEG-Lite')
-rw-r--r--dev-perl/Tk-JPEG-Lite/Manifest3
-rw-r--r--dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r2.ebuild (renamed from dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild)16
-rw-r--r--dev-perl/Tk-JPEG-Lite/files/Tk-JPEG-Lite-2.15.0-Modernize-C.patch32
3 files changed, 46 insertions, 5 deletions
diff --git a/dev-perl/Tk-JPEG-Lite/Manifest b/dev-perl/Tk-JPEG-Lite/Manifest
index dd25b1f2f8f0..187e312c2fca 100644
--- a/dev-perl/Tk-JPEG-Lite/Manifest
+++ b/dev-perl/Tk-JPEG-Lite/Manifest
@@ -1,3 +1,4 @@
+AUX Tk-JPEG-Lite-2.15.0-Modernize-C.patch 1377 BLAKE2B d20eae14836cb8d834826b3d1bec8e9d71c2bb81f48810c1e75dc4c9da17ca947b997909db1dac26ba7e79d44b20a2de166938e4681c3dd7a38bd8c1a1f50dab SHA512 e5fe9366e2215ed240c3c0f8dbe098b04123b86e9d16016586acc190872abe3e83b660d949e84215df694374fed6ddb1284acb22ea117e7af01c0b3d4b7c88b5
DIST Tk-JPEG-Lite-2.015.tar.gz 21406 BLAKE2B a9499ef3a8fdec43d184e385885ca18926f70f972b47bc3871b15bf7660e22cd8477ee04c9eaa66548cf435055d283428134523cfd67c33f6bfb4a3e8667635d SHA512 959586f7cdfa516fc05eac352d626367fc5cf37f452713afea1d87e017f427c15c425a722e66db66d90dc98f942831e5437a4c8a2aac3179824105481a28c1a8
-EBUILD Tk-JPEG-Lite-2.15.0-r1.ebuild 451 BLAKE2B 8c8a858bab2f6a5d207400ea597bbbfa01f8c325e61be75a774370ba735e79f6c7d2e1516e3ca19ec31762c25d6d892a6f28e925856f41740e493770ecd74bd6 SHA512 1aaeab84c29615576fabacecde088138458f2c9492f67061ecab0db47ca149e7eedacbeb7ba49b8dfac40c7852ac389316f3cb27f788d509ee4ff581a25a9c3d
+EBUILD Tk-JPEG-Lite-2.15.0-r2.ebuild 520 BLAKE2B d8b6fa0aedfac2fd026378584cb8a0bcbe0eccfc213e3880089249a41d94406d98c6b488fb3ca52c59d454606cc19190b37820322f54946c841a4c92f51a532f SHA512 0e77461496ce5edcfe83d6d3dcae39b6b4a7a44201ff24da9aa9b1bb44a6339fee65cd7c976e79a362d8e5885379fec999ad6ef9f8d95c2ff22c8b1cd794ca20
MISC metadata.xml 398 BLAKE2B 0de6aaa334daf932bde80cb087ae224617538fc608c066a81605f9f1a77a7481ef0750b44018f224d364fa645fb1a9bde956f5c97ec13612a66d18377bd3d0e0 SHA512 ff0e2b2683664d25ff1e5e75d63120d9973cd0c014966f5ea575573a8e26b6bc8077ccb3db0b5274a83e074a8d787c3c2b77e7defdf5dca02cf8a0e1a22ae9e5
diff --git a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r2.ebuild
index b32a58694d5b..22f31911b991 100644
--- a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild
+++ b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,12 +12,20 @@ DESCRIPTION="lite JPEG loader for Tk::Photo"
SLOT="0"
KEYWORDS="amd64 ~ppc sparc x86"
-RDEPEND="virtual/jpeg:0
- >=dev-perl/Tk-800.15.0"
-BDEPEND="${RDEPEND}
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ >=dev-perl/Tk-800.15.0
+"
+BDEPEND="
+ ${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.580.0
dev-perl/Devel-CheckLib
"
+
+PATCHES=(
+ "${FILESDIR}/${P}-Modernize-C.patch"
+)
+
src_test() {
virtx perl-module_src_test
}
diff --git a/dev-perl/Tk-JPEG-Lite/files/Tk-JPEG-Lite-2.15.0-Modernize-C.patch b/dev-perl/Tk-JPEG-Lite/files/Tk-JPEG-Lite-2.15.0-Modernize-C.patch
new file mode 100644
index 000000000000..d84539ef8328
--- /dev/null
+++ b/dev-perl/Tk-JPEG-Lite/files/Tk-JPEG-Lite-2.15.0-Modernize-C.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/883707
+diff --git a/imgJPEG.c b/imgJPEG.c
+index cb62e40..4ca80b5 100644
+--- a/imgJPEG.c
++++ b/imgJPEG.c
+@@ -118,7 +118,7 @@ static int ChnWriteJPEG _ANSI_ARGS_((Tcl_Interp *interp,
+ char *fileName, Tcl_Obj *format,
+ Tk_PhotoImageBlock *blockPtr));
+ static int StringWriteJPEG _ANSI_ARGS_((Tcl_Interp *interp,
+- Tcl_DString *dataPtr, Tcl_Obj *format,
++ Tcl_Obj *format,
+ Tk_PhotoImageBlock *blockPtr));
+
+ Tk_PhotoImageFormat imgFmtJPEG = {
+@@ -970,7 +970,7 @@ CommonReadJPEG(interp, cinfo, format, imageHandle, destX, destY,
+ int srcX, srcY; /* Coordinates of top-left pixel to be used
+ * in image being read. */
+ {
+- static char *jpegReadOptions[] = {"-fast", "-grayscale", NULL};
++ static const char *jpegReadOptions[] = {"-fast", "-grayscale", NULL};
+ int fileWidth, fileHeight, stopY, curY, outY, outWidth, outHeight;
+ myblock bl;
+ #define block bl.ck
+@@ -1262,7 +1262,7 @@ CommonWriteJPEG(interp, cinfo, format, blockPtr)
+ Tcl_Obj *format;
+ Tk_PhotoImageBlock *blockPtr;
+ {
+- static char *jpegWriteOptions[] = {"-grayscale", "-optimize",
++ static const char *jpegWriteOptions[] = {"-grayscale", "-optimize",
+ "-progressive", "-quality", "-smooth", NULL};
+ JSAMPROW row_pointer[1]; /* pointer to original data scanlines */
+ JSAMPARRAY buffer; /* Intermediate row buffer */