Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (353dfb58cc8ab00765182e4973c0479b6ec41c59)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (353dfb58cc8ab00765182e4973c0479b6ec41c59)
  • Date: Mon, 25 Jun 2012 04:08:13 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

video/guvcview/HISTORY | 6 +++
video/guvcview/PRE_BUILD | 5 ++
video/guvcview/linux-2.patch | 83
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 94 insertions(+)

New commits:
commit 353dfb58cc8ab00765182e4973c0479b6ec41c59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

guvcview: fixed build with kernels < 3.0 and glibc without sanitize
headers

diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index ea21d57..d22dea8 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,9 @@
+2012-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch if uvcvideo.h (comes with kernel sources
+ > 3.0) isn't found
+ * linux-2.patch: added, to fix compilation with kernel sources < 3.0
+ and glibc without sanitize headers
+
2012-06-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing optional deps

diff --git a/video/guvcview/PRE_BUILD b/video/guvcview/PRE_BUILD
index da87c42..cc8c640 100755
--- a/video/guvcview/PRE_BUILD
+++ b/video/guvcview/PRE_BUILD
@@ -1,3 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+
+if [[ ! -f "$INSTALL_ROOT/usr/include/linux/uvcvideo.h" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/linux-2.patch"
+fi &&
+
sed -i -e '29i#include <locale.h>' src/options.c
diff --git a/video/guvcview/linux-2.patch b/video/guvcview/linux-2.patch
new file mode 100644
index 0000000..eb4ce02
--- /dev/null
+++ b/video/guvcview/linux-2.patch
@@ -0,0 +1,83 @@
+--- guvcview-src-1.6.0.orig/src/uvcvideo.h
++++ guvcview-src-1.6.0/src/uvcvideo.h
+@@ -0,0 +1,69 @@
++#ifndef __LINUX_UVCVIDEO_H_
++#define __LINUX_UVCVIDEO_H_
++
++#include <linux/ioctl.h>
++#include <linux/types.h>
++
++/*
++ * Dynamic controls
++ */
++
++/* Data types for UVC control data */
++#define UVC_CTRL_DATA_TYPE_RAW 0
++#define UVC_CTRL_DATA_TYPE_SIGNED 1
++#define UVC_CTRL_DATA_TYPE_UNSIGNED 2
++#define UVC_CTRL_DATA_TYPE_BOOLEAN 3
++#define UVC_CTRL_DATA_TYPE_ENUM 4
++#define UVC_CTRL_DATA_TYPE_BITMASK 5
++
++/* Control flags */
++#define UVC_CTRL_FLAG_SET_CUR (1 << 0)
++#define UVC_CTRL_FLAG_GET_CUR (1 << 1)
++#define UVC_CTRL_FLAG_GET_MIN (1 << 2)
++#define UVC_CTRL_FLAG_GET_MAX (1 << 3)
++#define UVC_CTRL_FLAG_GET_RES (1 << 4)
++#define UVC_CTRL_FLAG_GET_DEF (1 << 5)
++/* Control should be saved at suspend and restored at resume. */
++#define UVC_CTRL_FLAG_RESTORE (1 << 6)
++/* Control can be updated by the camera. */
++#define UVC_CTRL_FLAG_AUTO_UPDATE (1 << 7)
++
++#define UVC_CTRL_FLAG_GET_RANGE \
++ (UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_GET_MIN | \
++ UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \
++ UVC_CTRL_FLAG_GET_DEF)
++
++struct uvc_menu_info {
++ __u32 value;
++ __u8 name[32];
++};
++
++struct uvc_xu_control_mapping {
++ __u32 id;
++ __u8 name[32];
++ __u8 entity[16];
++ __u8 selector;
++
++ __u8 size;
++ __u8 offset;
++ __u32 v4l2_type;
++ __u32 data_type;
++
++ struct uvc_menu_info *menu_info;
++ __u32 menu_count;
++
++ __u32 reserved[4];
++};
++
++struct uvc_xu_control_query {
++ __u8 unit;
++ __u8 selector;
++ __u8 query;
++ __u16 size;
++ __u8 *data;
++};
++
++#define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct
uvc_xu_control_mapping)
++#define UVCIOC_CTRL_QUERY _IOWR('u', 0x21, struct uvc_xu_control_query)
++
++#endif
+--- guvcview-src-1.6.0.orig/src/v4l2_dyna_ctrls.h
++++ guvcview-src-1.6.0/src/v4l2_dyna_ctrls.h
+@@ -23,7 +23,7 @@
+ #define V4L2_DYNA_CTRLS_H
+
+ #include <linux/videodev2.h>
+-#include <linux/uvcvideo.h>
++#include "uvcvideo.h"
+ /*
+ * Dynamic controls
+ */



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (353dfb58cc8ab00765182e4973c0479b6ec41c59), Vlad Glagolev, 06/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page