Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5fb6dd33bdbd5063c5ea93bd9219217097cb3dbc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5fb6dd33bdbd5063c5ea93bd9219217097cb3dbc)
  • Date: Tue, 23 Aug 2011 17:39:23 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

video-libs/libunicap/DEPENDS | 5 +----
video-libs/libunicap/HISTORY | 4 ++++
video-libs/libunicap/PRE_BUILD | 3 +++
video-libs/libunicap/libunicap.patch | 24 ++++++++++++++++++++++++
4 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 5fb6dd33bdbd5063c5ea93bd9219217097cb3dbc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libunicap #48, linux/videodev.h no longer provided by linux

diff --git a/video-libs/libunicap/DEPENDS b/video-libs/libunicap/DEPENDS
index e23cd2f..3eb49af 100755
--- a/video-libs/libunicap/DEPENDS
+++ b/video-libs/libunicap/DEPENDS
@@ -9,10 +9,7 @@ optional_depends libraw1394 \
# "--disable-dcam" \
# "build plugin for IIDC 1394 cameras" &&

-optional_depends libv4l \
- "--enable-libv4l" \
- "--disable-libv4l" \
- "use libv4l to communicate with v4l2 devices" &&
+depends libv4l &&

optional_depends gettext \
"--enable-nls" \
diff --git a/video-libs/libunicap/HISTORY b/video-libs/libunicap/HISTORY
index 92e8e18..852acd0 100644
--- a/video-libs/libunicap/HISTORY
+++ b/video-libs/libunicap/HISTORY
@@ -1,3 +1,7 @@
+2011-08-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: optional_depends libv4l -> depends libv4l
+ * PRE_BUILD, libunicap.patch: patch added, #48
+
2101-10-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.12

diff --git a/video-libs/libunicap/PRE_BUILD b/video-libs/libunicap/PRE_BUILD
new file mode 100755
index 0000000..1cb0ad3
--- /dev/null
+++ b/video-libs/libunicap/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/libunicap.patch
diff --git a/video-libs/libunicap/libunicap.patch
b/video-libs/libunicap/libunicap.patch
new file mode 100644
index 0000000..3944a99
--- /dev/null
+++ b/video-libs/libunicap/libunicap.patch
@@ -0,0 +1,24 @@
+diff -Naur libunicap-0.9.12.ori/cpi/v4l/v4l.c libunicap-0.9.12/cpi/v4l/v4l.c
+--- libunicap-0.9.12.ori/cpi/v4l/v4l.c 2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l/v4l.c 2011-08-24 00:22:15.000000000 +0200
+@@ -49,7 +49,7 @@
+ #endif
+ #include <debug.h>
+
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/videodev2.h> // for v4l2 checks
+
+ #include "v4l.h"
+diff -Naur libunicap-0.9.12.ori/cpi/v4l2cpi/uvcvideo.h
libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h
+--- libunicap-0.9.12.ori/cpi/v4l2cpi/uvcvideo.h 2010-01-17
08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h 2011-08-24 00:27:19.000000000
+0200
+@@ -2,7 +2,7 @@
+ #define _USB_VIDEO_H_
+
+ #include <linux/kernel.h>
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+
+ #include "uvc_compat.h"
+



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5fb6dd33bdbd5063c5ea93bd9219217097cb3dbc), Ladislav Hagara, 08/23/2011

Archive powered by MHonArc 2.6.24.

Top of Page