[SCM] unicap/master: Refreshed patches

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue Oct 3 13:48:30 UTC 2017 

The following commit has been merged in the master branch:
commit 1f51390291d3cc7e8b0c04335f3b8317a94022ba
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Oct 3 11:26:48 2017 +0200

    Refreshed patches

diff --git a/debian/patches/1001_printf_warning.patch b/debian/patches/1001_printf_warning.patch
index c384947..5beddc0 100644
--- a/debian/patches/1001_printf_warning.patch
+++ b/debian/patches/1001_printf_warning.patch
@@ -1,9 +1,9 @@
 # Copyright (C) 2008 by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the software. See debian/copyright
 
---- a/src/unicap_helpers.c
-+++ b/src/unicap_helpers.c
-@@ -284,7 +284,7 @@
+--- unicap.orig/src/unicap_helpers.c
++++ unicap/src/unicap_helpers.c
+@@ -283,7 +283,7 @@
  		 "range: min: %g\n"\
  		 "       max: %g\n"\
  		 "stepping: %g\n"\
@@ -12,7 +12,7 @@
  		 property->identifier,
  		 property->category,
  		 property->unit,
-@@ -292,7 +292,7 @@
+@@ -291,7 +291,7 @@
  		 property->range.min,
  		 property->range.max,
  		 property->stepping,
diff --git a/debian/patches/1003_vid21394_pointer.patch b/debian/patches/1003_vid21394_pointer.patch
index b919206..7d21ee8 100644
--- a/debian/patches/1003_vid21394_pointer.patch
+++ b/debian/patches/1003_vid21394_pointer.patch
@@ -1,8 +1,8 @@
 # Copyright (C) 2008 by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the software. See debian/copyright
 
---- a/cpi/vid21394/vid21394_base.c
-+++ b/cpi/vid21394/vid21394_base.c
+--- unicap.orig/cpi/vid21394/vid21394_base.c
++++ unicap/cpi/vid21394/vid21394_base.c
 @@ -1333,7 +1333,8 @@
  	
  /*    TRACE( "rs232io fcp: %08llx out_data_length: %d, in_data_length: %d\n", fcp, out_data_length, in_data_length ); */
diff --git a/debian/patches/1005_tidy_gettext.patch b/debian/patches/1005_tidy_gettext.patch
index 54405d9..6df5344 100644
--- a/debian/patches/1005_tidy_gettext.patch
+++ b/debian/patches/1005_tidy_gettext.patch
@@ -2,8 +2,8 @@ Description: Fix update list of gettext source files
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2012-06-23
 
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
+--- unicap.orig/po/POTFILES.in
++++ unicap/po/POTFILES.in
 @@ -1,7 +1,5 @@
  # List of source files which contain translatable strings.
 -libucil/ucil_theora.c
diff --git a/debian/patches/1006_fix_euvccam_rt_linage.patch b/debian/patches/1006_fix_euvccam_rt_linage.patch
deleted file mode 100644
index 38e10f0..0000000
--- a/debian/patches/1006_fix_euvccam_rt_linage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix euvccam driver -lrt linkakage
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-06-23
-
---- a/cpi/euvccam/Makefile.am
-+++ b/cpi/euvccam/Makefile.am
-@@ -5,7 +5,7 @@
- libeuvccam_cpi_la_LIBADD=-lpthread 
- else
- libcpi_LTLIBRARIES=libeuvccam_cpi.la
--libeuvccam_cpi_la_LIBADD=-lpthread -L../../src/.libs/ -lunicap
-+libeuvccam_cpi_la_LIBADD=-lpthread -L../../src/.libs/ -lunicap @RT_LIBS@
- endif
- libcpidir = $(libdir)/unicap$(pkg_version)/cpi
- 
diff --git a/debian/patches/1009_v4l1.patch b/debian/patches/1009_v4l1.patch
index ddbc08f..f61cbb6 100644
--- a/debian/patches/1009_v4l1.patch
+++ b/debian/patches/1009_v4l1.patch
@@ -4,19 +4,8 @@ Author: Alessio Treglia <alessio at debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621954
 Forwarded: no
 
---- a/cpi/v4l2cpi/uvcvideo.h
-+++ b/cpi/v4l2cpi/uvcvideo.h
-@@ -2,7 +2,7 @@
- #define _USB_VIDEO_H_
- 
- #include <linux/kernel.h>
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #include "uvc_compat.h"
- 
---- a/cpi/v4l/v4l.c
-+++ b/cpi/v4l/v4l.c
+--- unicap.orig/cpi/v4l/v4l.c
++++ unicap/cpi/v4l/v4l.c
 @@ -49,7 +49,7 @@
  #endif
  #include <debug.h>
diff --git a/debian/patches/1010_libv4l2.h_includes.patch b/debian/patches/1010_libv4l2.h_includes.patch
index 074bef8..f74083f 100644
--- a/debian/patches/1010_libv4l2.h_includes.patch
+++ b/debian/patches/1010_libv4l2.h_includes.patch
@@ -6,8 +6,8 @@ Bug-Debian: http://bugs.debian.org/678718
 Forwarded: no
 Last-Update: 2012-06-23
 
---- unicap-0.9.12.orig/cpi/v4l2cpi/tiseuvccam.c
-+++ unicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c
+--- unicap.orig/cpi/v4l2cpi/tiseuvccam.c
++++ unicap/cpi/v4l2cpi/tiseuvccam.c
 @@ -28,6 +28,10 @@
  #define DEBUG
  #endif
@@ -19,8 +19,8 @@ Last-Update: 2012-06-23
  #define TRUE 1
  
  #include "debug.h"
---- unicap-0.9.12.orig/cpi/v4l2cpi/tisuvccam.c
-+++ unicap-0.9.12/cpi/v4l2cpi/tisuvccam.c
+--- unicap.orig/cpi/v4l2cpi/tisuvccam.c
++++ unicap/cpi/v4l2cpi/tisuvccam.c
 @@ -22,6 +22,10 @@
  #endif
  #include "debug.h"
@@ -32,9 +32,9 @@ Last-Update: 2012-06-23
  #define N_(x) x
  
  #define FOURCC(a,b,c,d) (unsigned int)((((unsigned int)d)<<24)+(((unsigned int)c)<<16)+(((unsigned int)b)<<8)+a)
---- unicap-0.9.12.orig/cpi/v4l2cpi/buffermanager.c
-+++ unicap-0.9.12/cpi/v4l2cpi/buffermanager.c
-@@ -13,6 +13,10 @@
+--- unicap.orig/cpi/v4l2cpi/buffermanager.c
++++ unicap/cpi/v4l2cpi/buffermanager.c
+@@ -15,6 +15,10 @@
  #endif
  #include "debug.h"
  
diff --git a/debian/patches/1011_euvccam_implicit_decls.patch b/debian/patches/1011_euvccam_implicit_decls.patch
index 87fdbb9..21d929d 100644
--- a/debian/patches/1011_euvccam_implicit_decls.patch
+++ b/debian/patches/1011_euvccam_implicit_decls.patch
@@ -3,8 +3,8 @@ Author: Adam Conrad <adconrad at debian.org>
 Forwarded: no
 Last-Update: 2012-06-23
 
---- unicap-0.9.12.orig/cpi/euvccam/euvccam_cpi.h
-+++ unicap-0.9.12/cpi/euvccam/euvccam_cpi.h
+--- unicap.orig/cpi/euvccam/euvccam_cpi.h
++++ unicap/cpi/euvccam/euvccam_cpi.h
 @@ -35,7 +35,7 @@
  #include "debug.h"
  
@@ -14,8 +14,8 @@ Last-Update: 2012-06-23
  
  struct euvccam_handle
  {
---- unicap-0.9.12.orig/cpi/euvccam/logging.c
-+++ unicap-0.9.12/cpi/euvccam/logging.c
+--- unicap.orig/cpi/euvccam/logging.c
++++ unicap/cpi/euvccam/logging.c
 @@ -21,6 +21,7 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -24,8 +24,8 @@ Last-Update: 2012-06-23
  
  FILE *g_logfp = NULL;
  int g_log_modules_mask = 0xffff;
---- unicap-0.9.12.orig/cpi/euvccam/euvccam_usb.c
-+++ unicap-0.9.12/cpi/euvccam/euvccam_usb.c
+--- unicap.orig/cpi/euvccam/euvccam_usb.c
++++ unicap/cpi/euvccam/euvccam_usb.c
 @@ -26,6 +26,7 @@
  #include <unicap.h>
  #include <stdint.h>
@@ -34,8 +34,8 @@ Last-Update: 2012-06-23
  #include <linux/usbdevice_fs.h>
  
  #include <unicap.h>
---- unicap-0.9.12.orig/cpi/euvccam/euvccam_colorproc.c
-+++ unicap-0.9.12/cpi/euvccam/euvccam_colorproc.c
+--- unicap.orig/cpi/euvccam/euvccam_colorproc.c
++++ unicap/cpi/euvccam/euvccam_colorproc.c
 @@ -18,6 +18,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
diff --git a/debian/patches/series b/debian/patches/series
index 26ade48..7196b68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 1001_printf_warning.patch
 1003_vid21394_pointer.patch
 1005_tidy_gettext.patch
-1006_fix_euvccam_rt_linage.patch
 1009_v4l1.patch
 1010_libv4l2.h_includes.patch
 1011_euvccam_implicit_decls.patch

-- 
unicap packaging

More information about the pkg-multimedia-commits mailing list