From d5264fb95dba3f4524a6c62f4b5bea5b98e524db Mon Sep 17 00:00:00 2001 From: Thilo Bangert Date: Mon, 7 Jun 2010 18:51:23 +0000 Subject: ebuild for entangle svn path=/ebuilds/; revision=109 --- media-gfx/entangle/ChangeLog | 11 ++++++ media-gfx/entangle/Manifest | 6 ++++ media-gfx/entangle/entangle-0.1.0.ebuild | 41 +++++++++++++++++++++ .../entangle/files/entangle-0.1.0-fix-install.diff | 20 +++++++++++ .../entangle-0.1.0-fix-segfault-f3d9b75d68.patch | 42 ++++++++++++++++++++++ media-gfx/entangle/metadata.xml | 26 ++++++++++++++ 6 files changed, 146 insertions(+) create mode 100644 media-gfx/entangle/ChangeLog create mode 100644 media-gfx/entangle/Manifest create mode 100644 media-gfx/entangle/entangle-0.1.0.ebuild create mode 100644 media-gfx/entangle/files/entangle-0.1.0-fix-install.diff create mode 100644 media-gfx/entangle/files/entangle-0.1.0-fix-segfault-f3d9b75d68.patch create mode 100644 media-gfx/entangle/metadata.xml diff --git a/media-gfx/entangle/ChangeLog b/media-gfx/entangle/ChangeLog new file mode 100644 index 0000000..89114c7 --- /dev/null +++ b/media-gfx/entangle/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for media-gfx/entangle +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*entangle-0.1.0 (07 Jun 2010) + + 07 Jun 2010; Thilo Bangert +entangle-0.1.0.ebuild, + +files/entangle-0.1.0-fix-install.diff, + +files/entangle-0.1.0-fix-segfault-f3d9b75d68.patch, +metadata.xml: + initial import + diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest new file mode 100644 index 0000000..73c06a6 --- /dev/null +++ b/media-gfx/entangle/Manifest @@ -0,0 +1,6 @@ +AUX entangle-0.1.0-fix-install.diff 844 RMD160 0aa40f1f3e077d2063863e31de389ec6f1c76055 SHA1 99a8ce22e6a1d0940221f79071ed1281bf570442 SHA256 9d83be95b99c795dd55e489417b3057d564075949a23bde72b5649172dcce9dc +AUX entangle-0.1.0-fix-segfault-f3d9b75d68.patch 1448 RMD160 3c84798311b15d7d99bc4b502213a68939e48861 SHA1 44aaa264a6fab226fe3a7bcddad6060ffd7eb576 SHA256 bb5323c7756c823cfbb5390b80d177348b0dbb6d03ccc7efe30b5e167a27d075 +DIST entangle-0.1.0.tar.gz 3028624 RMD160 359b34463ef4f7b5928f9b2f9fb4765cd30206de SHA1 98652f6c74d0f59a53411d0644afb6d3c9505a4d SHA256 11fe0accc496c604b9056829ba1f1400bb7eccc1001df9d3f1c3f2a2a68e1260 +EBUILD entangle-0.1.0.ebuild 902 RMD160 1c28df408389c73be65fca775eceafdff45cd038 SHA1 bf9e5ac1218427d527c1b954407155d91f67c1f1 SHA256 32f4cf25914e6f8afaa2e52dd81a964f99e9b51a0ada1121b6309c9028ffa2d5 +MISC ChangeLog 354 RMD160 b5b347ffdc1e4d218598fdcbb5bf009f754252f5 SHA1 780fb1a80ccf69e72b229a79590d6c1008a20d68 SHA256 5b75a7a4b308f1cc843a12cd1212b39201b7919246f609564b3f909a2e5b746a +MISC metadata.xml 1025 RMD160 99a5aa39b53f2d44be96c00b2612b7bb2c80869a SHA1 c6b6c07818306ee73593bfa772af6d3b49803e8e SHA256 0bb24058cd5ab03f09b8319fa67329d713ee8dd485eda2f2eb272b0f7b70d0a6 diff --git a/media-gfx/entangle/entangle-0.1.0.ebuild b/media-gfx/entangle/entangle-0.1.0.ebuild new file mode 100644 index 0000000..813d10a --- /dev/null +++ b/media-gfx/entangle/entangle-0.1.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit eutils autotools + +DESCRIPTION="Tethered Camera Control & Capture for Nikon and Canon DSLRs" +HOMEPAGE="http://capa-project.org/" +SRC_URI="http://entangle-photo.org/download/sources/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="x11-libs/gtk+:2 + media-libs/libgphoto2 + dev-libs/libunique + media-libs/lcms + gnome-base/libglade:2.0 + dev-libs/glib:2 + gnome-base/gconf + dev-libs/dbus-glib + dev-libs/gjs + dev-libs/gir-repository[gtk]" +DEPEND="dev-util/pkgconfig + dev-perl/Template-Toolkit + ${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-install.diff + epatch "${FILESDIR}"/${P}-fix-segfault-f3d9b75d68.patch + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + dodoc README NEWS ChangeLog || die +} diff --git a/media-gfx/entangle/files/entangle-0.1.0-fix-install.diff b/media-gfx/entangle/files/entangle-0.1.0-fix-install.diff new file mode 100644 index 0000000..c5cac92 --- /dev/null +++ b/media-gfx/entangle/files/entangle-0.1.0-fix-install.diff @@ -0,0 +1,20 @@ +diff -Naur entangle-0.1.0.orig/src/Makefile.am entangle-0.1.0/src/Makefile.am +--- entangle-0.1.0.orig/src/Makefile.am 2010-06-07 13:30:49.876932524 +0200 ++++ entangle-0.1.0/src/Makefile.am 2010-06-07 13:51:03.664933502 +0200 +@@ -119,12 +119,12 @@ + EXTRA_DIST += javascript.cfg + + install-data-local: +- install -d $(pkgdatadir)/plugins +- install -d $(pkgdatadir)/plugins/javascript +- install $(srcdir)/javascript.cfg $(pkgdatadir)/plugins/javascript/plugin.cfg ++ install -d $(DESTDIR)$(pkgdatadir)/plugins ++ install -d $(DESTDIR)$(pkgdatadir)/plugins/javascript ++ install $(srcdir)/javascript.cfg $(DESTDIR)$(pkgdatadir)/plugins/javascript/plugin.cfg + + uninstall-local: +- rm -f $(pkgdatadir)/plugins/javascript/plugin.cfg ++ rm -f $(DESTDIR)$(pkgdatadir)/plugins/javascript/plugin.cfg + else # WITH_JAVASCRIPT + EXTRA_DIST += \ + javascript.cfg \ diff --git a/media-gfx/entangle/files/entangle-0.1.0-fix-segfault-f3d9b75d68.patch b/media-gfx/entangle/files/entangle-0.1.0-fix-segfault-f3d9b75d68.patch new file mode 100644 index 0000000..52eddea --- /dev/null +++ b/media-gfx/entangle/files/entangle-0.1.0-fix-segfault-f3d9b75d68.patch @@ -0,0 +1,42 @@ +From f3d9b75d68f9cbda60bfcef195915eb72d39a184 Mon Sep 17 00:00:00 2001 +From: Daniel P. Berrange +Date: Mon, 7 Jun 2010 15:45:08 +0100 +Subject: [PATCH] Fix assumption about some udev parameters always being present + +If certain udev parameters were missing (aka NULL) then the +device monitor code would crash with a NULL pointer dereference. +Ignore any events where one of our desired parameters is NULL +to avoid crashing +--- + src/backend/entangle-device-manager.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/src/backend/entangle-device-manager.c b/src/backend/entangle-device-manager.c +index 646d5fe..f450a40 100644 +--- a/src/backend/entangle-device-manager.c ++++ b/src/backend/entangle-device-manager.c +@@ -120,13 +120,20 @@ static void do_udev_event(GUdevClient *client G_GNUC_UNUSED, + return; + + devtype = g_udev_device_get_devtype(dev); +- if (strcmp(devtype, "usb_device") != 0) ++ if ((devtype == NULL) || ++ strcmp(devtype, "usb_device") != 0) + return; + + sysfs = g_udev_device_get_sysfs_path(dev); + + usbbus = g_udev_device_get_property(dev, "BUSNUM"); + usbdev = g_udev_device_get_property(dev, "DEVNUM"); ++ ++ if (sysfs == NULL || ++ usbbus == NULL || ++ usbdev == NULL) ++ return; ++ + port = g_strdup_printf("usb:%s,%s", usbbus, usbdev); + + ENTANGLE_DEBUG("%s device '%s' '%s'", action, sysfs, port); +-- +1.6.1 + diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml new file mode 100644 index 0000000..1030f7d --- /dev/null +++ b/media-gfx/entangle/metadata.xml @@ -0,0 +1,26 @@ + + + +no-herd + + bangert@gentoo.org + + +Entangle provides a graphical interface for "tethered shooting", aka taking photographs with a digital camera completely controlled from the computer. + +Using Entangle is as easy as 1,2,3... + +Connect camera +Launch Entangle +Shoot photos +With a sufficiently capable (Canon and Nikon) digital SLR camera Entangle allows: + +Trigger the shutter from the computer +Live preview of scene before shooting +Automatic download and display of photos as they are shot +Control of all camera settings from computer +Entangle is Open Source software licensed under the GNU GPL v3+. It is built on top of libgphoto using GTK-2 for its interface. It is fully colour managed, auto-detecting system monitor profile and applying the neccessary transforms when displaying images. + + + + -- cgit v1.2.3-65-gdbad