From 92250b994e4b5d1e79bbbade635d271b13cb3b65 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Sat, 17 Mar 2007 20:17:47 +0000 Subject: [PATCH] Updates integrating external dcraw patch and improved deps. Thanks to Guillaume Castagnino for his work, closes bug 164070. Package-Manager: portage-2.1.2.2 --- media-plugins/kipi-plugins/ChangeLog | 10 ++++- media-plugins/kipi-plugins/Manifest | 32 ++++++++------- ...ins-0.1.3 => digest-kipi-plugins-0.1.3-r1} | 0 .../kipi-plugins-0.1.3-external-dcraw.patch | 40 +++++++++++++++++++ ....3.ebuild => kipi-plugins-0.1.3-r1.ebuild} | 16 ++++---- 5 files changed, 75 insertions(+), 23 deletions(-) rename media-plugins/kipi-plugins/files/{digest-kipi-plugins-0.1.3 => digest-kipi-plugins-0.1.3-r1} (100%) create mode 100644 media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch rename media-plugins/kipi-plugins/{kipi-plugins-0.1.3.ebuild => kipi-plugins-0.1.3-r1.ebuild} (82%) diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index 2884e7b6e1c1..bdb656b1be89 100644 --- a/media-plugins/kipi-plugins/ChangeLog +++ b/media-plugins/kipi-plugins/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-plugins/kipi-plugins # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.20 2007/03/17 19:46:52 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.21 2007/03/17 20:17:47 cryos Exp $ + +*kipi-plugins-0.1.3-r1 (17 Mar 2007) + + 17 Mar 2007; Marcus D. Hanwell + +files/kipi-plugins-0.1.3-external-dcraw.patch, + -kipi-plugins-0.1.3.ebuild, +kipi-plugins-0.1.3-r1.ebuild: + Updates integrating external dcraw patch and improved deps. Thanks to + Guillaume Castagnino for his work, closes bug 164070. *kipi-plugins-0.1.3 (17 Mar 2007) diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest index 5f58e748c883..92ac16053199 100644 --- a/media-plugins/kipi-plugins/Manifest +++ b/media-plugins/kipi-plugins/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX kipi-plugins-0.1.3-external-dcraw.patch 1693 RMD160 ae2efdfc22d229ed0f326acfcec0c6209d4a5063 SHA1 787940978b8f087aeb87fe9cee2408cc15c08436 SHA256 6015fe3f246288db60544d9f96d1af7af365696cc712e2db8aa65bfa6b486796 +MD5 e179ea1e5b4be86ce470ace8e0ae5096 files/kipi-plugins-0.1.3-external-dcraw.patch 1693 +RMD160 ae2efdfc22d229ed0f326acfcec0c6209d4a5063 files/kipi-plugins-0.1.3-external-dcraw.patch 1693 +SHA256 6015fe3f246288db60544d9f96d1af7af365696cc712e2db8aa65bfa6b486796 files/kipi-plugins-0.1.3-external-dcraw.patch 1693 DIST kipi-plugins-0.1.0-rc1.tar.bz2 3609994 RMD160 ff3a62876970c6394a5ef6ab18050e9fc36105bc SHA1 edbcc1a460ff19256bf41152037d818dd586bc0c SHA256 cbdeed82c050b7c5aac2be99586824e144e116fdd27198c99f27c31bec4d7931 DIST kipi-plugins-0.1.2.tar.bz2 7024061 RMD160 47e6b7893f0aad5fcecdee69780502f65aef90ce SHA1 1ce7b12539b52cdf08398f54dfcb489374df423b SHA256 54b7efb3f089bf9f4f24b12aee5b981bf49e530e6766ec90f1da4c559eeef318 DIST kipi-plugins-0.1.3.tar.bz2 7595003 RMD160 4a0ea25edf6af4adf4a4eba28e4a97a7859e3f35 SHA1 9882d247e6e42e0206e295e85d141a184da138e6 SHA256 b35a167676b36f082b78372533f7985aa5abb319d58ad18552ec3c1c0b545184 @@ -12,14 +16,14 @@ EBUILD kipi-plugins-0.1.2.ebuild 1358 RMD160 7be4c493d7b87245871cb14b8eb0d835a32 MD5 3eee6a9fb14949d5a5eb0ae6568af29f kipi-plugins-0.1.2.ebuild 1358 RMD160 7be4c493d7b87245871cb14b8eb0d835a324de49 kipi-plugins-0.1.2.ebuild 1358 SHA256 779ee66863647f54c33d68ad27ebd48bc510b02de94ade8901b1c1ee4ebf39fd kipi-plugins-0.1.2.ebuild 1358 -EBUILD kipi-plugins-0.1.3.ebuild 1382 RMD160 935b81cf872adc39dbbf22ff5843ddfba6ebfa4c SHA1 eaffebbf6508cd2448046cb8fa2d5d6cb03d2cb4 SHA256 207f2664e30e9ea94899b217aab306400777f5f988d7fd02aa3ec7dbb98d7aff -MD5 ec22e0c1741cf329a62939b5c6a571aa kipi-plugins-0.1.3.ebuild 1382 -RMD160 935b81cf872adc39dbbf22ff5843ddfba6ebfa4c kipi-plugins-0.1.3.ebuild 1382 -SHA256 207f2664e30e9ea94899b217aab306400777f5f988d7fd02aa3ec7dbb98d7aff kipi-plugins-0.1.3.ebuild 1382 -MISC ChangeLog 3385 RMD160 dc1fc0e5e5b62304f25142391109c12a5007b041 SHA1 401b2e8cf29b9251cc9d896de4ffd65902e4ffdc SHA256 e84b9359c4b9fefeee940f137d983bc43071ff4051718bdac5f6e5141d48ec47 -MD5 7c60db0f6b7ee21a5f5d0202b7cee7c3 ChangeLog 3385 -RMD160 dc1fc0e5e5b62304f25142391109c12a5007b041 ChangeLog 3385 -SHA256 e84b9359c4b9fefeee940f137d983bc43071ff4051718bdac5f6e5141d48ec47 ChangeLog 3385 +EBUILD kipi-plugins-0.1.3-r1.ebuild 1382 RMD160 79192a2d6c12d3cfac782340420409df7c7a5e39 SHA1 c879c71e873625cdf41cc288fe80c9dae1746f7c SHA256 754ef74abc44c80f2a50be7c4c7f992381b1c33f83f95e363dd62d213ef0944b +MD5 06f16fa9e74797a6bfedcde76a6c54c3 kipi-plugins-0.1.3-r1.ebuild 1382 +RMD160 79192a2d6c12d3cfac782340420409df7c7a5e39 kipi-plugins-0.1.3-r1.ebuild 1382 +SHA256 754ef74abc44c80f2a50be7c4c7f992381b1c33f83f95e363dd62d213ef0944b kipi-plugins-0.1.3-r1.ebuild 1382 +MISC ChangeLog 3734 RMD160 063e17e0f0a8ba0366c5e844a778d86641d2b8ae SHA1 df0762908ca3729b5a48420677cc5e6da890124e SHA256 3941d75db1383d30721f651e077f29f21592b3678aad8b86ceb85e83e4e75313 +MD5 44b9ea125ebdf2d420921d526204c6f4 ChangeLog 3734 +RMD160 063e17e0f0a8ba0366c5e844a778d86641d2b8ae ChangeLog 3734 +SHA256 3941d75db1383d30721f651e077f29f21592b3678aad8b86ceb85e83e4e75313 ChangeLog 3734 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -30,13 +34,13 @@ SHA256 dc11e59bb2db629612ad096ee8d54e1a92bc58a241ccd8de402e6174f0352cf5 files/di MD5 e47bb59c7847ca17575e56acbbca2795 files/digest-kipi-plugins-0.1.2 262 RMD160 20685584efaac3a0deb56ac2e224b1cecabbff54 files/digest-kipi-plugins-0.1.2 262 SHA256 9840ec899f9a496c49a69915de7a8e8836179c02f02ecf99e99dbaf5f3844079 files/digest-kipi-plugins-0.1.2 262 -MD5 9ebc324c39137199e7e99b3f868e0577 files/digest-kipi-plugins-0.1.3 262 -RMD160 4df375ffaa04b2e541713dee7d1cb50df046cc01 files/digest-kipi-plugins-0.1.3 262 -SHA256 4543e50d1752a5fc7fec83161e06b23fc16c492d46827f86ead472347782f77d files/digest-kipi-plugins-0.1.3 262 +MD5 9ebc324c39137199e7e99b3f868e0577 files/digest-kipi-plugins-0.1.3-r1 262 +RMD160 4df375ffaa04b2e541713dee7d1cb50df046cc01 files/digest-kipi-plugins-0.1.3-r1 262 +SHA256 4543e50d1752a5fc7fec83161e06b23fc16c492d46827f86ead472347782f77d files/digest-kipi-plugins-0.1.3-r1 262 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF/EW3ntT9W3vfTuoRAhoFAJ9+rYewcFarMsR4oySskTythjKkHwCeJPZ9 -0xGBltCGnQteZGZKHKIQgrA= -=fPcW +iD8DBQFF/EzyntT9W3vfTuoRAoceAKCemIQCn/PKsRTIj+HXSyz+UKjPLQCeJy9b +3y84/xSQKCygDk0irjD5yZA= +=tXbN -----END PGP SIGNATURE----- diff --git a/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3 b/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3-r1 similarity index 100% rename from media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3 rename to media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3-r1 diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch new file mode 100644 index 000000000000..2eb1b00d94b5 --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch @@ -0,0 +1,40 @@ +diff -r -U3 kipi-plugins-0.1.3/kipi-plugins/rawconverter/dcrawbinary.cpp kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/dcrawbinary.cpp +--- kipi-plugins-0.1.3/kipi-plugins/rawconverter/dcrawbinary.cpp 2007-01-24 22:04:18.000000000 +0100 ++++ kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/dcrawbinary.cpp 2007-02-04 11:58:33.000000000 +0100 +@@ -93,7 +93,7 @@ + + const char *DcrawBinary::path() + { +- return "kipidcraw"; ++ return "dcraw"; + } + + bool DcrawBinary::isAvailable() const +diff -r -U3 kipi-plugins-0.1.3/kipi-plugins/rawconverter/Makefile.am kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/Makefile.am +--- kipi-plugins-0.1.3/kipi-plugins/rawconverter/Makefile.am 2007-01-24 22:04:18.000000000 +0100 ++++ kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/Makefile.am 2007-02-04 12:01:30.000000000 +0100 +@@ -35,24 +35,3 @@ + messages: rc.cpp + $(XGETTEXT) *.cpp *.h -o $(podir)/kipiplugin_rawconverter.pot + +-#-- dcraw binary ------------------------------------------------- +- +-# RawConverter plugin use a dedicaced dcraw binary program to run. This is mandatory +-# since dcraw author have broken the command line options +-# compatibility with the 8.x serie. +-# Also, dcraw is not available like a library. +-# The dcraw.c source code is just a copy of official implementation, but +-# this one have been completly tested with this plugin. +-# Note: dcraw project page is http://cybercom.net/~dcoffin +- +-bin_PROGRAMS = kipidcraw +- +-# This line is require to disable color management support (using LCMS library) witch +-# is not yet supported by plugin. +-kipidcraw_CFLAGS = -DNO_LCMS -w +- +-kipidcraw_SOURCES = dcraw.c +- +-kipidcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) -lm +- +- diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild similarity index 82% rename from media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild rename to media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild index 997d45d90754..3498e169b7f4 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild,v 1.1 2007/03/17 19:46:52 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild,v 1.1 2007/03/17 20:17:47 cryos Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -19,22 +19,22 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="opengl gphoto2" -DEPEND=">=media-libs/libkexif-0.1 - >=media-libs/libkipi-0.1 +DEPEND=">=media-gfx/exiv2-0.12 + >=media-libs/libkipi-0.1.5 gphoto2? ( >=media-libs/libgphoto2-2.3.1 ) >=media-libs/imlib2-1.1.0 >=media-gfx/imagemagick-6.2.4 >=media-video/mjpegtools-1.6.0 opengl? ( virtual/opengl ) >=media-libs/tiff-3.5 - >=media-libs/libexif-0.1 - >=dev-libs/libxslt-1.1 - >=media-gfx/exiv2-0.9.1" + >=dev-libs/libxslt-1.1" RDEPEND="${DEPEND} - >=media-gfx/dcraw-5.02" + >=media-gfx/dcraw-8.45" -need-kde 3.1 +need-kde 3.5 + +PATCHES="${FILESDIR}/${P}-external-dcraw.patch" pkg_setup(){ slot_rebuild "media-libs/libkipi media-libs/libkexif" && die -- 2.26.2