From c9d526c8083d89af340c6d951044aba6791764f6 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 8 Oct 2011 16:47:08 +0000 Subject: [PATCH] Version bump wrt #362919 by Jens-Uwe Peter, Martijn van den Broek and Stefan Wimmer Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64 --- media-gfx/dcraw/Manifest | 16 +++--- media-gfx/flam3/Manifest | 18 ++++--- media-gfx/rawstudio/ChangeLog | 9 +++- .../files/rawstudio-2.0-libpng15.patch | 35 ++++++++++++ media-gfx/rawstudio/rawstudio-2.0.ebuild | 54 +++++++++++++++++++ 5 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 media-gfx/rawstudio/files/rawstudio-2.0-libpng15.patch create mode 100644 media-gfx/rawstudio/rawstudio-2.0.ebuild diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest index 500271699e9c..0094529ce1c6 100644 --- a/media-gfx/dcraw/Manifest +++ b/media-gfx/dcraw/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX conversion-examples.txt 545 RMD160 f03310a2adee83df1b883f64c122d2d72c493d6f SHA1 159c57f2feba36029c97baa182670ffb0c05c0ce SHA256 b6a5a658c550ffbd26bbc1b6e7723bced7461af234062af7d77e53441429d218 AUX dcwrap 437 RMD160 c72cc183f18df5878c84a988d0746089baae0f10 SHA1 fe7f75f15f7e0dd2cdde5f96d2a0185213974066 SHA256 fd113fe5c1005116f8e03db59fb1f505667883f237abe0c799cd5a45d6ceb0bd @@ -9,15 +9,13 @@ DIST parse-1.71.tar.bz2 8129 RMD160 bc7732b2b52cdda69b9a39d7e30cc02aff371a6b SHA DIST parse-1.73.tar.bz2 8186 RMD160 134e3bf152d145fedd1f137f82b3f8791804310c SHA1 efdc722f858d730cf45af1417d2f6ed8ae3fe281 SHA256 51f75837b7fa7f6389f43c875ad8320c41a44c4213922dc767e16dc424462c3c DIST rawphoto-1.32.tar.bz2 3841 RMD160 11c6c0fd621170ec5657c8803300ade7c3c21f99 SHA1 6952d39556c3b83e1c790c6ccd34f8233cf2dd53 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c EBUILD dcraw-9.05.ebuild 3310 RMD160 1eb5a3cf9e023c7f0df9bc9d32ba44a10b279fef SHA1 21c5721161593a2c12d510cbbf5f0f828ad551b3 SHA256 881b9c3258c916e966dd2557dd33dcea4b67f87531f1204c4796f09f3fd0eb96 -EBUILD dcraw-9.10.ebuild 3427 RMD160 ebdfe50d4753665b04c3a871ffeb6425b1f6868a SHA1 ef6e4345ef0165b68fe215d8525b63d53bbae380 SHA256 3dc2da26c54072247e51dc8bc085c4c93d67c195b23df4b431d85708563ecfa9 -MISC ChangeLog 9416 RMD160 16d32cc098aa36f25b8c2b7aaac4002b3096887b SHA1 bc0570d1d5ae7161614dc4fc8b93f37ddd55feb7 SHA256 dbb37516c3e7ba0fe9e2ce81a542d3b776b4523535c2bd0d65728eed5a295f3f +EBUILD dcraw-9.10.ebuild 3433 RMD160 07fcfce45a934d5fe36132153f61b02a0e5a5dba SHA1 706b0eb80417c51f8f6279be4ab567f1b3d9c8b8 SHA256 914160969d1c5f29eda66dc891e5b79555aee66eb1067d43b585d8435253b10b +MISC ChangeLog 9527 RMD160 1cd82dc8ca0872a0b845ca37f5971c25680a08dd SHA1 540803855972ec4cd532efb572242b8f363900d9 SHA256 f60a407b7fe905d37265d2316ff467757b730ad9407ed1ab057824b4059ba605 MISC metadata.xml 792 RMD160 73bb1a1e3121fd87da886506af1a7785d3def72f SHA1 9dc189c861c8135a70dfedde66db17038c18853e SHA256 090d3f04638d3826134d433f415cccda37cd31b3cbdd6169112215a3f0182e8c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59owcACgkQfXuS5UK5QB2cZAQAlDJjU4r/xvnmYeTwD3Bw7PJr -UCciKN7exznEX/dtPqsKWwShf4XHcShWXW1IsoSH1MkIPZFI/vc7rCv/5X3xr0Ta -DaOO6H9Wq6+gbYaiRBrzIeoNK3pgrB1x2oMqYYW8+Tsv20DhiurZW2GFeieO5w2a -gkp9OCaGAGJYWpX7f8E= -=sDj/ +iEYEAREKAAYFAk6Qf00ACgkQuUQtlDBCeQLFxwCeIUlRzQ7dhZJIgOlxOq/AMmUh +v9EAoIF0ZC5TSQCuTg0eh2arc+oq5WkZ +=2XNV -----END PGP SIGNATURE----- diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest index ac6996abcba0..7ce930a8d973 100644 --- a/media-gfx/flam3/Manifest +++ b/media-gfx/flam3/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX flam3-3.0.1-libpng15.patch 2446 RMD160 ecd5ac1fc32aa3932b2d76d809636af1b2911a9b SHA1 17ece6cc00899e5135dad2bc79f97dfbd73107a6 SHA256 2f90c112edff5418ca662b4dea7de8a21ca870fad1024c294c714e89b6b7fb23 DIST flam3-2.7.18.tar.gz 1093666 RMD160 abfea3fcbc7dfb2f671c4645364faa487edeee68 SHA1 e4b6420bc4c47f489903a0fedf66d39f5ada7aaa SHA256 f3f8155d8a0ea11a23412566e18b2751da84f9ae24bd0f37a5f6484b10ad817e DIST flam3-3.0.1.tar.gz 1238703 RMD160 2e834147deb2edc0ee26054cb4fc8b502bce4986 SHA1 8814515f2e49e034e47cf97e9d2c0e932844abb9 SHA256 70810049604527a689ba172670c152b463273255e46f0f04091c867399859aa7 DIST flam3-3.0.tar.gz 1238210 RMD160 e77bf1197f3ad5aedd62c581bbe9d816a802bba1 SHA1 5b3317bdf51ecce7414a728c9d3735122a083b23 SHA256 411a59b86fa6a2122857b08370c197ad113295d62e403d97bd4e1376746cafc1 EBUILD flam3-2.7.18-r1.ebuild 690 RMD160 90713648fb327e7297c93fad1634d9bd58ba0b45 SHA1 5e6c5df08e0205dc060c1ca3958c304400370d38 SHA256 92fa4a45ee34d80268a3775477310dbbd5821397d8cb76d55b41326d3c630e60 -EBUILD flam3-3.0.1.ebuild 880 RMD160 0d8ee7cd61e13d9b9b866d319d7fd9aa12e231a4 SHA1 b6e29d4e76b20f44558fad05a6654dfb8dae0fea SHA256 aecd6897d8b6633af679e64433261635fc3c5deea8c450e0f6a00d9aa3828930 +EBUILD flam3-3.0.1.ebuild 878 RMD160 a1d33522af509eed8920b600814fd9dda02ca54c SHA1 cdb0f402d129eb751a54ab6b8a37a99a573d1e92 SHA256 e4ab2a343cb9bf3a8869b72871bbd93242a76b62ef3966ca18020eac9736d75c EBUILD flam3-3.0.ebuild 720 RMD160 a739d6924481ed0db8044ab349c7f945f37f6357 SHA1 db0f15576cd0235ec44e82669fb2113c66e99f7e SHA256 fba8ecc9db3601210cde62bc024f48a59c85f34095d8505dd817e92fc1227b8d EBUILD flam3-9999.ebuild 791 RMD160 526708d5ec6a845d0f9f571c7ac11b9bcb947570 SHA1 865bcb0a408e7a97c9457eae1089682763da6544 SHA256 ff744ac0d1683bbd02bb5f73c75095c1f7d34902c3a9c8ef3cdd0da910a81676 -MISC ChangeLog 2320 RMD160 c6e5a22726a390207212de8caeae210fc3af2547 SHA1 3a0ddeefeaf22ae4427f2e352d29485465c55f6c SHA256 c38a53670176131467b855cb9578508470de3db5f37ce6439106db45b8f91fe7 +MISC ChangeLog 2421 RMD160 3d4de09f086044af7d7617559419052cd4961a39 SHA1 9ace337468defa8979bd855f6a33699f94793b99 SHA256 af49e2443468295db45d3be86d6478a340a5328c270e23d51102645fca2a23c7 MISC metadata.xml 233 RMD160 50382a495f6d0286f96498c8a5e9b919c7e1d8d4 SHA1 5178d90b05252ea896110ef08ca4ee693b6ad9eb SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk6QffoACgkQuUQtlDBCeQJ+twCfZCxW/AHplqn4ElBr7LNOJuCq -/jYAnRfvQZ343+YNQcOA1cE0xI/gKZfu -=vO6/ +iQEcBAEBAgAGBQJOkH/GAAoJEEdUh39IaPFNz0sIAJ4icNstjD5Ugl949RHqRrum +BcKbS7JdvBiGSUKeWS65NvWJzjhL3pGpR+Gl/nxk7rKFhEZY0q41aQlGo+OZoDb5 +5hAjwTfnG7Uz5PzZxq0mNWRJLb1jHuGAKbPR6XowGqNQAJZeue6nX6JFdRhhxamA +hS0VNpp3Kz0e8x/1kMAEoKE5lnWCdFmC/XW62pp2Dlf4UcJyISEsT3lwRVmAAMNm +hakiSMZnu25W5libI3+BQbCwYUY0TMVi2uEDA/IgVfnEE7SbykUTQA0+D3Fmfp0c +7XpqjNBTaMdiqcJP9PZyRnnHSUCnwQ+6/ooDMIL+22prpMziVzXkTrQ6AbYqzqw= +=ab7o -----END PGP SIGNATURE----- diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog index db6bc2570ca1..a007f6caee72 100644 --- a/media-gfx/rawstudio/ChangeLog +++ b/media-gfx/rawstudio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/rawstudio # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.22 2011/03/12 10:34:50 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.23 2011/10/08 16:47:08 ssuominen Exp $ + +*rawstudio-2.0 (08 Oct 2011) + + 08 Oct 2011; Samuli Suominen +rawstudio-2.0.ebuild, + +files/rawstudio-2.0-libpng15.patch: + Version bump wrt #362919 by Jens-Uwe Peter, Martijn van den Broek and Stefan + Wimmer 12 Mar 2011; Tim Harder rawstudio-1.2.ebuild: Use slot dep for gtk+. diff --git a/media-gfx/rawstudio/files/rawstudio-2.0-libpng15.patch b/media-gfx/rawstudio/files/rawstudio-2.0-libpng15.patch new file mode 100644 index 000000000000..c23a24f64034 --- /dev/null +++ b/media-gfx/rawstudio/files/rawstudio-2.0-libpng15.patch @@ -0,0 +1,35 @@ +--- plugins/output-pngfile/output-pngfile.c ++++ plugins/output-pngfile/output-pngfile.c +@@ -23,6 +23,7 @@ + #include + #include "config.h" + #include ++#include + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) +@@ -198,7 +199,7 @@ + rs_icc_profile_get_data(profile, &data, &data_length); + + // FIXME: Insert correct profile name +- png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length); ++ png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length); + if (pngfile->save16bit) + png_set_gAMA(png_ptr, info_ptr, 1.0); + } +--- plugins/load-gdk/exiv2-colorspace.cpp ++++ plugins/load-gdk/exiv2-colorspace.cpp +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, + (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ (png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); diff --git a/media-gfx/rawstudio/rawstudio-2.0.ebuild b/media-gfx/rawstudio/rawstudio-2.0.ebuild new file mode 100644 index 000000000000..814b5eb41c47 --- /dev/null +++ b/media-gfx/rawstudio/rawstudio-2.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-2.0.ebuild,v 1.1 2011/10/08 16:47:08 ssuominen Exp $ + +EAPI=4 +inherit autotools eutils + +DESCRIPTION="A program for reading and manipulating raw images from digital cameras" +HOMEPAGE="http://rawstudio.org/" +SRC_URI="http://${PN}.org/files/release/${P}.tar.gz" + +LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-db/sqlite:3 + dev-libs/libxml2 + >=dev-libs/openssl-1 + >=gnome-base/gconf-2 + media-libs/flickcurl + =media-libs/lcms-1* + media-libs/lensfun + media-libs/libgphoto2 + media-libs/tiff + media-gfx/exiv2 + net-misc/curl + sci-libs/fftw:3.0 + sys-apps/dbus + sys-libs/zlib + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/libX11" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext" + +DOCS=( AUTHORS NEWS README TODO ) + +src_prepare() { + find . -name Makefile.am -exec sed -i -e 's:-O4:-Wall:' {} + + sed -i -e '/^icondir/s:icons:pixmaps:' pixmaps/Makefile.am || die + epatch "${FILESDIR}"/${P}-libpng15.patch + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + find "${ED}"usr -name '*.la' -exec rm -f {} + +} -- 2.26.2