From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/ufraw/Manifest | 11 +++ .../ufraw/files/ufraw-0.17-cfitsio-automagic.patch | 28 +++++++ media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 ++++ .../files/ufraw-0.22-drop_superfluous_abs.patch | 16 ++++ .../ufraw/files/ufraw-0.22-fix-unsigned-char.patch | 20 +++++ .../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 +++++ media-gfx/ufraw/metadata.xml | 16 ++++ media-gfx/ufraw/ufraw-0.22-r1.ebuild | 92 ++++++++++++++++++++++ media-gfx/ufraw/ufraw-0.22.ebuild | 79 +++++++++++++++++++ 9 files changed, 298 insertions(+) create mode 100644 media-gfx/ufraw/Manifest create mode 100644 media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch create mode 100644 media-gfx/ufraw/files/ufraw-0.22-crashfix.patch create mode 100644 media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch create mode 100644 media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch create mode 100644 media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch create mode 100644 media-gfx/ufraw/metadata.xml create mode 100644 media-gfx/ufraw/ufraw-0.22-r1.ebuild create mode 100644 media-gfx/ufraw/ufraw-0.22.ebuild (limited to 'media-gfx/ufraw') diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest new file mode 100644 index 000000000000..10c9be7ddafa --- /dev/null +++ b/media-gfx/ufraw/Manifest @@ -0,0 +1,11 @@ +AUX ufraw-0.17-cfitsio-automagic.patch 933 SHA256 d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18 SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b WHIRLPOOL 7815f44171243408468347a6acdadbda239931b2f2a810e4f0a8e98023506d9761e73f3db137aad7930dd5814f7ffcc2c670cf572d50caf394e88d85cafef03b +AUX ufraw-0.22-crashfix.patch 563 SHA256 6beb9bd151924e38f7908d26019c72e66d06bf71a84cde8d7c80ccf8104e3bdb SHA512 e02e71ef5660e83f49f7787c1819b6f86ed0de939db1bcd0e988f1c432ead9bd7f9e180e6974964305ab0ea65ba679b3363994213f8ffa04715176cfe45173cf WHIRLPOOL e041e6a95d25dd6c7b74e9d92fac79f31a10ab7a8f195d9ffb380e55344a91bc19039dd694df6e5bdaddd60536001c29ee504e817aef4913360287fd29d738d5 +AUX ufraw-0.22-drop_superfluous_abs.patch 448 SHA256 8818808f8fd75fc6860783ffddbae42b5a2b7da937711cc6c2d482dee8f50702 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60 WHIRLPOOL fda4ec0c6f4e429b1c275231fce480505c80b92e0810a92e7ff212cf5bc69dbd624ac7ad4f3e70ff6bdaa21c3db969f79370326954dbfb1f760bb47e16b0f869 +AUX ufraw-0.22-fix-unsigned-char.patch 748 SHA256 03cdad9eba1f7ff5bad5e94cda44cc37ba9e7532a144f79715d4d4f19996f177 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b WHIRLPOOL fcf7e164db8ed511cee3add659e190a11ee16612b3b670d9f1e82fbd61133e44bd1d8294e4408c76d7df4e93a894b6af9bccdc6ff4cb1a53e3407b2645788371 +AUX ufraw-0.22-jasper-automagic.patch 613 SHA256 d8245cb9c45cc02686885aed1886243a06b028fc284cb5830e5b1f1f1e4d7db2 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4 WHIRLPOOL e3b83b3b48987f8cd18ef931daaa9624975d55ab03dc1aa4aefcfe922b3deb0171367b554346ebe58280f122f1332b965c1814c4d621976024298d32861e98a8 +DIST ufraw-0.22.tar.gz 1103554 SHA256 f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2 WHIRLPOOL 5cb53f83d2f2baccd0752a0898eb894b8e15ad234962f3e3cc4ae2166309cd68893dceef28d32018aa486da1a09c64df378a2569f764a42f8251f5a568c14e5f +EBUILD ufraw-0.22-r1.ebuild 1948 SHA256 7f16938b4f319b164b4379d48fd4bff64c4d1d0dfce4aabf7e12c4e94dbf861c SHA512 6639481729e3e4cf820a0764598ab79cd64fddb4d1c692329717b9b40af0016bfb93da3351b5ddff9ff0e92a6b61aa6df17bc28d09a815193b2318ca976a6317 WHIRLPOOL f8ecf6f00a70f1c9d7c2ca39bde4722a125811d525c9efc6caca340505c3c21487367c2c5f9ca595a32edaba65675fdd8c3780d45485255268a42f3cc3ebf0fc +EBUILD ufraw-0.22.ebuild 1684 SHA256 e4d2828b5fbf6bd2211f1fb4214419eb0ed637b21a9e26cef5a7f896e923144d SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414 WHIRLPOOL 64b3944d972a621d12195fcf215af7ea9e05bd4d7e52db25315326d3d050ca4b876ed195dd29c82422988d142954160eeb7941ac0c1f5bc467e736a792f4c60e +MISC ChangeLog 3098 SHA256 66ce55eb3f366f94445b493446023c42c1fc3d7c9ad5ab44c03eb8c8523a8e26 SHA512 4d280df300496da294ca786f6c61e35df6dca727be33d62eadb311badb3dbb22c8cdd81e15fc9e0a29849905befd5f5161a507c6d61644d5810167c9ecc4bff2 WHIRLPOOL 1e87d8d885ad44e9866d67a97239726c3ce70a63199dc618fbe814ac8858275866ac6d4736225261de4139f702fd4808d102305ae47709b5eaba58632b235db9 +MISC ChangeLog-2015 17250 SHA256 84d004590708783ef0c0342f6e1fcc6be87042d52ccd35396d5bd2bd8970afcf SHA512 a356e4b3f467f250883eedb0790a63d777a00c74f520a651b8dc9336dec30317926b9f02831fadf87ff7a47858aedcfa6920e814d9dd4f7289ec06e621bc73c2 WHIRLPOOL 9a9599dfd4e3a28e09dd18591a16095d3ff0d081f8ee85f7baf52988458f1eec9f405c949f2ce7a59088004ddc4161944e08fa35be9174656346b56b6f1150ec +MISC metadata.xml 588 SHA256 b5655f3d2201471aaa13297f86f15b019d8813d7b810b869813caad895fd9ba3 SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9 WHIRLPOOL 5666c636c9d558e8cd8e411b885c6bc87dfb9ed057cfe830d380bbd3702320b4ebf0e54c428df0e164e068989e7a4a30344495df93835ff6174ec5143ab10dc0 diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch new file mode 100644 index 000000000000..aff7c5a25930 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch @@ -0,0 +1,28 @@ +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-crashfix.patch b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch new file mode 100644 index 000000000000..76fe83fa8f2e --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 000000000000..8c11f6649781 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch @@ -0,0 +1,16 @@ +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-fix-unsigned-char.patch b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch new file mode 100644 index 000000000000..a5397260ffb5 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch @@ -0,0 +1,20 @@ +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-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch new file mode 100644 index 000000000000..93e1d691af1d --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch @@ -0,0 +1,21 @@ +--- 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/metadata.xml b/media-gfx/ufraw/metadata.xml new file mode 100644 index 000000000000..284cb404dd5c --- /dev/null +++ b/media-gfx/ufraw/metadata.xml @@ -0,0 +1,16 @@ + + + + + graphics@gentoo.org + Gentoo Graphics Project + + + 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-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild new file mode 100644 index 000000000000..c0ccf38a72d4 --- /dev/null +++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools fdo-mime gnome2-utils toolchain-funcs + +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 +) + +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 + fdo-mime_mime_database_update + fdo-mime_desktop_database_update + gnome2_gconf_install + fi +} + +pkg_postrm() { + if use gnome; then + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + fi +} diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild b/media-gfx/ufraw/ufraw-0.22.ebuild new file mode 100644 index 000000000000..a33821caf159 --- /dev/null +++ b/media-gfx/ufraw/ufraw-0.22.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs + +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 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="contrast fits gimp gnome gtk 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= ) + gnome? ( >=gnome-base/gconf-2 ) + gtk? ( >=x11-libs/gtk+-2.6:2 + >=media-gfx/gtkimageview-1.5 ) + gimp? ( >=media-gfx/gimp-2 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch + eautoreconf +} + +src_configure() { + econf \ + $(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) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install + dodoc README TODO +} + +pkg_preinst() { + if use gnome; then + gnome2_gconf_savelist + fi +} + +pkg_postinst() { + if use gnome; then + fdo-mime_mime_database_update + fdo-mime_desktop_database_update + gnome2_gconf_install + fi +} + +pkg_postrm() { + if use gnome; then + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + fi +} -- cgit v1.2.3