From dc45b83b28fb83e9659492066e347b8dc60bc9e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2018 12:30:23 +0000 Subject: gentoo resync 04.02.2018 --- media-gfx/ufraw/Manifest | 2 + media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch | 32 ++++++++++ media-gfx/ufraw/ufraw-0.22-r2.ebuild | 94 ++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch create mode 100644 media-gfx/ufraw/ufraw-0.22-r2.ebuild (limited to 'media-gfx/ufraw') diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest index 6df83dc96445..64364969bf1f 100644 --- a/media-gfx/ufraw/Manifest +++ b/media-gfx/ufraw/Manifest @@ -3,7 +3,9 @@ AUX ufraw-0.22-crashfix.patch 563 BLAKE2B 98dfd70be0cb7ec82b9f87c946a0638d7c0d44 AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd483447bc88a3ba4af249724f7c2dce5110d008934ce6e1601970ad7a42a952c8197b49605c3534c458e87ff804ccb1be861442d029 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b 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-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d +EBUILD ufraw-0.22-r2.ebuild 1970 BLAKE2B 169afae7cde2cbdc098115c8f12de0408d0bd0e086b63d434ac58d84701548834dcbb012fb3daff6f896e099d02b87cfba9aeee5f268ba0cc3ce7a8d8c877d57 SHA512 2302b7d3b026dfbad8fb0e7e1d7d4dec4dfc6b6780eb50e6accd7df2e6be11b2f51306c9231140e11128251496c892e0201b9dbeeed3bbc22452adc6e8cf2792 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9 diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch new file mode 100644 index 000000000000..dca3834cbe8e --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch @@ -0,0 +1,32 @@ +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/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild new file mode 100644 index 000000000000..4df5995e5355 --- /dev/null +++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone" + +REQUIRED_USE="gimp? ( gtk )" + +RDEPEND=" + dev-libs/glib:2= + >=media-gfx/exiv2-0.11:0= + media-libs/lcms:2= + >=media-libs/lensfun-0.2.5:= + media-libs/libpng:0= + media-libs/tiff:0= + virtual/jpeg:0= + fits? ( sci-libs/cfitsio:0= ) + gimp? ( >=media-gfx/gimp-2 ) + gnome? ( >=gnome-base/gconf-2 ) + gtk? ( + >=media-gfx/gtkimageview-1.5 + >=x11-libs/gtk+-2.6:2 + ) + jpeg2k? ( media-libs/jasper:= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +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 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable contrast) \ + $(use_with fits cfitsio) \ + $(use_with gimp) \ + $(use_enable gnome mime) \ + $(use_with gtk) \ + $(use_enable jpeg2k jasper) \ + $(use_enable openmp) \ + $(use_enable timezone dst-correction) +} + +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