From f4fc10428424904caf2035cffc442195cb088b2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Jul 2021 10:27:13 +0100 Subject: gentoo resync : 28.07.2021 --- media-gfx/ufraw/Manifest | 14 --- .../ufraw/files/ufraw-0.17-cfitsio-automagic.patch | 28 ------ .../ufraw/files/ufraw-0.22-CVE-2015-8366.patch | 17 ---- .../ufraw/files/ufraw-0.22-CVE-2018-19655.patch | 44 ---------- media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 ---- .../files/ufraw-0.22-drop_superfluous_abs.patch | 16 ---- media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 26 ------ .../ufraw/files/ufraw-0.22-fix-unsigned-char.patch | 20 ----- media-gfx/ufraw/files/ufraw-0.22-gcc9.patch | 97 --------------------- media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch | 19 ----- .../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 ----- media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch | 32 ------- media-gfx/ufraw/metadata.xml | 13 --- media-gfx/ufraw/ufraw-0.22-r4.ebuild | 99 ---------------------- 14 files changed, 461 deletions(-) delete mode 100644 media-gfx/ufraw/Manifest delete mode 100644 media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-crashfix.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-gcc9.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch delete mode 100644 media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch delete mode 100644 media-gfx/ufraw/metadata.xml delete mode 100644 media-gfx/ufraw/ufraw-0.22-r4.ebuild (limited to 'media-gfx/ufraw') diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest deleted file mode 100644 index afe2f337102c..000000000000 --- a/media-gfx/ufraw/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX ufraw-0.17-cfitsio-automagic.patch 933 BLAKE2B 06de9b807a9a491af2db83bfc07e3727409494a0925f01c0493e7cc5ce7b4a326f9c041d11dc30a38c6c71b42cc07e83017ffb01873a2d4f44d78a65a5c7c3ed SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b -AUX ufraw-0.22-CVE-2015-8366.patch 498 BLAKE2B 98ff63a7ea66579877a7b1733111633df53241761cb4b56b745a9f34290fe72e6f802f602dfc1b69fc5210fc5007966bd7070aecaadc71ea5ddde15c849cd7ec SHA512 de55e5e2050ee648a889537d56410adb16adffb51d2ea03614932e0cb76d9a82c625ee2429493d89c389121ca30d8133ab4347602e55625f533611519d15db43 -AUX ufraw-0.22-CVE-2018-19655.patch 1292 BLAKE2B f4d89eff3392191cc1ac196b97e67d0df4e2710a15e2e08859b7c0b6fd2b8ab38173d2268b3e919965257e58d7341de4150ae690c1d864d3f90fcec4d8689a34 SHA512 a6b9e1b669f3aef9af98a57b04d0a225e24556a7ea4d19fb973d94fca209fdff1e2a9045743f2ceae8f6d608f42ccfc8a2041bdd7106f7bb21de263ff4b70d9c -AUX ufraw-0.22-crashfix.patch 563 BLAKE2B 98dfd70be0cb7ec82b9f87c946a0638d7c0d444e0eb09a169609eb82f6d192cf3c0a9c4efd58a185bd83ca14a1fb795b47130c8491fb71cff372136d27c00fad SHA512 e02e71ef5660e83f49f7787c1819b6f86ed0de939db1bcd0e988f1c432ead9bd7f9e180e6974964305ab0ea65ba679b3363994213f8ffa04715176cfe45173cf -AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd483447bc88a3ba4af249724f7c2dce5110d008934ce6e1601970ad7a42a952c8197b49605c3534c458e87ff804ccb1be861442d029 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60 -AUX ufraw-0.22-exiv2-0.27.patch 738 BLAKE2B 5392f37396074b1188b4c9f3bac06eb4168d68f53d367cc5107dbf71a66d5aab56a62489a826ac8fc0a4add74666bf232fde96f41f0ffc9604f5e6fd09d5d4fd SHA512 d37a132dc06ce186f177d6720ad23bc5f1e8ce84743b6e506242efee20cf628a4192d2bdaf1718260dba7bdef82d78bae2eb366df44e3dd3de13e318f812b76d -AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b -AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb763f1248ab4c0dd6132977fc56c79c11e3782a33d507aceec193e9ab2be423bea4335521e4308cb617b04d7 SHA512 aaf902c4a96ba1d9f21ff31e5499fd9d9216ff17812b41276e15a7150a4a90aa8a7a9e4aec70a006e68930e0e05c4a1da38abc78175de521752f1c6152e77b5a -AUX ufraw-0.22-glib-2.68.patch 444 BLAKE2B e4700eda91c0c7382db15136bd8f73e61f193f8996db7cf311b61d72a692af0cd3162faca9132078c7322080dabe1b4a7d3bbb891e75640aa2c34c0414f0031b SHA512 b251955ce43db93aa3d1fa5b1a1963591449858e7a4cdb94c0055538e05c1c12488bf70dbd0ce169d0e73446345027ff3a8e4127dee4c24ae5878f5af9f74143 -AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4 -AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c -DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2 -EBUILD ufraw-0.22-r4.ebuild 2082 BLAKE2B a4f04f08e12e1139b6711fa9a68682b5a39af78bc40ec1c819b5e46fc1e7e350f521377ff17021113d934b3bb36fb9e3b53644a35d422df91fc27d74d2783a85 SHA512 a6244fe2f0b8507c7c68641f177541d8afd49932a48ee1f05059eb9f1fe2b86f29a96e3c7e8a8a080801fb6113c44a6d8c57a3e9e332aa4dc55511b8fb35be3b -MISC metadata.xml 496 BLAKE2B e14f04b9daf2f209851e28ddf26240225cb2e65f675c5903f512a3aeaefa8a7fbfc1c4140c9ed0aec699c2ec3ff53b0ea72e777f6836b4069db12e8ca3b9dd6c SHA512 cb35076b463c212dc7ba1d015ee3a04633ba6564f6fe8b569dc364123a5487b1b17219e523d7d2ccb725bb75815bdab1b1271135ee5624ec4177af327df397ff diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch deleted file mode 100644 index aff7c5a25930..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru ufraw-0.17.orig/configure.ac ufraw-0.17/configure.ac ---- ufraw-0.17.orig/configure.ac 2010-04-02 16:16:08.000000000 +0200 -+++ ufraw-0.17/configure.ac 2010-04-02 16:19:33.000000000 +0200 -@@ -246,11 +246,19 @@ - [ have_png=no - AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] ) - --PKG_CHECK_MODULES(CFITSIO, cfitsio, -- [ have_cfitsio=yes -- AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ], -- [ have_cfitsio=no -- AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) -+AC_ARG_WITH([cfitsio], -+ [AS_HELP_STRING([--with-cfitsio], -+ [build fits support @<:@default=check@:>@])], -+ [], -+ [with_cfitsio=check]) -+ -+have_cfitsio=no -+AS_IF([test "x$with_cfitsio" != xno], -+ [PKG_CHECK_MODULES(CFITSIO, cfitsio, -+ [ have_cfitsio=yes -+ AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ], -+ [ have_cfitsio=no -+ AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] ) - - PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16, - [ have_exiv2=yes diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch deleted file mode 100644 index 9d59ca413fbe..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix a buffer overflow bug. See -https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2 - ---- a/dcraw.cc -+++ b/dcraw.cc -@@ -3013,7 +3013,10 @@ - diff = diff ? -diff : 0x80; - if (ftell(ifp) + 12 >= (int) seg[1][1]) - diff = 0; -- raw_image[pix] = pred[pix & 1] += diff; -+ if(pix>=raw_width*raw_height) -+ derror(); -+ else -+ raw_image[pix] = pred[pix & 1] += diff; - if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; - } - maximum = 0xff; diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch deleted file mode 100644 index 78b46b4452e0..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: stack-based buffer overflow bug -Bug-Debian: https://bugs.debian.org/890086 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655 -Author: Filip Hroch -Reviewed-by: Salvatore Bonaccorso -Last-Update: 2018-12-02 - ---- a/dcraw.cc -+++ b/dcraw.cc -@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit - { - UINT64 bitbuf=0; - int vbits, col, i, c; -- ushort img[2][2064]; -+ ushort *img; - double sum[]={0,0}; - -+#define IMG2D(row,col) \ -+ img[(row)*width+(col)] -+ -+ img = (ushort *) malloc(2*width*sizeof(ushort)); -+ merror (img, "find_green()"); -+ - FORC(2) { - fseek (ifp, c ? off1:off0, SEEK_SET); - for (vbits=col=0; col < width; col++) { -@@ -8516,13 +8522,14 @@ float CLASS find_green (int bps, int bit - for (i=0; i < bite; i+=8) - bitbuf |= (unsigned) (fgetc(ifp) << i); - } -- img[c][col] = bitbuf << (64-bps-vbits) >> (64-bps); -+ IMG2D(c,col) = bitbuf << (64-bps-vbits) >> (64-bps); - } - } - FORC(width-1) { -- sum[ c & 1] += ABS(img[0][c]-img[1][c+1]); -- sum[~c & 1] += ABS(img[1][c]-img[0][c+1]); -+ sum[ c & 1] += ABS(IMG2D(0,c)-IMG2D(1,c+1)); -+ sum[~c & 1] += ABS(IMG2D(1,c)-IMG2D(0,c+1)); - } -+ free(img); - return 100 * log(sum[0]/sum[1]); - } - diff --git a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch deleted file mode 100644 index 76fe83fa8f2e..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/ufraw_ufraw.c 2015-06-16 04:58:38.000000000 +0100 -+++ b/ufraw_ufraw.c 2016-12-18 00:55:45.794466747 +0000 -@@ -767,8 +767,10 @@ void ufraw_close(ufraw_data *uf) - g_free(uf->displayProfile); - g_free(uf->RawHistogram); - #ifdef HAVE_LENSFUN -- lf_modifier_destroy(uf->TCAmodifier); -- lf_modifier_destroy(uf->modifier); -+ if (uf->TCAmodifier != NULL) -+ lf_modifier_destroy(uf->TCAmodifier); -+ if (uf->modifier != NULL) -+ lf_modifier_destroy(uf->modifier); - #endif - ufobject_delete(uf->conf->ufobject); - g_free(uf->conf); diff --git a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch deleted file mode 100644 index 8c11f6649781..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fixes build with gcc 7, by Johannes Hirte. -https://bugs.gentoo.org/show_bug.cgi?id=618068 - -diff --git a/../old/dcraw.cc b/dcraw.cc -index 88c8068..cedf86b 100644 ---- a/../old/dcraw.cc -+++ b/dcraw.cc -@@ -9242,7 +9242,7 @@ canon_a5: - if (make[0] == 'O') { - i = find_green (12, 32, 1188864, 3576832); - c = find_green (12, 32, 2383920, 2387016); -- if (abs(i) < abs(c)) { -+ if (i < c) { - SWAP(i,c); - load_flags = 24; - } diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch deleted file mode 100644 index 2cd888ebc096..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/ufraw_exiv2.cc -+++ b/ufraw_exiv2.cc -@@ -15,9 +15,8 @@ - #include "ufraw.h" - - #ifdef HAVE_EXIV2 --#include --#include --#include -+#include -+#include - #include - #include - -@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) - if (exifData.empty()) { - std::string error(uf->filename); - error += ": No Exif data found in the file"; -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::Error(Exiv2::kerErrorMessage, error); -+#else - throw Exiv2::Error(1, error); -+#endif - } - - /* List of tag names taken from exiv2's printSummary() in actions.cpp */ diff --git a/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch deleted file mode 100644 index a5397260ffb5..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix unsigned char declaration of src[] -Author: John Paul Adrian Glaubitz -Last-Update: 2017-02-27 - -https://bugs.gentoo.org/show_bug.cgi?id=622484 -https://sourceforge.net/p/ufraw/bugs/417/ -https://src.fedoraproject.org/cgit/rpms/ufraw.git/tree/05_fix_build_due_to_unsigned_char.patch -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856227 - ---- ufraw-0.22.orig/dcraw.cc -+++ ufraw-0.22/dcraw.cc -@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw() - - void CLASS kodak_radc_load_raw() - { -- static const char src[] = { -+ static const signed char src[] = { - 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, - 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, - 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, diff --git a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch deleted file mode 100644 index f2cf1dc88a86..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch +++ /dev/null @@ -1,97 +0,0 @@ -From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Thu, 14 Feb 2019 03:26:02 +0000 -Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none) - ---- - dcraw_api.cc | 4 ++-- - dcraw_indi.c | 4 ---- - ufraw_ufraw.c | 6 +++--- - 3 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/dcraw_api.cc b/dcraw_api.cc -index c3d2902..6096cb7 100644 ---- a/dcraw_api.cc -+++ b/dcraw_api.cc -@@ -686,7 +686,7 @@ extern "C" { - rgbWB[3] = rgbWB[1]; - if (dark) { - #ifdef _OPENMP -- #pragma omp parallel for schedule(static) default(none) \ -+ #pragma omp parallel for schedule(static) \ - shared(h,dark,rgbWB) - #endif - for (int i = 0; i < pixels; i++) { -@@ -699,7 +699,7 @@ extern "C" { - } - } else { - #ifdef _OPENMP -- #pragma omp parallel for schedule(static) default(none) \ -+ #pragma omp parallel for schedule(static) \ - shared(h,dark,rgbWB) - #endif - for (int i = 0; i < pixels; i++) { -diff --git a/dcraw_indi.c b/dcraw_indi.c -index a291af2..777ce39 100644 ---- a/dcraw_indi.c -+++ b/dcraw_indi.c -@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black, - #ifdef _OPENMP - #if defined(__sun) && !defined(__GNUC__) /* Fix bug #3205673 - NKBJ */ - #pragma omp parallel for \ -- default(none) \ - shared(nc,image,size,noise) \ - private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp) - #else - #pragma omp parallel for \ -- default(none) \ - shared(nc,image,size) \ - private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp) - #endif -@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters, - progress(PROGRESS_INTERPOLATE, -height); - #ifdef _OPENMP - #pragma omp parallel \ -- default(none) \ - shared(image,code,prow,pcol,h) \ - private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t) - #endif -@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters, - - #ifdef _OPENMP - #pragma omp parallel \ -- default(none) \ - shared(image,dir,diff) \ - private(row,col,i,d,c,pix,guess) - #endif -diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c -index ce9d262..48a0d91 100644 ---- a/ufraw_ufraw.c -+++ b/ufraw_ufraw.c -@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img, - delta = rgbMax / (uf->conf->hotpixel + 1.0); - count = 0; - #ifdef _OPENMP -- #pragma omp parallel for schedule(static) default(none) \ -+ #pragma omp parallel for schedule(static) \ - shared(uf,img,width,height,colors,rgbMax,delta) \ - reduction(+:count) \ - private(h,p,w,c,t,v,hi,i) -@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase) - mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i]; - size = img->height * img->width; - #ifdef _OPENMP -- #pragma omp parallel for schedule(static) default(none) \ -+ #pragma omp parallel for schedule(static) \ - shared(uf,phase,img,mul,size) \ - private(i,p16,c,px) - #endif -@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img, - return; - int y; - #ifdef _OPENMP -- #pragma omp parallel for schedule(static) default(none) \ -+ #pragma omp parallel for schedule(static) \ - shared(uf,img,outimg,area) - #endif - for (y = area->y; y < area->y + area->height; y++) { diff --git a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch deleted file mode 100644 index c2499fa16bf5..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/uf_glib.h 2021-04-18 23:14:11.346861061 -0400 -+++ b/uf_glib.h 2021-04-18 23:14:20.180520873 -0400 -@@ -13,13 +13,13 @@ - #ifndef _UF_GLIB_H - #define _UF_GLIB_H - -+#include -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif - --#include --#include -- - // g_win32_locale_filename_from_utf8 is needed only on win32 - #ifdef _WIN32 - #define uf_win32_locale_filename_from_utf8(__some_string__) \ diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch deleted file mode 100644 index 93e1d691af1d..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -159,8 +159,16 @@ - have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no} - - # Check for libjasper. --AC_CHECK_LIB(jasper, jas_image_decode) --have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no} -+AC_ARG_ENABLE([jasper], -+ AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support])) -+ -+have_jasper=no -+AS_IF([test "x$enable_jasper" = "xyes"], [ -+ AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [ -+ AC_MSG_ERROR([unable to find the jas_image_decode() function]) -+ ]) -+]) -+ - - # Check for tiff headers and library. - PKG_CHECK_MODULES(LIBTIFF, libtiff-4, diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch deleted file mode 100644 index dca3834cbe8e..000000000000 --- a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix build with >=jpeg-9 -Thanks-to: Moran Z. - ---- a/dcraw.cc 2014-09-02 07:50:38.000000000 +0300 -+++ b/dcraw.cc 2015-02-21 04:54:13.957561352 +0200 -@@ -2330,7 +2330,7 @@ - #endif - cinfo->src->next_input_byte = jpeg_buffer; - cinfo->src->bytes_in_buffer = nbytes; -- return TRUE; -+ return boolean(TRUE); - } - - void CLASS kodak_jpeg_load_raw() -@@ -2346,7 +2346,7 @@ - jpeg_create_decompress (&cinfo); - jpeg_stdio_src (&cinfo, ifp); - cinfo.src->fill_input_buffer = fill_input_buffer; -- jpeg_read_header (&cinfo, TRUE); -+ jpeg_read_header (&cinfo, boolean(TRUE)); - jpeg_start_decompress (&cinfo); - if ((cinfo.output_width != width ) || - (cinfo.output_height*2 != height ) || -@@ -2419,7 +2419,7 @@ - if (tile_length < INT_MAX) - fseek (ifp, get4(), SEEK_SET); - jpeg_stdio_src (&cinfo, ifp); -- jpeg_read_header (&cinfo, TRUE); -+ jpeg_read_header (&cinfo, boolean(TRUE)); - jpeg_start_decompress (&cinfo); - buf = (*cinfo.mem->alloc_sarray) - ((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1); diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml deleted file mode 100644 index 6cf2734b4a8b..000000000000 --- a/media-gfx/ufraw/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - enable contrast setting option - Enable support for the FITS image format through sci-libs/cfitsio - enable DST correction for file timestamps - - - ufraw - - diff --git a/media-gfx/ufraw/ufraw-0.22-r4.ebuild b/media-gfx/ufraw/ufraw-0.22-r4.ebuild deleted file mode 100644 index 1be3077ba8ed..000000000000 --- a/media-gfx/ufraw/ufraw-0.22-r4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils toolchain-funcs xdg-utils - -DESCRIPTION="RAW Image format viewer and GIMP plugin" -HOMEPAGE="http://ufraw.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="contrast fits gimp gnome gtk openmp timezone" - -REQUIRED_USE="gimp? ( gtk )" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - dev-libs/glib:2 - media-gfx/exiv2:= - media-libs/lcms:2= - >=media-libs/lensfun-0.2.5:= - media-libs/libpng:0= - media-libs/tiff - virtual/jpeg:0= - fits? ( sci-libs/cfitsio:= ) - gimp? ( media-gfx/gimp:0/2 ) - gnome? ( >=gnome-base/gconf-2 ) - gtk? ( - >=media-gfx/gtkimageview-1.5 - >=x11-libs/gtk+-2.6:2 - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch - "${FILESDIR}"/${P}-jasper-automagic.patch - "${FILESDIR}"/${P}-crashfix.patch - "${FILESDIR}"/${P}-drop_superfluous_abs.patch - "${FILESDIR}"/${P}-fix-unsigned-char.patch - "${FILESDIR}"/${P}-jpeg9.patch - "${FILESDIR}"/${P}-exiv2-0.27.patch - "${FILESDIR}"/${P}-gcc9.patch - "${FILESDIR}"/${P}-CVE-2015-8366.patch - "${FILESDIR}"/${P}-CVE-2018-19655.patch - "${FILESDIR}"/${P}-glib-2.68.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-jasper - $(use_enable contrast) - $(use_with fits cfitsio) - $(use_with gimp) - $(use_enable gnome mime) - $(use_with gtk) - $(use_enable openmp) - $(use_enable timezone dst-correction) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install - einstalldocs -} - -pkg_preinst() { - if use gnome; then - gnome2_gconf_savelist - fi -} - -pkg_postinst() { - if use gnome; then - xdg_mimeinfo_database_update - xdg_desktop_database_update - gnome2_gconf_install - fi -} - -pkg_postrm() { - if use gnome; then - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} -- cgit v1.2.3