From dce1fcfd0d8d3110856361c5491def4a9ff9c62206fb3a5f6a3eb89b5dc5cedc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 11 Jan 2017 10:42:44 +0000 Subject: [PATCH] Accepting request 449647 from home:NicoK:branches:graphics update to 0.18.0 looks like some disabled repos build just fine and could be re-enabled if desired, e.g. SLE_12 OBS-URL: https://build.opensuse.org/request/show/449647 OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=85 --- LibRaw-0.17.2.tar.gz | 3 - LibRaw-0.18.0.tar.gz | 3 + libraw-0.17.1-gcc6-compatibility.patch | 199 ------------------------- libraw.changes | 72 +++++++++ libraw.spec | 17 ++- 5 files changed, 84 insertions(+), 210 deletions(-) delete mode 100644 LibRaw-0.17.2.tar.gz create mode 100644 LibRaw-0.18.0.tar.gz delete mode 100644 libraw-0.17.1-gcc6-compatibility.patch diff --git a/LibRaw-0.17.2.tar.gz b/LibRaw-0.17.2.tar.gz deleted file mode 100644 index ed80bd1..0000000 --- a/LibRaw-0.17.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c -size 1472714 diff --git a/LibRaw-0.18.0.tar.gz b/LibRaw-0.18.0.tar.gz new file mode 100644 index 0000000..33f1021 --- /dev/null +++ b/LibRaw-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d56a0c9a0e6d1b8c8c5585346acf2cfb0554eee0f0948da66f580cd65c8c5c9b +size 1278737 diff --git a/libraw-0.17.1-gcc6-compatibility.patch b/libraw-0.17.1-gcc6-compatibility.patch deleted file mode 100644 index 66ba743..0000000 --- a/libraw-0.17.1-gcc6-compatibility.patch +++ /dev/null @@ -1,199 +0,0 @@ -From eba7a66e23f2f62cc4c8115af8066f2df5da085a Mon Sep 17 00:00:00 2001 -From: Alex Tutubalin -Date: Sun, 20 Mar 2016 16:32:58 +0300 -Subject: [PATCH] gcc6 compatibility - ---- - dcraw/dcraw.c | 67 ++++++++++++++++++++++++++--------------------- - internal/dcraw_common.cpp | 67 ++++++++++++++++++++++++++--------------------- - libraw/libraw_const.h | 3 +-- - 3 files changed, 75 insertions(+), 62 deletions(-) - -diff --git a/dcraw/dcraw.c b/dcraw/dcraw.c -index 3667404..39edcaa 100755 ---- 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; -diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp -index 56f3624..85ef98b 100644 ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -2469,7 +2469,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, -@@ -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; -diff --git a/libraw/libraw_const.h b/libraw/libraw_const.h -index dd716b1..20e043f 100644 ---- 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/libraw.changes b/libraw.changes index 14cda33..1b6d81b 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Wed Jan 11 09:16:36 UTC 2017 - nico.kruber@gmail.com + +- update to 0.18.0: + * Licensing changes: + - there is no 'LibRaw Software License 27032010' licensing + anymore (and all signed agreements have expired) + - LibRaw is now dual-licensed: LGPL 2.1 or CDDL 1.0 + * Camera support (+87): + + Apple: iPad Pro, iPhone SE, iPhone 6s, iPhone 6 plus, + iPhone 7, iPhone 7 plus + + BlackMagic Micro Cinema Camera, URSA, URSA Mini + + Canon PowerShot G5 X, PowerShot G7 X Mark II, + PowerShot G9 X, IXUS 160 (CHDK hack), EOS 5D Mark IV, + EOS 80D, EOS 1300D, EOS M10, EOS M5, EOS-1D X Mark II + + Casio EX-ZR4000/5000 + + DXO One, + + FujiFilm X-Pro2, X70, X-E2S, X-T2 + + Gione E7 + + GITUP GIT2 + + Google Pixel,Pixel XL + + Hasselblad X1D, True Zoom + + HTC MyTouch 4G, One (A9), One (M9), 10 + + Huawei P9 + + Leica M (Typ 262), M-D (Typ 262), S (Typ 007), + SL (Typ 601), X-U (Typ 113), TL + + LG G3, G4 + + Meizy MX4 + + Nikon D5, D500, D3400 + + Olympus E-PL8, E-M10 Mark II, Pen F, SH-3, E-M1-II + + Panasonic DMC-G8/80/81/85, DMC-GX80/85, + DMC-TZ80/81/85/ZS60, DMC-TZ100/101/ZS100,DMC-LX9/10/15, + FZ2000/FZ2500 + + Pentax K-1, K-3 II, K-70 + + PhaseOne IQ3 100MP + + RaspberryPi Camera, Camera V2 + + Ricoh GR II + + Samsung Galaxy S7, S7 Edge + + Sigma sd Quattro + + Sony A7S II, ILCA-68 (A68), ILCE-6300, DSC-RX1R II, + DSC-RX10III, DSC-RX100V,ILCA-99M2 (A99-II), a6500, + IMX214, IMX219, IMX230, IMX298-mipi 16mp, + IMX219-mipi 8mp, Xperia L + + PtGrey GRAS-50S5C + + YUNEEC CGO4 + + Xiaomi MI3, RedMi Note3 Pro + * Floating point DNG support + * LibRaw can be built with Adobe DNG SDK support to decode + exotic DNG formats (e.g. 8 bit). See README.DNGSDK.txt for + details + * More metadata parsed + * New API, C-API calls + * Existing API changes: + imgdata.params fields (all very specific purpose): + sony_arw2_options, sraw_ycc, and params.x3f_flags + replaced with single bit-field raw_processing_options + See LIBRAW_PROCESSING_* bits in documentation. + * zlib library is optional + Use -DUSE_ZLIB to compile with zlib (to provide deflate DNG + support) + * libjpeg version: jpeg_mem_src() is mandatory, so use + libjpeg-turbo or libjpeg 8+ + * Fixes in vng_intepolate to make modern compilers happy + * Fixed bug in Sony SR2 files black level + * DNG files with BlackLevel both in vendor makernotes and + BlackLevel: BlackLevel tag always takes precedence + * strlen replaced with strnlen in most cases, added local + version of strnlen + * ChannelBlackLevel added to canon makernotes + * unpack_thumb() data size/offset check against file size +- removed libraw-0.17.1-gcc6-compatibility.patch (fixed upstream) + ------------------------------------------------------------------- Sun Jul 10 19:56:24 UTC 2016 - nico.kruber@gmail.com diff --git a/libraw.spec b/libraw.spec index 1c3343d..2fdb3e2 100644 --- a/libraw.spec +++ b/libraw.spec @@ -1,7 +1,7 @@ # # spec file for package libraw # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: libraw %define lname libraw15 -Version: 0.17.2 +Version: 0.18.0 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 @@ -29,14 +29,14 @@ Url: http://www.libraw.org/ #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%tar_name-%version.tar.gz -# PATCH-FIX-UPSTREAM libraw-0.17.1-gcc6-compatibility.patch -- picked from upstream, sligthly modified for ppc -Patch: libraw-0.17.1-gcc6-compatibility.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel BuildRequires: pkg-config +# zlib for deflate DNG support +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -97,10 +97,11 @@ against LibRaw. LibRaw does not provide dynamic libraries. %prep %setup -qn %tar_name-%version -%patch -p1 %build -export CXXFLAGS="%optflags -fPIC" +export CXXFLAGS="%optflags -fPIC -DUSE_ZLIB" +# manually add linker flags for zlib: +export LDFLAGS="$LDFLAGS -lz" %configure # build env is too broken for parallel build make %{?_smp_mflags} @@ -109,7 +110,7 @@ make %{?_smp_mflags} find doc -type f -name "*.html" -exec chmod a-x "{}" "+" mv doc manual # The source tree has these with execute permissions for some reason -chmod -x Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf +chmod -x Changelog.txt LICENSE.CDDL LICENSE.LGPL chmod -x manual/index.html # The Libraries make install DESTDIR="%buildroot" @@ -127,7 +128,7 @@ rm -rf %buildroot%_datadir/doc %files devel %defattr(-,root,root) -%doc Changelog.txt COPYRIGHT LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf +%doc Changelog.txt COPYRIGHT LICENSE.CDDL LICENSE.LGPL %doc manual %_includedir/%name/ %_libdir/pkgconfig/*.pc