commit: 89d4a8e0a0a321727125b3292b88dabd8fcf0599 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Sun Oct 8 21:13:16 2017 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 21:14:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d4a8e0
media-libs/libraw: remove old media-libs/libraw/Manifest | 6 - media-libs/libraw/files/libraw-0.17.2-gcc6.patch | 189 ----------------------- media-libs/libraw/libraw-0.17.2.ebuild | 67 -------- media-libs/libraw/libraw-0.18.2.ebuild | 63 -------- 4 files changed, 325 deletions(-) diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index f270ad6d804..2ef09561592 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -1,12 +1,6 @@ -DIST LibRaw-0.17.2.tar.gz 1472714 SHA256 92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c SHA512 e27227850b09e291802c089c826778579420a4af3f4b94dddf488bfc7eb84335d7a944445287d5993c5a574c192df5117c022d1b3d0372b3539a4553612988f4 WHIRLPOOL 55ab9980dc789a0f8c08043a93c1004e268ac3e0902f789a808a47f50e9294eb2f3755f71ecc0310e80cdf440aa60d9ed0e389b27d184e81db6f90f144257436 -DIST LibRaw-0.18.2.tar.gz 1281674 SHA256 ce366bb38c1144130737eb16e919038937b4dc1ab165179a225d5e847af2abc6 SHA512 87d3e5a0ecf7fc7c35a32f3963d108553b2d21a89aa75e4f2d9fab939aa14aa267ccf2a29e75e12d613c39798eb222b55da80371e699e913a58a7ae0fd47a2bc WHIRLPOOL 04493eb20169091b1782f5f7d5988c142c612e726f3225c4394779aa4caae678792ac080fcf43bf25bffa698b1ab7353a4eaf226d15125db2254d7b1bc16045b DIST LibRaw-0.18.4.tar.gz 1281104 SHA256 eaf4931b46e65861e88bbe704ccf370381e94d63e9a898b889ded4e0cb3b0c97 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776 WHIRLPOOL c7bfecfe51280088b8be35a226e765b2a3f810d120150a74326b4ee9662f10b170fa8cca7b4ef7191431b7b08df4f83df5dbe6da1811915405b4d2d72b988e38 DIST LibRaw-0.18.5.tar.gz 1280046 SHA256 fa2a7d14d9dfaf6b368f958a76d79266b3f58c2bc367bebab56e11baa94da178 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81 WHIRLPOOL b35227120e140abbd59b6587296fc81e7737a32cce82b8d4b2c240d448c786040302d1737c614168b5e8f797a760a396cfc353929afa7aba48af3f3e70cd1b8d -DIST LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz 31190 SHA256 a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7 SHA512 634fcd62433bc9a9aebccd113ef95a070609edee2520b7a609bab1b9612cc472b77295deb84e43ffcf002a2cdb57bb92a39d1e4b1bb8fed77a221b370074edea WHIRLPOOL a10d7921a9f20b088e2e0d773315bd00b2c4105c1a9e6890386fe53a08af2e698441e6abf9ab445099962e500502618fb687974126a4345422a759fb174e591c -DIST LibRaw-demosaic-pack-GPL2-0.18.2.tar.gz 31777 SHA256 f467689182728240c6358c1b890e9fe4ee08667c74433f6bd6a4710e3ae2aab6 SHA512 d979671769bb9a4695ace5c5478d6fefea2d9efd1ed30b25e3d6e3e517b86b551cbe9df7db75f735b130e1baf98b5d3485478f59379265fc4376c195ac6c1125 WHIRLPOOL e03fd53af54e0b86811273c1900764fbad5be7d259445031f9b178bc82aba53880a0f26916b86fbe0e8b12fe4eba78f594a7abbeaa1d77fa86379cf664f28a38 DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 SHA256 8961b0a90d4b1a5d00a13d9ed2f23e8f2c651b4a68c0470e01ba7668cc98145f SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d WHIRLPOOL 70fd4d7d5503d4edf985be7afe0635d8f54e3680a6be0384c0036480001d2fcb32cd6faa02f6219a5c28192448b2ea50bffae324b83d77509712887d7f02ccf4 DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 SHA256 2ae7923868c3e927eee72cf2e4d91384560b7cfe76a386ecf319c069d343c674 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5 WHIRLPOOL 880f95a95d61b9832ef0a5115aeb9d3ca27dd8de893265b86073fc30e22224a3fea125fb0d9a26d9af01cfb1a8aa4d21a93a5574599ffddf2d1b69e9349fa093 -DIST LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz 38908 SHA256 b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36 SHA512 fda6e22a8e4eb5614c6878ed77990f8f558ea54b9ec63ca77fb279543efa334c60d0fc48c1c5029c17216a1f7ed0e84db73675bd9d7308f869d11218184e19ad WHIRLPOOL 545d5fc29ccc01f862868675b12ea5dab8fad5bd59781e744344fee62d446697529cc9ac169f2167d81feea8dbbb56f57cb4883d02e4e472fa81e992f3a7f73f -DIST LibRaw-demosaic-pack-GPL3-0.18.2.tar.gz 39290 SHA256 01080bc2448de87339f086229319c9e1cca97ac0621416feb537b96f0dba4a57 SHA512 0fcfd89ea7607e9a5c0594f09ec49ae3be749efeaa4a30a05d45926610609ef23ff416075fae153efe20b62ab020c0433525761025613d585acffbcd7c663d51 WHIRLPOOL 8be882be0ca70a2b6885397442d3e656553ae79946f39cf878a048f447e60a0d47d10ee219ab7c59c01b1c7997b392a942fe1ed1ac572a115e440e6a1d3f0b1b DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 SHA256 9aa8ad60581b9c6a0ed81d96f897804cac832c7eeb087a38ca61fcd54838966c SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9 WHIRLPOOL da402afa54a6b3a10f17a3e2ea92475433a8baeb02c9be95d107fbb740f8e3448cba7183ef161ef04613f815af9c97196a7d9d3b14cca643ffabf329df7d9de5 DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 SHA256 b0ec998c4884cedd86a0627481a18144f0024a35c7a6fa5ae836182c16975c2b SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028 WHIRLPOOL 78dfc95e23c4570f604262911747f751177e35d489875c1c1de21afeead4f902774e75387fc37b49a7800012fdb8bb872340faf15607e2b206677bb8fd236c6c diff --git a/media-libs/libraw/files/libraw-0.17.2-gcc6.patch b/media-libs/libraw/files/libraw-0.17.2-gcc6.patch deleted file mode 100644 index de5eb4881c4..00000000000 --- a/media-libs/libraw/files/libraw-0.17.2-gcc6.patch +++ /dev/null @@ -1,189 +0,0 @@ -Backport upstream patch to compile against GCC 6 from -https://github.com/LibRaw/LibRaw/commit/eba7a66e23f2f62cc4c8115af8066f2df5da085a - -Patch by Peter Levine -See also: https://bugs.gentoo.org/show_bug.cgi?id=582852 - ---- a/dcraw/dcraw.c -+++ b/dcraw/dcraw.c -@@ -5788,30 +5788,37 @@ void CLASS lin_interpolate() - */ - void CLASS vng_interpolate() - { -- static const signed char *cp, terms[] = { -- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, -- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, -- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, -- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, -- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, -- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, -- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, -- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, -- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, -- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, -- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, -- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, -- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, -- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, -- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, -- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, -- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, -- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, -- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, -- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, -- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, -- +1,+0,+2,+1,0,0x10 -- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; -+ struct interpolate_terms { -+ signed char y1, x1, y2, x2, weight; -+ unsigned char grads; -+ }; -+ static const interpolate_terms terms[] = { -+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01}, -+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01}, -+ {-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03}, -+ {-2,+1,-1,+0,0,0x04}, {-2,+1,+0,-1,1,0x04}, {-2,+1,+0,+0,0,0x06}, -+ {-2,+1,+0,+1,0,0x02}, {-2,+2,+0,+0,1,0x04}, {-2,+2,+0,+1,0,0x04}, -+ {-1,-2,-1,+0,0,0x80}, {-1,-2,+0,-1,0,0x01}, {-1,-2,+1,-1,0,0x01}, -+ {-1,-2,+1,+0,1,0x01}, {-1,-1,-1,+1,0,0x88}, {-1,-1,+1,-2,0,0x40}, -+ {-1,-1,+1,-1,0,0x22}, {-1,-1,+1,+0,0,0x33}, {-1,-1,+1,+1,1,0x11}, -+ {-1,+0,-1,+2,0,0x08}, {-1,+0,+0,-1,0,0x44}, {-1,+0,+0,+1,0,0x11}, -+ {-1,+0,+1,-2,1,0x40}, {-1,+0,+1,-1,0,0x66}, {-1,+0,+1,+0,1,0x22}, -+ {-1,+0,+1,+1,0,0x33}, {-1,+0,+1,+2,1,0x10}, {-1,+1,+1,-1,1,0x44}, -+ {-1,+1,+1,+0,0,0x66}, {-1,+1,+1,+1,0,0x22}, {-1,+1,+1,+2,0,0x10}, -+ {-1,+2,+0,+1,0,0x04}, {-1,+2,+1,+0,1,0x04}, {-1,+2,+1,+1,0,0x04}, -+ {+0,-2,+0,+0,1,0x80}, {+0,-1,+0,+1,1,0x88}, {+0,-1,+1,-2,0,0x40}, -+ {+0,-1,+1,+0,0,0x11}, {+0,-1,+2,-2,0,0x40}, {+0,-1,+2,-1,0,0x20}, -+ {+0,-1,+2,+0,0,0x30}, {+0,-1,+2,+1,1,0x10}, {+0,+0,+0,+2,1,0x08}, -+ {+0,+0,+2,-2,1,0x40}, {+0,+0,+2,-1,0,0x60}, {+0,+0,+2,+0,1,0x20}, -+ {+0,+0,+2,+1,0,0x30}, {+0,+0,+2,+2,1,0x10}, {+0,+1,+1,+0,0,0x44}, -+ {+0,+1,+1,+2,0,0x10}, {+0,+1,+2,-1,1,0x40}, {+0,+1,+2,+0,0,0x60}, -+ {+0,+1,+2,+1,0,0x20}, {+0,+1,+2,+2,0,0x10}, {+1,-2,+1,+0,0,0x80}, -+ {+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40}, -+ {+1,+0,+2,+1,0,0x10} -+ }; -+ const interpolate_terms *cpt; -+ signed char *cp; -+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; - ushort (*brow[5])[4], *pix; - int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; - int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag; -@@ -5829,11 +5836,11 @@ void CLASS vng_interpolate() - for (row=0; row < prow; row++) /* Precalculate for VNG */ - for (col=0; col < pcol; col++) { - code[row][col] = ip; -- for (cp=terms, t=0; t < 64; t++) { -- y1 = *cp++; x1 = *cp++; -- y2 = *cp++; x2 = *cp++; -- weight = *cp++; -- grads = *cp++; -+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) { -+ y1 = cpt->y1; x1 = cpt->x1; -+ y2 = cpt->y2; x2 = cpt->x2; -+ weight = cpt->weight; -+ grads = cpt->grads; - color = fcol(row+y1,col+x1); - if (fcol(row+y2,col+x2) != color) continue; - diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1; -@@ -16289,7 +16296,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) - strncpy (th->desc, desc, 512); - strncpy (th->make, make, 64); - strncpy (th->model, model, 64); -- strcpy (th->soft, "dcraw v"DCRAW_VERSION); -+ strcpy (th->soft, "dcraw v" DCRAW_VERSION); - t = localtime (×tamp); - sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", - t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -4618,30 +4618,37 @@ void CLASS lin_interpolate() - */ - void CLASS vng_interpolate() - { -- static const signed char *cp, terms[] = { -- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, -- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, -- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, -- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, -- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, -- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, -- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, -- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, -- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, -- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, -- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, -- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, -- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, -- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, -- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, -- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, -- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, -- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, -- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, -- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, -- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, -- +1,+0,+2,+1,0,0x10 -- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; -+ struct interpolate_terms { -+ signed char y1, x1, y2, x2, weight; -+ unsigned char grads; -+ }; -+ static const interpolate_terms terms[] = { -+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01}, -+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01}, -+ {-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03}, -+ {-2,+1,-1,+0,0,0x04}, {-2,+1,+0,-1,1,0x04}, {-2,+1,+0,+0,0,0x06}, -+ {-2,+1,+0,+1,0,0x02}, {-2,+2,+0,+0,1,0x04}, {-2,+2,+0,+1,0,0x04}, -+ {-1,-2,-1,+0,0,0x80}, {-1,-2,+0,-1,0,0x01}, {-1,-2,+1,-1,0,0x01}, -+ {-1,-2,+1,+0,1,0x01}, {-1,-1,-1,+1,0,0x88}, {-1,-1,+1,-2,0,0x40}, -+ {-1,-1,+1,-1,0,0x22}, {-1,-1,+1,+0,0,0x33}, {-1,-1,+1,+1,1,0x11}, -+ {-1,+0,-1,+2,0,0x08}, {-1,+0,+0,-1,0,0x44}, {-1,+0,+0,+1,0,0x11}, -+ {-1,+0,+1,-2,1,0x40}, {-1,+0,+1,-1,0,0x66}, {-1,+0,+1,+0,1,0x22}, -+ {-1,+0,+1,+1,0,0x33}, {-1,+0,+1,+2,1,0x10}, {-1,+1,+1,-1,1,0x44}, -+ {-1,+1,+1,+0,0,0x66}, {-1,+1,+1,+1,0,0x22}, {-1,+1,+1,+2,0,0x10}, -+ {-1,+2,+0,+1,0,0x04}, {-1,+2,+1,+0,1,0x04}, {-1,+2,+1,+1,0,0x04}, -+ {+0,-2,+0,+0,1,0x80}, {+0,-1,+0,+1,1,0x88}, {+0,-1,+1,-2,0,0x40}, -+ {+0,-1,+1,+0,0,0x11}, {+0,-1,+2,-2,0,0x40}, {+0,-1,+2,-1,0,0x20}, -+ {+0,-1,+2,+0,0,0x30}, {+0,-1,+2,+1,1,0x10}, {+0,+0,+0,+2,1,0x08}, -+ {+0,+0,+2,-2,1,0x40}, {+0,+0,+2,-1,0,0x60}, {+0,+0,+2,+0,1,0x20}, -+ {+0,+0,+2,+1,0,0x30}, {+0,+0,+2,+2,1,0x10}, {+0,+1,+1,+0,0,0x44}, -+ {+0,+1,+1,+2,0,0x10}, {+0,+1,+2,-1,1,0x40}, {+0,+1,+2,+0,0,0x60}, -+ {+0,+1,+2,+1,0,0x20}, {+0,+1,+2,+2,0,0x10}, {+1,-2,+1,+0,0,0x80}, -+ {+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40}, -+ {+1,+0,+2,+1,0,0x10} -+ }; -+ const interpolate_terms *cpt; -+ signed char *cp; -+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; - ushort (*brow[5])[4], *pix; - int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; - int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag; -@@ -4659,11 +4666,11 @@ void CLASS vng_interpolate() - for (row=0; row < prow; row++) /* Precalculate for VNG */ - for (col=0; col < pcol; col++) { - code[row][col] = ip; -- for (cp=terms, t=0; t < 64; t++) { -- y1 = *cp++; x1 = *cp++; -- y2 = *cp++; x2 = *cp++; -- weight = *cp++; -- grads = *cp++; -+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) { -+ y1 = cpt->y1; x1 = cpt->x1; -+ y2 = cpt->y2; x2 = cpt->x2; -+ weight = cpt->weight; -+ grads = cpt->grads; - color = fcol(row+y1,col+x1); - if (fcol(row+y2,col+x2) != color) continue; - diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1; ---- a/libraw/libraw_const.h -+++ b/libraw/libraw_const.h -@@ -255,8 +255,7 @@ enum LibRaw_progress - - LIBRAW_PROGRESS_THUMB_LOAD = 1<<28, - LIBRAW_PROGRESS_TRESERVED1 = 1<<29, -- LIBRAW_PROGRESS_TRESERVED2 = 1<<30, -- LIBRAW_PROGRESS_TRESERVED3 = 1<<31 -+ LIBRAW_PROGRESS_TRESERVED2 = 1<<30 - }; - #define LIBRAW_PROGRESS_THUMB_MASK 0x0fffffff - diff --git a/media-libs/libraw/libraw-0.17.2.ebuild b/media-libs/libraw/libraw-0.17.2.ebuild deleted file mode 100644 index b6ae8c9c05c..00000000000 --- a/media-libs/libraw/libraw-0.17.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV=${PV/_b/-B} -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/"; -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz - demosaic? ( - https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz - https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz - )" - -# Libraw also has it's own license, which is a pdf file and -# can be obtained from here: -# https://www.libraw.org/data/LICENSE.LibRaw.pdf -LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3" -SLOT="0/15" # subslot = libraw soname version -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="demosaic examples jpeg jpeg2k +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -DOCS=( Changelog.txt README ) -PATCHES=( "${FILESDIR}"/${PN}-0.17.2-gcc6.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - $(use_enable demosaic demosaic-pack-gpl2) - $(use_enable demosaic demosaic-pack-gpl3) - $(use_enable examples) - $(use_enable jpeg) - $(use_enable jpeg2k jasper) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libraw/libraw-0.18.2.ebuild b/media-libs/libraw/libraw-0.18.2.ebuild deleted file mode 100644 index 0aeacdf3e3c..00000000000 --- a/media-libs/libraw/libraw-0.18.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV=${PV/_b/-B} -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"; -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz - demosaic? ( - https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz - https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz - )" - -LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )" -SLOT="0/16" # subslot = libraw soname version -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="demosaic examples jpeg jpeg2k +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -DOCS=( Changelog.txt README ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - $(use_enable demosaic demosaic-pack-gpl2) - $(use_enable demosaic demosaic-pack-gpl3) - $(use_enable examples) - $(use_enable jpeg) - $(use_enable jpeg2k jasper) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -}
