diff options
| -rw-r--r-- | media-gfx/shotwell/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/shotwell/files/0.10-ldflags.patch | 25 | ||||
| -rw-r--r-- | media-gfx/shotwell/files/0.11.0-ldflags.patch | 25 | ||||
| -rw-r--r-- | media-gfx/shotwell/files/shotwell-0.10.1-libraw-config.patch | 16 | ||||
| -rw-r--r-- | media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch | 109 | ||||
| -rw-r--r-- | media-gfx/shotwell/shotwell-0.12.1.ebuild | 61 | ||||
| -rw-r--r-- | media-gfx/shotwell/shotwell-0.12.2.ebuild | 62 |
7 files changed, 7 insertions, 300 deletions
diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog index e480eccf6169..964f7596f076 100644 --- a/media-gfx/shotwell/ChangeLog +++ b/media-gfx/shotwell/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/shotwell # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.37 2012/05/21 20:38:54 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.38 2012/08/26 00:39:29 hwoarang Exp $ + + 26 Aug 2012; Markos Chandras <hwoarang@gentoo.org> -files/0.10-ldflags.patch, + -files/0.11.0-ldflags.patch, -files/shotwell-0.10.1-libraw-config.patch, + -files/shotwell-0.11.2-libraw-0.14.patch, -shotwell-0.12.1.ebuild, + -shotwell-0.12.2.ebuild: + Remove old ebuilds. Clean up files 21 May 2012; Markos Chandras <hwoarang@gentoo.org> shotwell-0.12.3.ebuild: respect LINGUAS. Bug #407853 @@ -179,4 +185,3 @@ 07 Apr 2010; Benedikt Böhm <hollow@gentoo.org> +shotwell-0.5.0.ebuild, +metadata.xml: initial ebuild wrt #309615 - diff --git a/media-gfx/shotwell/files/0.10-ldflags.patch b/media-gfx/shotwell/files/0.10-ldflags.patch deleted file mode 100644 index 9ba105473db5..000000000000 --- a/media-gfx/shotwell/files/0.10-ldflags.patch +++ /dev/null @@ -1,25 +0,0 @@ - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c1e5c30..31e8190 100644 ---- a/Makefile -+++ b/Makefile -@@ -657,7 +657,7 @@ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile - $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ - - $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES) - $(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg)) -@@ -685,7 +685,7 @@ docs: - glade: lib$(PROGRAM).so - - lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ - - .PHONY: pkgcheck - pkgcheck: diff --git a/media-gfx/shotwell/files/0.11.0-ldflags.patch b/media-gfx/shotwell/files/0.11.0-ldflags.patch deleted file mode 100644 index c10cd8b978dc..000000000000 --- a/media-gfx/shotwell/files/0.11.0-ldflags.patch +++ /dev/null @@ -1,25 +0,0 @@ - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index a3c0122..34f074d 100644 ---- a/Makefile -+++ b/Makefile -@@ -676,7 +676,7 @@ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile - $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ - glib-compile-schemas misc - - $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES) -@@ -705,7 +705,7 @@ docs: - glade: lib$(PROGRAM).so - - lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ - - .PHONY: pkgcheck - pkgcheck: diff --git a/media-gfx/shotwell/files/shotwell-0.10.1-libraw-config.patch b/media-gfx/shotwell/files/shotwell-0.10.1-libraw-config.patch deleted file mode 100644 index 0c3ee96b85a5..000000000000 --- a/media-gfx/shotwell/files/shotwell-0.10.1-libraw-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libraw-config b/libraw-config -index 2ddfb6d..dc49ebf 100755 ---- a/libraw-config -+++ b/libraw-config -@@ -59,9 +59,9 @@ libs() { - - # TODO: Cannot check version of library if no .pc file installed. - exists() { -- if pkg-config --silence-errors --exists 'libraw_r >= $3'; then -+ if pkg-config --silence-errors --exists "libraw_r >= $1"; then - : -- elif pkg-config --silence-errors --exists 'libraw >= $3'; then -+ elif pkg-config --silence-errors --exists "libraw >= $1"; then - : - elif ! searchpath $LIB_DIRS "libraw_r.a" || ! searchpath $HEADER_DIRS "libraw/libraw.h"; then - printf "\nPackage libraw not found\n" diff --git a/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch b/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch deleted file mode 100644 index cdf29486dede..000000000000 --- a/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 06ce5a48a3dcc6416ac81995bc9d2f7001d624f9 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Sun, 2 Oct 2011 05:22:07 -0400 -Subject: [PATCH] Do not use libraw API that was dropped in libraw-0.14 - -add_masked_borders_to_bitmap() and rotate_fuji_raw() were removed from -0.14 API. We can safely drop their vala wrappers since they weren't -being used anywhere. And drop CANNOT_ADDMASK error code, since it was -dropped from the libraw API, and could only result from the removed -add_masked_borders_to_bitmap(). - -The LIBRAW_FILTERING_* constans were removed from the public API. -Fortunately, the only one of them that shotwell code was using was -LIBRAW_FILTERING_AUTOMATIC - which is now the default libraw behavior. -Therefore, we can safely drop the LibRaw.Filtering enum. ---- - src/photos/GRaw.vala | 12 ------------ - vapi/libraw.vapi | 14 -------------- - 2 files changed, 0 insertions(+), 26 deletions(-) - ---- a/src/photos/GRaw.vala -+++ b/src/photos/GRaw.vala -@@ -163,10 +163,6 @@ public class Processor { - proc = new LibRaw.Processor(options); - } - -- public void add_masked_borders_to_bitmap() { -- proc.add_masked_borders_to_bitmap(); -- } -- - public void adjust_sizes_info_only() throws Exception { - throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); - } -@@ -215,10 +211,6 @@ public class Processor { - throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename)); - } - -- public void rotate_fuji_raw() throws Exception { -- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); -- } -- - public void thumb_writer(string filename) throws Exception { - throw_exception("thumb_writer", proc.thumb_writer(filename)); - } -@@ -262,7 +254,6 @@ public class Processor { - // camera_profile - // bad_pixels - // dark_frame -- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; - output_params->output_bps = 8; - // output_tiff - output_params->user_flip = GRaw.Flip.FROM_SOURCE; -@@ -303,9 +294,6 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti - case LibRaw.Result.UNSUPPORTED_THUMBNAIL: - throw new Exception.UNSUPPORTED_THUMBNAIL(msg); - -- case LibRaw.Result.CANNOT_ADDMASK: -- throw new Exception.CANNOT_ADDMASK(msg); -- - case LibRaw.Result.UNSUFFICIENT_MEMORY: - throw new Exception.OUT_OF_MEMORY(msg); - ---- a/vapi/libraw.vapi -+++ b/vapi/libraw.vapi -@@ -14,17 +14,6 @@ public unowned string version(); - - public unowned string versionNumber(); - --[CCode (cname="enum libraw_Filtering", cprefix="LIBRAW_FILTERING_")] --public enum Filtering { -- DEFAULT, -- NOZEROES, -- NOBLACK, -- NORAWCURVE, -- NONE, -- LIBRAWOWN, -- AUTOMATIC --} -- - [SimpleType] - [CCode (cname="libraw_imgother_t")] - public struct ImageOther { -@@ -121,7 +110,6 @@ public struct OutputParams { - public bool use_camera_wb; - public bool use_camera_matrix; - public int output_color; -- public Filtering filtering_mode; - public int output_bps; - public bool output_tiff; - public int user_flip; -@@ -171,7 +159,6 @@ public class Processor { - [CCode (cname="libraw_init")] - public Processor(Options flags = Options.NONE); - -- public void add_masked_borders_to_bitmap(); - public Result adjust_sizes_info_only(); - [CCode (cname="libraw_dcraw_document_mode_processing")] - public Result document_mode_processing(); -@@ -192,7 +179,6 @@ public class Processor { - [CCode (cname="libraw_dcraw_ppm_tiff_writer")] - public Result ppm_tiff_writer(string outfile); - public void recycle(); -- public Result rotate_fuji_raw(); - [CCode (cname="libraw_dcraw_thumb_writer")] - public Result thumb_writer(string outfile); - public Result unpack(); --- -1.7.7 - diff --git a/media-gfx/shotwell/shotwell-0.12.1.ebuild b/media-gfx/shotwell/shotwell-0.12.1.ebuild deleted file mode 100644 index 15505fd6b79a..000000000000 --- a/media-gfx/shotwell/shotwell-0.12.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.12.1.ebuild,v 1.2 2012/03/29 15:59:06 jlec Exp $ - -EAPI=4 -GCONF_DEBUG="no" -inherit gnome2 versionator eutils multilib toolchain-funcs - -MY_PV=$(get_version_component_range 1-2) -DESCRIPTION="Open source photo manager for GNOME" -HOMEPAGE="http://www.yorba.org/shotwell/" -SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-db/sqlite-3.5.9:3 - >=dev-libs/dbus-glib-0.80 - >=dev-libs/glib-2.30.0:2 - >=dev-libs/json-glib-0.7.6 - >=dev-libs/libgee-0.5.0:0 - >=dev-libs/libunique-3.0.0:3 - >=dev-libs/libxml2-2.6.32:2 - >=media-libs/gexiv2-0.3.92 - media-libs/gst-plugins-base:0.10 - media-libs/gstreamer:0.10 - media-libs/lcms:2 - >=media-libs/libexif-0.6.16 - >=media-libs/libgphoto2-2.4.2 - >=media-libs/libraw-0.14.0 - >=net-libs/libsoup-2.26.0:2.4 - net-libs/rest:0.7 - net-libs/webkit-gtk:3 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - dev-lang/vala:0.16" - -DOCS=( AUTHORS MAINTAINERS NEWS README THANKS ) - -pkg_setup() { - tc-export CC - G2CONF="${G2CONF} - --disable-schemas-compile - --disable-desktop-update - --disable-icon-update - --lib=$(get_libdir)" -} - -src_prepare() { - sed \ - -e 's|CFLAGS :|CFLAGS +|g' \ - -i plugins/Makefile.plugin.mk || die -} - -src_compile() { - emake VALAC="$(type -p valac-0.16)" -} diff --git a/media-gfx/shotwell/shotwell-0.12.2.ebuild b/media-gfx/shotwell/shotwell-0.12.2.ebuild deleted file mode 100644 index 09841c924492..000000000000 --- a/media-gfx/shotwell/shotwell-0.12.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.12.2.ebuild,v 1.2 2012/05/11 21:37:05 hwoarang Exp $ - -EAPI=4 -GCONF_DEBUG="no" -inherit gnome2 versionator eutils multilib toolchain-funcs - -MY_PV=$(get_version_component_range 1-2) -DESCRIPTION="Open source photo manager for GNOME" -HOMEPAGE="http://www.yorba.org/shotwell/" -SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-db/sqlite-3.5.9:3 - >=dev-libs/dbus-glib-0.80 - >=dev-libs/glib-2.30.0:2 - >=dev-libs/json-glib-0.7.6 - >=dev-libs/libgee-0.5.0:0 - >=dev-libs/libunique-3.0.0:3 - >=dev-libs/libxml2-2.6.32:2 - >=media-libs/gexiv2-0.3.92 - media-libs/gst-plugins-base:0.10 - media-libs/gstreamer:0.10 - media-libs/lcms:2 - >=media-libs/libexif-0.6.16 - >=media-libs/libgphoto2-2.4.2 - >=media-libs/libraw-0.14.0 - >=net-libs/libsoup-2.26.0:2.4 - net-libs/rest:0.7 - net-libs/webkit-gtk:3 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - dev-lang/vala:0.16 - sys-devel/m4" - -DOCS=( AUTHORS MAINTAINERS NEWS README THANKS ) - -pkg_setup() { - tc-export CC - G2CONF="${G2CONF} - --disable-schemas-compile - --disable-desktop-update - --disable-icon-update - --lib=$(get_libdir)" -} - -src_prepare() { - sed \ - -e 's|CFLAGS :|CFLAGS +|g' \ - -i plugins/Makefile.plugin.mk || die -} - -src_compile() { - emake VALAC="$(type -p valac-0.16)" -} |