Package: luvcview
Severity: minor
Usertags: clang-ftbfs
User: [email protected]
Tag: patch


Hello,

Using the rebuild infrastructure, your package fails to build with clang
(instead of gcc).

Thanks,
Arthur
diff -Naur luvcview.orig/luvcview-0.2.6/debian/changelog luvcview/luvcview-0.2.6/debian/changelog
--- luvcview.orig/luvcview-0.2.6/debian/changelog	2014-06-03 19:08:21.839535016 -0500
+++ luvcview/luvcview-0.2.6/debian/changelog	2014-06-03 19:17:02.435544081 -0500
@@ -1,3 +1,11 @@
+luvcview (1:0.2.6-7) unstable; urgency=low
+
+  * Fix FTBFS with clang:
+    - Fixed "function declaration not allowed" in
+      v4l2uvc.c
+
+ -- Arthur Marble <[email protected]>  Tue, 03 Jun 2014 19:17:02 -0500
+
 luvcview (1:0.2.6-6) unstable; urgency=low
 
   * Build-depends on pkg-config (closes: bug#669471).
diff -Naur luvcview.orig/luvcview-0.2.6/debian/patches/clang-ftbfs.diff luvcview/luvcview-0.2.6/debian/patches/clang-ftbfs.diff 
--- luvcview.orig/luvcview-0.2.6/debian/patches/clang-ftbfs.diff	1969-12-31 18:00:00.000000000 -0600
+++ luvcview/luvcview-0.2.6/debian/patches/clang-ftbfs.diff	2014-06-03 19:15:49.575542813 -0500
@@ -0,0 +1,72 @@
+--- a/v4l2uvc.c
++++ b/v4l2uvc.c
+@@ -179,6 +179,26 @@ init_videoIn(struct vdIn *vd, char *devi
+     v4l2_close(vd->fd);
+     return -1;
+ }
++
++//subroutine to read menu items of controls with type 3
++void enumerate_menu (struct v4l2_querymenu querymenu,
++		     struct v4l2_queryctrl queryctrl, int vd) {
++  printf ("  Menu items:\n");
++  memset (&querymenu, 0, sizeof (querymenu));
++  querymenu.id = queryctrl.id;
++  for (querymenu.index = queryctrl.minimum;
++       querymenu.index <= queryctrl.maximum;
++       querymenu.index++) {
++    if (0 == ioctl (vd, VIDIOC_QUERYMENU, &querymenu)) {
++      printf ("  index:%d name:%s\n", querymenu.index, querymenu.name);
++      SDL_Delay(10);
++    } else {
++      printf ("error getting control menu");
++      break;
++    }
++  }
++}
++
+ int enum_controls(int vd) //struct vdIn *vd)
+ {    
+   struct v4l2_queryctrl queryctrl;
+@@ -193,24 +213,6 @@ int enum_controls(int vd) //struct vdIn
+   v4l2_ioctl(vd,VIDIOC_ENUMINPUT , getinput);
+   printf ("Available controls of device '%s' (Type 1=Integer 2=Boolean 3=Menu 4=Button)\n", getinput->name);
+ 
+-  //subroutine to read menu items of controls with type 3
+-  void enumerate_menu (void) {
+-    printf ("  Menu items:\n");
+-    memset (&querymenu, 0, sizeof (querymenu));
+-    querymenu.id = queryctrl.id;
+-    for (querymenu.index = queryctrl.minimum;
+-         querymenu.index <= queryctrl.maximum;
+-         querymenu.index++) {
+-      if (0 == ioctl (vd, VIDIOC_QUERYMENU, &querymenu)) {
+-        printf ("  index:%d name:%s\n", querymenu.index, querymenu.name);
+-	SDL_Delay(10);
+-      } else {
+-        printf ("error getting control menu");
+-        break;
+-      }
+-    }
+-  }
+-
+   //predefined controls
+   printf ("V4L2_CID_BASE         (predefined controls):\n");
+   memset (&queryctrl, 0, sizeof (queryctrl));
+@@ -227,7 +229,7 @@ int enum_controls(int vd) //struct vdIn
+               queryctrl.id, queryctrl.name, queryctrl.type, queryctrl.minimum,
+               queryctrl.maximum, queryctrl.step, queryctrl.default_value, control_s.value);
+       if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
+-        enumerate_menu ();
++        enumerate_menu (querymenu, queryctrl, vd);
+     } else {
+       if (errno == EINVAL)
+         continue;
+@@ -250,7 +252,7 @@ int enum_controls(int vd) //struct vdIn
+               queryctrl.id, queryctrl.name, queryctrl.type, queryctrl.minimum,
+               queryctrl.maximum, queryctrl.step, queryctrl.default_value, control_s.value);
+       if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
+-        enumerate_menu ();
++        enumerate_menu (querymenu, queryctrl, vd);
+     } else {
+       if (errno == EINVAL)
+         break;
diff -Naur luvcview.orig/luvcview-0.2.6/debian/patches/series luvcview/luvcview-0.2.6/debian/patches/series 
--- luvcview.orig/luvcview-0.2.6/debian/patches/series	2014-06-03 19:08:21.839535016 -0500
+++ luvcview/luvcview-0.2.6/debian/patches/series	2014-06-03 19:08:40.443535340 -0500
@@ -1,3 +1,4 @@
 01-uyvy.patch
 02-v4l2.patch
 03-libv4l.patch
+clang-ftbfs.diff

Reply via email to