diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-tv/gtk-v4l | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-tv/gtk-v4l')
-rw-r--r-- | media-tv/gtk-v4l/Manifest | 1 | ||||
-rw-r--r-- | media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch | 53 | ||||
-rw-r--r-- | media-tv/gtk-v4l/gtk-v4l-0.4.ebuild | 38 | ||||
-rw-r--r-- | media-tv/gtk-v4l/metadata.xml | 9 |
4 files changed, 101 insertions, 0 deletions
diff --git a/media-tv/gtk-v4l/Manifest b/media-tv/gtk-v4l/Manifest new file mode 100644 index 000000000000..02cf6c784d33 --- /dev/null +++ b/media-tv/gtk-v4l/Manifest @@ -0,0 +1 @@ +DIST gtk-v4l-0.4.tar.gz 328732 SHA256 a87fe9e3afc141dd98be7bf8875faa679a914f438611fb01a7b25b75c2d75b6c SHA512 ed0e1245d9b1cfce6612c91dacd09f26850a9420088d7de172c4bd582b70f4427820940e6cf98a831493edfe52d20fb02d6b2d62b695a24127097f50963df321 WHIRLPOOL f53ca9b344a2692c6e11c6a439d0e836d84e721f27a852809d5824ac3d310fc5dfbad44cb3295de3fd6707fa5674cda7bf2fc88c968b5b1e4f5b31ec6bc08b3a diff --git a/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch b/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch new file mode 100644 index 000000000000..301c6b152810 --- /dev/null +++ b/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch @@ -0,0 +1,53 @@ +From e7730e2eb0e148e94f6bba13a70ddf61ae94b313 Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Wed, 9 May 2012 13:00:07 +0200 +Subject: [PATCH] gtk-v4l-device: remove source on finalize + +This fixes us from getting events from it, with a user_data argument +pointing to the finalized object, when the fd gets re-used if another device +gets plugged in later, and that device then generates ctrl events. + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + lib/gtk-v4l-device.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/lib/gtk-v4l-device.c b/lib/gtk-v4l-device.c +index c4ce1e5..67e8ccc 100644 +--- a/lib/gtk-v4l-device.c ++++ b/lib/gtk-v4l-device.c +@@ -43,6 +43,7 @@ enum + struct _Gtkv4lDevicePrivate { + GList *controls; + GIOChannel *channel; ++ guint channel_source_id; + }; + + /* will create gtk_v4l_device_get_type and set gtk_v4l_device_parent_class */ +@@ -166,8 +167,10 @@ gtk_v4l_device_finalize (GObject *object) + g_list_foreach (self->priv->controls, gtk_v4l_device_free_control, NULL); + g_list_free (self->priv->controls); + +- if (self->priv->channel) ++ if (self->priv->channel) { ++ g_source_remove (self->priv->channel_source_id); + g_io_channel_unref (self->priv->channel); ++ } + + if (self->fd != -1) + close (self->fd); +@@ -303,8 +306,9 @@ gtk_v4l_device_new_control (Gtkv4lDevice *self, struct v4l2_queryctrl *query) + r = v4l2_ioctl(self->fd, VIDIOC_SUBSCRIBE_EVENT, &sub); + if (r >= 0 && !self->priv->channel) { + self->priv->channel = g_io_channel_unix_new (self->fd); +- g_io_add_watch (self->priv->channel, G_IO_PRI, gtk_v4l_device_ctrl_event, +- self); ++ self->priv->channel_source_id = ++ g_io_add_watch (self->priv->channel, G_IO_PRI, gtk_v4l_device_ctrl_event, ++ self); + } + } + +-- +1.7.10 + diff --git a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild new file mode 100644 index 000000000000..01a18067800a --- /dev/null +++ b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="A control application for Video 4 Linux (based on C and GTK+)" +HOMEPAGE="http://fedorahosted.org/gtk-v4l/" +SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-libs/glib-2 + >=media-libs/libv4l-0.6 + virtual/libgudev:= + x11-libs/gtk+:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS="AUTHORS ChangeLog README" + +src_prepare() { + epatch "${FILESDIR}"/${P}-device-remove-source-on-finalize.patch + sed -i -e '/^Categories/s:Application:GTK:' ${PN}.desktop.in || die +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + prune_libtool_files --all +} diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml new file mode 100644 index 000000000000..91724ddf6152 --- /dev/null +++ b/media-tv/gtk-v4l/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>media-tv</herd> + <maintainer> + <email>ssuominen@gentoo.org</email> + <name>Samuli Suominen</name> + </maintainer> +</pkgmetadata> |