| 1 |
commit: f18921c2b1f6db8db50fc3adb47ff602221db567 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 25 23:40:00 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 27 09:24:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18921c2 |
| 7 |
|
| 8 |
media-libs/libdc1394: Drop old |
| 9 |
|
| 10 |
EAPI4-- |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 13 |
|
| 14 |
media-libs/libdc1394/Manifest | 2 - |
| 15 |
media-libs/libdc1394/files/libdc1394-usbinit.patch | 39 ---------------- |
| 16 |
.../libdc1394/files/libdc1394-videodev.h.patch | 53 ---------------------- |
| 17 |
media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild | 48 -------------------- |
| 18 |
media-libs/libdc1394/libdc1394-2.1.4.ebuild | 39 ---------------- |
| 19 |
5 files changed, 181 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest |
| 22 |
index 2ccf31a5029..f566a5d5010 100644 |
| 23 |
--- a/media-libs/libdc1394/Manifest |
| 24 |
+++ b/media-libs/libdc1394/Manifest |
| 25 |
@@ -1,5 +1,3 @@ |
| 26 |
-DIST libdc1394-2.1.3.tar.gz 596778 BLAKE2B d259a93b8b4316e934f13769e77a057cf485f847ab80809fdcceca1fd94689ae77f98bd2a882b1f9ee250cf459f53240995e31168b32fc9ab9cb6b67e823b834 SHA512 502e1c55dbcf755a12d2efa1d7d14f9b735d279b47df4782c5303e48cb57eacabb89be20a374e1303d8c9b3d57eadac86541b2aae859e939a84d8c25bd20290c |
| 27 |
-DIST libdc1394-2.1.4.tar.gz 576406 BLAKE2B d71691759619fad0f9f73d5b161d0042ae7baceb1427da255347f4d919fa3e92538a7b607ddf764f6492490a0e8316d451bd857e4f85c7e989864e786e6b2721 SHA512 21f36988cc1b85ec058b8c17b5311ee7c0c61ff3bc69e9ade94c44b9e96ab02fa5f243bead0ed3f1e3f130663cc46843f83cd78d3a960bb8d06fffa3df4ac1e8 |
| 28 |
DIST libdc1394-2.2.1.tar.gz 556544 BLAKE2B 5c443216c771cca76eec8c53c1163b35d7daa722e7ab962f4fcf64331aad33f95d620760a8730d0e3d4022459ddc8ef769ae8ed7948a7158156bb1bc89c0b9e8 SHA512 e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446 |
| 29 |
DIST libdc1394-2.2.3.tar.gz 606042 BLAKE2B 9b8e60ad7194421c085ae87d9d695fb7deb51de55bb232ec5ec12055894af8b535385cdc79af3c9e93219bc31429d3559afbb3126a2315d83cc71db24272776a SHA512 d60771fe196cfd5c1ede413c0159ed9f0a977183f4b414f8e26a7be0098c10599c8dd93f8175e7ad38dac1504295c7c9987633bc9cb7de561ad0b64da0c8ca28 |
| 30 |
DIST libdc1394-2.2.4.tar.gz 609612 BLAKE2B b78fbc6ddb34a10fe5c82928e7537d68c86cfdefae67ca82fde53886572e852079d922a77a2e5e3cd0d6631238d1f814e48a3ecc8da9779e80ab1702843109f6 SHA512 adb461fc5562855c3d26279971e25f38f3356c21e6be3fe343390c322d78f2515cf071da00da0ff39aec0d08147851354a2a0dbf325ad2fc179659e6ef5ab6e9 |
| 31 |
|
| 32 |
diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index e94d25355ad..00000000000 |
| 35 |
--- a/media-libs/libdc1394/files/libdc1394-usbinit.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,39 +0,0 @@ |
| 38 |
-diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c |
| 39 |
-index c62e0e2..f250f6a 100644 |
| 40 |
---- a/libdc1394/dc1394/control.c |
| 41 |
-+++ b/libdc1394/dc1394/control.c |
| 42 |
-@@ -1955,7 +1955,7 @@ dc1394_new (void) |
| 43 |
- windows_init (d); |
| 44 |
- #endif |
| 45 |
- #ifdef HAVE_LIBUSB |
| 46 |
-- usb_init (d); |
| 47 |
-+ dc1394_usb_init (d); |
| 48 |
- #endif |
| 49 |
- |
| 50 |
- int i; |
| 51 |
-diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h |
| 52 |
-index b4d295a..c59e5d3 100644 |
| 53 |
---- a/libdc1394/dc1394/internal.h |
| 54 |
-+++ b/libdc1394/dc1394/internal.h |
| 55 |
-@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d); |
| 56 |
- void linux_init(dc1394_t *d); |
| 57 |
- void macosx_init(dc1394_t *d); |
| 58 |
- void windows_init(dc1394_t *d); |
| 59 |
--void usb_init(dc1394_t *d); |
| 60 |
-+void dc1394_usb_init(dc1394_t *d); |
| 61 |
- |
| 62 |
- void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch, |
| 63 |
- const char * name); |
| 64 |
-diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c |
| 65 |
-index 6509452..19a21a6 100644 |
| 66 |
---- a/libdc1394/dc1394/usb/control.c |
| 67 |
-+++ b/libdc1394/dc1394/usb/control.c |
| 68 |
-@@ -378,7 +378,7 @@ usb_dispatch = { |
| 69 |
- }; |
| 70 |
- |
| 71 |
- void |
| 72 |
--usb_init(dc1394_t * d) |
| 73 |
-+dc1394_usb_init(dc1394_t * d) |
| 74 |
- { |
| 75 |
- register_platform (d, &usb_dispatch, "usb"); |
| 76 |
- } |
| 77 |
|
| 78 |
diff --git a/media-libs/libdc1394/files/libdc1394-videodev.h.patch b/media-libs/libdc1394/files/libdc1394-videodev.h.patch |
| 79 |
deleted file mode 100644 |
| 80 |
index dba42c46f0b..00000000000 |
| 81 |
--- a/media-libs/libdc1394/files/libdc1394-videodev.h.patch |
| 82 |
+++ /dev/null |
| 83 |
@@ -1,53 +0,0 @@ |
| 84 |
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001 |
| 85 |
-From: David Moore <david.moore@×××××.com> |
| 86 |
-Date: Sun, 27 Mar 2011 22:48:15 -0700 |
| 87 |
-Subject: [PATCH 1/1] Conditionally compile dc1394_vloopback only when linux/videodev.h exists |
| 88 |
- |
| 89 |
---- |
| 90 |
- libdc1394/ChangeLog | 3 +++ |
| 91 |
- libdc1394/configure.in | 3 +++ |
| 92 |
- libdc1394/examples/Makefile.am | 2 ++ |
| 93 |
- 3 files changed, 8 insertions(+), 0 deletions(-) |
| 94 |
- |
| 95 |
-diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog |
| 96 |
-index e1355de..536ccae 100644 |
| 97 |
---- a/libdc1394/ChangeLog |
| 98 |
-+++ b/libdc1394/ChangeLog |
| 99 |
-@@ -1,3 +1,6 @@ |
| 100 |
-+2011-03-27 David Moore <david.moore@×××××.com> |
| 101 |
-+ * Conditionally compile dc1394_vloopback only when linux/video.h exists |
| 102 |
-+ |
| 103 |
- 2011-01-02 David Moore <david.moore@×××××.com> |
| 104 |
- * dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN |
| 105 |
- * Update NEWS, README, AUTHORS and version for release 2.1.3. |
| 106 |
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in |
| 107 |
-index 69babab..bdddc9b 100644 |
| 108 |
---- a/libdc1394/configure.in |
| 109 |
-+++ b/libdc1394/configure.in |
| 110 |
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue) |
| 111 |
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue) |
| 112 |
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x") |
| 113 |
- |
| 114 |
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true]) |
| 115 |
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue) |
| 116 |
-+ |
| 117 |
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true]) |
| 118 |
- |
| 119 |
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue) |
| 120 |
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am |
| 121 |
-index fcebf18..035612e 100644 |
| 122 |
---- a/libdc1394/examples/Makefile.am |
| 123 |
-+++ b/libdc1394/examples/Makefile.am |
| 124 |
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \ |
| 125 |
- B = dc1394_reset_bus |
| 126 |
- |
| 127 |
- if HAVE_LINUX |
| 128 |
-+if HAVE_VIDEODEV |
| 129 |
- B += dc1394_vloopback |
| 130 |
-+endif |
| 131 |
- if HAVE_XV |
| 132 |
- A += dc1394_multiview |
| 133 |
- endif |
| 134 |
--- |
| 135 |
-1.7.0.1 |
| 136 |
- |
| 137 |
|
| 138 |
diff --git a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild |
| 139 |
deleted file mode 100644 |
| 140 |
index fbe6ade1040..00000000000 |
| 141 |
--- a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild |
| 142 |
+++ /dev/null |
| 143 |
@@ -1,48 +0,0 @@ |
| 144 |
-# Copyright 1999-2012 Gentoo Foundation |
| 145 |
-# Distributed under the terms of the GNU General Public License v2 |
| 146 |
- |
| 147 |
-EAPI=4 |
| 148 |
-inherit autotools eutils |
| 149 |
- |
| 150 |
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification" |
| 151 |
-HOMEPAGE="https://sourceforge.net/projects/libdc1394/" |
| 152 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 153 |
- |
| 154 |
-LICENSE="LGPL-2.1" |
| 155 |
-SLOT="2" |
| 156 |
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" |
| 157 |
-IUSE="doc static-libs X" |
| 158 |
- |
| 159 |
-RDEPEND=">=sys-libs/libraw1394-1.2.0 |
| 160 |
- virtual/libusb:1 |
| 161 |
- X? ( x11-libs/libSM x11-libs/libXv )" |
| 162 |
-DEPEND="${RDEPEND} |
| 163 |
- virtual/pkgconfig |
| 164 |
- doc? ( app-doc/doxygen )" |
| 165 |
- |
| 166 |
-src_prepare() { |
| 167 |
- epatch \ |
| 168 |
- "${FILESDIR}"/${PN}-videodev.h.patch \ |
| 169 |
- "${FILESDIR}"/${PN}-usbinit.patch |
| 170 |
- |
| 171 |
- eautoreconf |
| 172 |
-} |
| 173 |
- |
| 174 |
-src_configure() { |
| 175 |
- econf \ |
| 176 |
- $(use_enable static-libs static) \ |
| 177 |
- --program-suffix=2 \ |
| 178 |
- $(use_with X x) \ |
| 179 |
- $(use_enable doc doxygen-html) |
| 180 |
-} |
| 181 |
- |
| 182 |
-src_compile() { |
| 183 |
- default |
| 184 |
- use doc && emake doc |
| 185 |
-} |
| 186 |
- |
| 187 |
-src_install() { |
| 188 |
- default |
| 189 |
- use doc && dohtml doc/html/* |
| 190 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
| 191 |
-} |
| 192 |
|
| 193 |
diff --git a/media-libs/libdc1394/libdc1394-2.1.4.ebuild b/media-libs/libdc1394/libdc1394-2.1.4.ebuild |
| 194 |
deleted file mode 100644 |
| 195 |
index 7331276d0eb..00000000000 |
| 196 |
--- a/media-libs/libdc1394/libdc1394-2.1.4.ebuild |
| 197 |
+++ /dev/null |
| 198 |
@@ -1,39 +0,0 @@ |
| 199 |
-# Copyright 1999-2012 Gentoo Foundation |
| 200 |
-# Distributed under the terms of the GNU General Public License v2 |
| 201 |
- |
| 202 |
-EAPI=4 |
| 203 |
- |
| 204 |
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification" |
| 205 |
-HOMEPAGE="https://sourceforge.net/projects/libdc1394/" |
| 206 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 207 |
- |
| 208 |
-LICENSE="LGPL-2.1" |
| 209 |
-SLOT="2" |
| 210 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 211 |
-IUSE="doc static-libs X" |
| 212 |
- |
| 213 |
-RDEPEND=">=sys-libs/libraw1394-1.2.0 |
| 214 |
- virtual/libusb:1 |
| 215 |
- X? ( x11-libs/libSM x11-libs/libXv )" |
| 216 |
-DEPEND="${RDEPEND} |
| 217 |
- virtual/pkgconfig |
| 218 |
- doc? ( app-doc/doxygen )" |
| 219 |
- |
| 220 |
-src_configure() { |
| 221 |
- econf \ |
| 222 |
- $(use_enable static-libs static) \ |
| 223 |
- --program-suffix=2 \ |
| 224 |
- $(use_with X x) \ |
| 225 |
- $(use_enable doc doxygen-html) |
| 226 |
-} |
| 227 |
- |
| 228 |
-src_compile() { |
| 229 |
- default |
| 230 |
- use doc && emake doc |
| 231 |
-} |
| 232 |
- |
| 233 |
-src_install() { |
| 234 |
- default |
| 235 |
- use doc && dohtml doc/html/* |
| 236 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
| 237 |
-} |
Archives