summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-26 00:40:00 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-27 10:24:47 +0100
commitf18921c2b1f6db8db50fc3adb47ff602221db567 (patch)
treed421a725b731a702725a2c54c4f43eee2ce8dcc3 /media-libs/libdc1394/files
parentprofiles: Remove last-rited media-video/qgifer (diff)
downloadgentoo-f18921c2b1f6db8db50fc3adb47ff602221db567.tar.gz
gentoo-f18921c2b1f6db8db50fc3adb47ff602221db567.tar.bz2
gentoo-f18921c2b1f6db8db50fc3adb47ff602221db567.zip
media-libs/libdc1394: Drop old
EAPI4-- Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'media-libs/libdc1394/files')
-rw-r--r--media-libs/libdc1394/files/libdc1394-usbinit.patch39
-rw-r--r--media-libs/libdc1394/files/libdc1394-videodev.h.patch53
2 files changed, 0 insertions, 92 deletions
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
-