* [gentoo-commits] repo/gentoo:master commit in: media-libs/libdc1394/, media-libs/libdc1394/files/
@ 2018-02-19 10:17 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-02-19 10:17 UTC (permalink / raw
To: gentoo-commits
commit: d4c5770383ab4b8793e0bbbdd5650df2d32f7356
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 22:34:25 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 10:17:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c57703
media-libs/libdc1394: EAPI 6 bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../libdc1394/files/libdc1394-2.2.1-pthread.patch | 4 +-
media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild | 53 ++++++++++++++++++++++
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
index 6ea7651e146..535dc9040d8 100644
--- a/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
+++ b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/514008
---- dc1394/usb/Makefile.am
-+++ dc1394/usb/Makefile.am
+--- a/dc1394/usb/Makefile.am
++++ b/dc1394/usb/Makefile.am
@@ -8,7 +8,7 @@
endif
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
new file mode 100644
index 00000000000..100614100ce
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="https://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pthread.patch )
+
+src_prepare() {
+ default
+ 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() {
+ multilib_is_native_abi && use doc && local HTML_DOCS=( doc/html/. )
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libdc1394/, media-libs/libdc1394/files/
@ 2018-02-27 9:25 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-02-27 9:25 UTC (permalink / raw
To: gentoo-commits
commit: f18921c2b1f6db8db50fc3adb47ff602221db567
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 23:40:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 09:24:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18921c2
media-libs/libdc1394: Drop old
EAPI4--
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/libdc1394/Manifest | 2 -
media-libs/libdc1394/files/libdc1394-usbinit.patch | 39 ----------------
.../libdc1394/files/libdc1394-videodev.h.patch | 53 ----------------------
media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild | 48 --------------------
media-libs/libdc1394/libdc1394-2.1.4.ebuild | 39 ----------------
5 files changed, 181 deletions(-)
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 2ccf31a5029..f566a5d5010 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,5 +1,3 @@
-DIST libdc1394-2.1.3.tar.gz 596778 BLAKE2B d259a93b8b4316e934f13769e77a057cf485f847ab80809fdcceca1fd94689ae77f98bd2a882b1f9ee250cf459f53240995e31168b32fc9ab9cb6b67e823b834 SHA512 502e1c55dbcf755a12d2efa1d7d14f9b735d279b47df4782c5303e48cb57eacabb89be20a374e1303d8c9b3d57eadac86541b2aae859e939a84d8c25bd20290c
-DIST libdc1394-2.1.4.tar.gz 576406 BLAKE2B d71691759619fad0f9f73d5b161d0042ae7baceb1427da255347f4d919fa3e92538a7b607ddf764f6492490a0e8316d451bd857e4f85c7e989864e786e6b2721 SHA512 21f36988cc1b85ec058b8c17b5311ee7c0c61ff3bc69e9ade94c44b9e96ab02fa5f243bead0ed3f1e3f130663cc46843f83cd78d3a960bb8d06fffa3df4ac1e8
DIST libdc1394-2.2.1.tar.gz 556544 BLAKE2B 5c443216c771cca76eec8c53c1163b35d7daa722e7ab962f4fcf64331aad33f95d620760a8730d0e3d4022459ddc8ef769ae8ed7948a7158156bb1bc89c0b9e8 SHA512 e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446
DIST libdc1394-2.2.3.tar.gz 606042 BLAKE2B 9b8e60ad7194421c085ae87d9d695fb7deb51de55bb232ec5ec12055894af8b535385cdc79af3c9e93219bc31429d3559afbb3126a2315d83cc71db24272776a SHA512 d60771fe196cfd5c1ede413c0159ed9f0a977183f4b414f8e26a7be0098c10599c8dd93f8175e7ad38dac1504295c7c9987633bc9cb7de561ad0b64da0c8ca28
DIST libdc1394-2.2.4.tar.gz 609612 BLAKE2B b78fbc6ddb34a10fe5c82928e7537d68c86cfdefae67ca82fde53886572e852079d922a77a2e5e3cd0d6631238d1f814e48a3ecc8da9779e80ab1702843109f6 SHA512 adb461fc5562855c3d26279971e25f38f3356c21e6be3fe343390c322d78f2515cf071da00da0ff39aec0d08147851354a2a0dbf325ad2fc179659e6ef5ab6e9
diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch
deleted file mode 100644
index e94d25355ad..00000000000
--- a/media-libs/libdc1394/files/libdc1394-usbinit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index dba42c46f0b..00000000000
--- a/media-libs/libdc1394/files/libdc1394-videodev.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index fbe6ade1040..00000000000
--- a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-HOMEPAGE="https://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
deleted file mode 100644
index 7331276d0eb..00000000000
--- a/media-libs/libdc1394/libdc1394-2.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-HOMEPAGE="https://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 {} +
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-27 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-27 9:25 [gentoo-commits] repo/gentoo:master commit in: media-libs/libdc1394/, media-libs/libdc1394/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-02-19 10:17 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox