summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libdc1394
downloadgentoo-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-libs/libdc1394')
-rw-r--r--media-libs/libdc1394/Manifest5
-rw-r--r--media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch29
-rw-r--r--media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch13
-rw-r--r--media-libs/libdc1394/files/libdc1394-usbinit.patch39
-rw-r--r--media-libs/libdc1394/files/libdc1394-videodev.h.patch53
-rw-r--r--media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild49
-rw-r--r--media-libs/libdc1394/libdc1394-2.1.4.ebuild40
-rw-r--r--media-libs/libdc1394/libdc1394-2.2.1.ebuild54
-rw-r--r--media-libs/libdc1394/libdc1394-2.2.3.ebuild53
-rw-r--r--media-libs/libdc1394/metadata.xml11
10 files changed, 346 insertions, 0 deletions
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
new file mode 100644
index 00000000000..ac33864972f
--- /dev/null
+++ b/media-libs/libdc1394/Manifest
@@ -0,0 +1,5 @@
+DIST libdc1394-2.1.3.tar.gz 596778 SHA256 6690e8f97abadd41aa6a5f6e0365e17287847bb267d251ea308641a6dd7aa0e9 SHA512 502e1c55dbcf755a12d2efa1d7d14f9b735d279b47df4782c5303e48cb57eacabb89be20a374e1303d8c9b3d57eadac86541b2aae859e939a84d8c25bd20290c WHIRLPOOL 2f9e569d200de2cc7542eeead405a7dc85cebb8919c9b2ce887832426ccf99de4ca9ed4cb677522629248aaf1c6c2681a6e4a5353400a3d64f3adc26e20dc5d6
+DIST libdc1394-2.1.4.tar.gz 576406 SHA256 c605d1f099690a71b743827f01a7733e898a45da69ca31eb912fa007f4a3acf0 SHA512 21f36988cc1b85ec058b8c17b5311ee7c0c61ff3bc69e9ade94c44b9e96ab02fa5f243bead0ed3f1e3f130663cc46843f83cd78d3a960bb8d06fffa3df4ac1e8 WHIRLPOOL 3485bb2f140c6a5b7acb4a6982f8be6979cbf693fe60d588e5967c01614921647902f690583ca5b0eadaa9ab663a9b98b9f3830a4e444d67f8238b13ac732c80
+DIST libdc1394-2.2.1.tar.gz 556544 SHA256 920c331abf8bf2e1f73dfee0df103daf9f1850a69552ee825a9824e01ce96cf2 SHA512 e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446 WHIRLPOOL 2107a2baf8090151ff5b81933dbe0e67198a87579db204bf69e574625007048d00b6b9d9a29309a026b49f7e55c10847cbe894f431ea976d5cc9f4e33a0f5499
+DIST libdc1394-2.2.3.tar.gz 606042 SHA256 4a197880657f54519683ce014e613acdfd909767a69873eb23409fe423232bdd SHA512 d60771fe196cfd5c1ede413c0159ed9f0a977183f4b414f8e26a7be0098c10599c8dd93f8175e7ad38dac1504295c7c9987633bc9cb7de561ad0b64da0c8ca28 WHIRLPOOL b486a2b7075e41b0a6b6b3a4a79580a3fe811f4c66797e419380365562d72e3fea78d90656531a220f20170ca398947fac0113ce0134721b6490d8e39919e165
+DIST sdl.m4-20140620.tar.xz 2420 SHA256 855651a9da571ce87c9d62479c82174809dae902bdeb274144f94ca444675560 SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55 WHIRLPOOL a6361961fce75f715943642c185a1750862469aef222cf8d8ddb5c023a878b346919376aa5360c10bd870b79b7309ae62913a63dd51458c64777be50f96ee424
diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch
new file mode 100644
index 00000000000..db703e9c371
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch
@@ -0,0 +1,29 @@
+Fix out of source builds.
+https://bugs.gentoo.org/show_bug.cgi?id=488716
+
+Index: libdc1394-2.2.1/dc1394/juju/Makefile.am
+===================================================================
+--- libdc1394-2.2.1.orig/dc1394/juju/Makefile.am
++++ libdc1394-2.2.1/dc1394/juju/Makefile.am
+@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-juju.la
+ pkgjujuinclude_HEADERS =
+ endif
+
+-AM_CFLAGS = -I$(top_srcdir)/dc1394
++AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394
+ libdc1394_juju_la_SOURCES = \
+ control.c \
+ capture.c \
+Index: libdc1394-2.2.1/dc1394/usb/Makefile.am
+===================================================================
+--- libdc1394-2.2.1.orig/dc1394/usb/Makefile.am
++++ libdc1394-2.2.1/dc1394/usb/Makefile.am
+@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-usb.la
+ pkgusbinclude_HEADERS =
+ endif
+
+-AM_CFLAGS = -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
++AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
+ libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS)
+ libdc1394_usb_la_SOURCES = \
+ control.c \
diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
new file mode 100644
index 00000000000..6ea7651e146
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/514008
+
+--- dc1394/usb/Makefile.am
++++ dc1394/usb/Makefile.am
+@@ -8,7 +8,7 @@
+ endif
+
+ AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
+-libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS)
++libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS) -lpthread
+ libdc1394_usb_la_SOURCES = \
+ control.c \
+ usb.h \
diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch
new file mode 100644
index 00000000000..e94d25355ad
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-usbinit.patch
@@ -0,0 +1,39 @@
+diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
+index c62e0e2..f250f6a 100644
+--- a/libdc1394/dc1394/control.c
++++ b/libdc1394/dc1394/control.c
+@@ -1955,7 +1955,7 @@ dc1394_new (void)
+ windows_init (d);
+ #endif
+ #ifdef HAVE_LIBUSB
+- usb_init (d);
++ dc1394_usb_init (d);
+ #endif
+
+ int i;
+diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
+index b4d295a..c59e5d3 100644
+--- a/libdc1394/dc1394/internal.h
++++ b/libdc1394/dc1394/internal.h
+@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
+ void linux_init(dc1394_t *d);
+ void macosx_init(dc1394_t *d);
+ void windows_init(dc1394_t *d);
+-void usb_init(dc1394_t *d);
++void dc1394_usb_init(dc1394_t *d);
+
+ void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
+ const char * name);
+diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
+index 6509452..19a21a6 100644
+--- a/libdc1394/dc1394/usb/control.c
++++ b/libdc1394/dc1394/usb/control.c
+@@ -378,7 +378,7 @@ usb_dispatch = {
+ };
+
+ void
+-usb_init(dc1394_t * d)
++dc1394_usb_init(dc1394_t * d)
+ {
+ register_platform (d, &usb_dispatch, "usb");
+ }
diff --git a/media-libs/libdc1394/files/libdc1394-videodev.h.patch b/media-libs/libdc1394/files/libdc1394-videodev.h.patch
new file mode 100644
index 00000000000..dba42c46f0b
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-videodev.h.patch
@@ -0,0 +1,53 @@
+From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
+From: David Moore <david.moore@gmail.com>
+Date: Sun, 27 Mar 2011 22:48:15 -0700
+Subject: [PATCH 1/1] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+
+---
+ libdc1394/ChangeLog | 3 +++
+ libdc1394/configure.in | 3 +++
+ libdc1394/examples/Makefile.am | 2 ++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
+index e1355de..536ccae 100644
+--- a/libdc1394/ChangeLog
++++ b/libdc1394/ChangeLog
+@@ -1,3 +1,6 @@
++2011-03-27 David Moore <david.moore@gmail.com>
++ * Conditionally compile dc1394_vloopback only when linux/video.h exists
++
+ 2011-01-02 David Moore <david.moore@gmail.com>
+ * dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
+ * Update NEWS, README, AUTHORS and version for release 2.1.3.
+diff --git a/libdc1394/configure.in b/libdc1394/configure.in
+index 69babab..bdddc9b 100644
+--- a/libdc1394/configure.in
++++ b/libdc1394/configure.in
+@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
+ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
+ AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
+
++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
++
+ AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
+
+ AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
+diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
+index fcebf18..035612e 100644
+--- a/libdc1394/examples/Makefile.am
++++ b/libdc1394/examples/Makefile.am
+@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
+ B = dc1394_reset_bus
+
+ if HAVE_LINUX
++if HAVE_VIDEODEV
+ B += dc1394_vloopback
++endif
+ if HAVE_XV
+ A += dc1394_multiview
+ endif
+--
+1.7.0.1
+
diff --git a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
new file mode 100644
index 00000000000..e102fd9b8dd
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc static-libs X"
+
+RDEPEND=">=sys-libs/libraw1394-1.2.0
+ virtual/libusb:1
+ X? ( x11-libs/libSM x11-libs/libXv )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-videodev.h.patch \
+ "${FILESDIR}"/${PN}-usbinit.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --program-suffix=2 \
+ $(use_with X x) \
+ $(use_enable doc doxygen-html)
+}
+
+src_compile() {
+ default
+ use doc && emake doc
+}
+
+src_install() {
+ default
+ use doc && dohtml doc/html/*
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libdc1394/libdc1394-2.1.4.ebuild b/media-libs/libdc1394/libdc1394-2.1.4.ebuild
new file mode 100644
index 00000000000..4afe8bcee24
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs X"
+
+RDEPEND=">=sys-libs/libraw1394-1.2.0
+ virtual/libusb:1
+ X? ( x11-libs/libSM x11-libs/libXv )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --program-suffix=2 \
+ $(use_with X x) \
+ $(use_enable doc doxygen-html)
+}
+
+src_compile() {
+ default
+ use doc && emake doc
+}
+
+src_install() {
+ default
+ use doc && dohtml doc/html/*
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libdc1394/libdc1394-2.2.1.ebuild b/media-libs/libdc1394/libdc1394-2.2.1.ebuild
new file mode 100644
index 00000000000..2975b243ec5
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ http://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc static-libs X"
+
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-includes.patch \
+ "${FILESDIR}"/${P}-pthread.patch
+
+ AT_M4DIR=${WORKDIR}/aclocal eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf="$(use_enable doc doxygen-html)"
+ multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples"
+
+ # X is only useful for examples that are not installed.
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable static-libs static) \
+ --program-suffix=2 \
+ --without-x \
+ ${myconf}
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && use doc && emake doc
+}
+
+multilib_src_install() {
+ default
+ multilib_is_native_abi && use doc && dohtml doc/html/*
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libdc1394/libdc1394-2.2.3.ebuild b/media-libs/libdc1394/libdc1394-2.2.3.ebuild
new file mode 100644
index 00000000000..9e72258dc89
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.2.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ http://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs X"
+
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.2.1-pthread.patch
+
+ AT_M4DIR=${WORKDIR}/aclocal eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf="$(use_enable doc doxygen-html)"
+ multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples"
+
+ # X is only useful for examples that are not installed.
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable static-libs static) \
+ --program-suffix=2 \
+ --without-x \
+ ${myconf}
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && use doc && emake doc
+}
+
+multilib_src_install() {
+ default
+ multilib_is_native_abi && use doc && dohtml doc/html/*
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libdc1394/metadata.xml b/media-libs/libdc1394/metadata.xml
new file mode 100644
index 00000000000..0ad59fcffb3
--- /dev/null
+++ b/media-libs/libdc1394/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">libdc1394</remote-id>
+ </upstream>
+</pkgmetadata>