diff --git a/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch b/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch new file mode 100644 index 0000000000..e71729ab2c --- /dev/null +++ b/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch @@ -0,0 +1,13 @@ +diff --git a/dcraw.c b/dcraw.c +index 1d0676c..18e1f3e 100644 +--- dcraw.c ++++ dcraw.c +@@ -84,6 +84,7 @@ typedef unsigned long long UINT64; + #endif + #ifdef LOCALEDIR + #include ++#include + #define _(String) gettext(String) + #else + #define _(String) (String) + diff --git a/srcpkgs/dcraw/patches/fix-signed_char_narrowing.patch b/srcpkgs/dcraw/patches/fix-signed_char_narrowing.patch deleted file mode 100644 index 92a89047c8..0000000000 --- a/srcpkgs/dcraw/patches/fix-signed_char_narrowing.patch +++ /dev/null @@ -1,57 +0,0 @@ -Since gcc6 is anal about narrowing the 0x8? constants would need -to be converted to the negative (signed char) value. -Change the 0x?? constants to characters by using `\x??' notation. - ---- dcraw.c 2016-09-14 20:29:18.250684909 +0200 -+++ dcraw.c 2016-09-14 20:30:37.319853026 +0200 -@@ -4422,28 +4422,28 @@ - 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 -+ -2,-2,+0,-1,0,'\x01', -2,-2,+0,+0,1,'\x01', -2,-1,-1,+0,0,'\x01', -+ -2,-1,+0,-1,0,'\x02', -2,-1,+0,+0,0,'\x03', -2,-1,+0,+1,1,'\x01', -+ -2,+0,+0,-1,0,'\x06', -2,+0,+0,+0,1,'\x02', -2,+0,+0,+1,0,'\x03', -+ -2,+1,-1,+0,0,'\x04', -2,+1,+0,-1,1,'\x04', -2,+1,+0,+0,0,'\x06', -+ -2,+1,+0,+1,0,'\x02', -2,+2,+0,+0,1,'\x04', -2,+2,+0,+1,0,'\x04', -+ -1,-2,-1,+0,0,'\x80', -1,-2,+0,-1,0,'\x01', -1,-2,+1,-1,0,'\x01', -+ -1,-2,+1,+0,1,'\x01', -1,-1,-1,+1,0,'\x88', -1,-1,+1,-2,0,'\x40', -+ -1,-1,+1,-1,0,'\x22', -1,-1,+1,+0,0,'\x33', -1,-1,+1,+1,1,'\x11', -+ -1,+0,-1,+2,0,'\x08', -1,+0,+0,-1,0,'\x44', -1,+0,+0,+1,0,'\x11', -+ -1,+0,+1,-2,1,'\x40', -1,+0,+1,-1,0,'\x66', -1,+0,+1,+0,1,'\x22', -+ -1,+0,+1,+1,0,'\x33', -1,+0,+1,+2,1,'\x10', -1,+1,+1,-1,1,'\x44', -+ -1,+1,+1,+0,0,'\x66', -1,+1,+1,+1,0,'\x22', -1,+1,+1,+2,0,'\x10', -+ -1,+2,+0,+1,0,'\x04', -1,+2,+1,+0,1,'\x04', -1,+2,+1,+1,0,'\x04', -+ +0,-2,+0,+0,1,'\x80', +0,-1,+0,+1,1,'\x88', +0,-1,+1,-2,0,'\x40', -+ +0,-1,+1,+0,0,'\x11', +0,-1,+2,-2,0,'\x40', +0,-1,+2,-1,0,'\x20', -+ +0,-1,+2,+0,0,'\x30', +0,-1,+2,+1,1,'\x10', +0,+0,+0,+2,1,'\x08', -+ +0,+0,+2,-2,1,'\x40', +0,+0,+2,-1,0,'\x60', +0,+0,+2,+0,1,'\x20', -+ +0,+0,+2,+1,0,'\x30', +0,+0,+2,+2,1,'\x10', +0,+1,+1,+0,0,'\x44', -+ +0,+1,+1,+2,0,'\x10', +0,+1,+2,-1,1,'\x40', +0,+1,+2,+0,0,'\x60', -+ +0,+1,+2,+1,0,'\x20', +0,+1,+2,+2,0,'\x10', +1,-2,+1,+0,0,'\x80', -+ +1,-1,+1,+1,0,'\x88', +1,+0,+1,+2,0,'\x08', +1,+0,+2,-1,0,'\x40', -+ +1,+0,+2,+1,0,'\x10' - }, 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]; diff --git a/srcpkgs/dcraw/template b/srcpkgs/dcraw/template index fe2c3565f8..2628110c22 100644 --- a/srcpkgs/dcraw/template +++ b/srcpkgs/dcraw/template @@ -1,23 +1,29 @@ # Template file for 'dcraw' pkgname=dcraw -version=9.27 -revision=4 -build_style=fetch +version=9.28.0 +revision=1 +wrksrc=dcraw makedepends="jasper-devel lcms2-devel" short_desc="Convert raw photos" maintainer="Felix Hanley " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://www.cybercom.net/~dcoffin/dcraw/" -distfiles="https://www.cybercom.net/~dcoffin/dcraw/dcraw.c - https://www.cybercom.net/~dcoffin/dcraw/dcraw.1" -checksum="d18d9e43a096eea04eee2148e53068f8fa45ce95395d97128b1aa37b477eab43 - f52a6b2ed50360240ff44d7ff9ec430ca8195fbb07f48003a1fa63c5a69217aa" +distfiles="https://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${version}.tar.gz" +checksum=2890c3da2642cd44c5f3bfed2c9b2c1db83da5cec09cc17e0fa72e17541fb4b9 do_build() { - $CC -o dcraw $CFLAGS dcraw.c $LDFLAGS -lm -ljasper -ljpeg -llcms2 + $CC $CFLAGS $LDFLAGS \ + -o dcraw dcraw.c \ + -lm -ljasper -ljpeg -llcms2 \ + -DLOCALEDIR=\"/usr/share/locale/\" } do_install() { vbin dcraw vman dcraw.1 + + for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po} + install -d "${DESTDIR}"/usr/share/locale/$k/LC_MESSAGES + msgfmt -o "${DESTDIR}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i + done }