pool/libdc1394
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 156294 from multimedia:libs

Browse Source 
(forwarded request 151358 from matwey)

OBS-URL: https://build.opensuse.org/request/show/156294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdc1394?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2013-03-01 06:24:05 +00:00 committed by Git OBS Bridge
commit f4cc36e36f
11 changed files with 98 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-1.2.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec5aac9d7a90df6d6decce42cce4dc7553f346e900017b1279d57abab9ec9b6e
size 268733

3
libdc1394-2.2.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c26eb8a5ac350273fb28764c8ee04997346f91bfbb4675ce4782a8a8f371dc4
size 434467

3
libdc1394-2.2.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:871afba1fa1fea2c501b06be249fc56aa0dc5b3141c948089606fe051262f28c
size 434750

8
libdc1394-swab_fix.patch
View File

@ -1,9 +1,5 @@
--- --- a/libdc1394-2.2.1/dc1394/conversions.c
libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- +++ b/libdc1394-2.2.1/dc1394/conversions.c
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/libdc1394-2.2.0/dc1394/conversions.c
+++ b/libdc1394-2.2.0/dc1394/conversions.c
@@ -22,11 +22,10 @@ @@ -22,11 +22,10 @@
#include <string.h> #include <string.h>

4
libdc1394-v4l-2.6.38.patch
View File

@ -1,5 +1,5 @@
--- libdc1394-2.2.0/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 --- libdc1394-2.2.1/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200
+++ libdc1394-2.2.0/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 +++ libdc1394-2.2.1/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
#include <signal.h> #include <signal.h>
#define _LINUX_TIME_H #define _LINUX_TIME_H

108
libdc1394-visibility.patch
View File

@ -1,6 +1,6 @@
diff -urN libdc1394-2.2.0.orig/configure.in libdc1394-2.2.0/configure.in diff -urN libdc1394-2.2.1.orig/configure.in libdc1394-2.2.1/configure.in
--- libdc1394-2.2.0.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 --- libdc1394-2.2.1.orig/configure.in 2011-08-29 09:58:17.271211906 +0200
+++ libdc1394-2.2.0/configure.in 2011-08-29 10:01:52.563014990 +0200 +++ libdc1394-2.2.1/configure.in 2011-08-29 10:01:52.563014990 +0200
@@ -132,6 +132,23 @@ @@ -132,6 +132,23 @@
AC_FUNC_MMAP AC_FUNC_MMAP
@ -25,9 +25,9 @@ diff -urN libdc1394-2.2.0.orig/configure.in libdc1394-2.2.0/configure.in
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl When making a release: dnl When making a release:
dnl 1. If the library source code has changed at all since the last release, dnl 1. If the library source code has changed at all since the last release,
diff -urN libdc1394-2.2.0.orig/dc1394/bayer.c libdc1394-2.2.0/dc1394/bayer.c diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c
--- libdc1394-2.2.0.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 --- libdc1394-2.2.1.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.2.0/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 +++ libdc1394-2.2.1/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -234,9 +234,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/bayer.c libdc1394-2.2.0/dc1394/bayer.c
dc1394_debayer_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method) dc1394_debayer_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method)
{ {
if ((method<DC1394_BAYER_METHOD_MIN)||(method>DC1394_BAYER_METHOD_MAX)) if ((method<DC1394_BAYER_METHOD_MIN)||(method>DC1394_BAYER_METHOD_MAX))
diff -urN libdc1394-2.2.0.orig/dc1394/capture.c libdc1394-2.2.0/dc1394/capture.c diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c
--- libdc1394-2.2.0.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 +++ libdc1394-2.2.1/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200
@@ -23,8 +23,9 @@ @@ -23,8 +23,9 @@
#include "control.h" #include "control.h"
#include "platform.h" #include "platform.h"
@ -293,9 +293,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/capture.c libdc1394-2.2.0/dc1394/capture.c
dc1394_capture_is_frame_corrupt (dc1394camera_t * camera, dc1394_capture_is_frame_corrupt (dc1394camera_t * camera,
dc1394video_frame_t * frame) dc1394video_frame_t * frame)
{ {
diff -urN libdc1394-2.2.0.orig/dc1394/control.c libdc1394-2.2.0/dc1394/control.c diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c
--- libdc1394-2.2.0.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 +++ libdc1394-2.2.1/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200
@@ -27,8 +27,9 @@ @@ -27,8 +27,9 @@
#include "internal.h" #include "internal.h"
@ -1009,9 +1009,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/control.c libdc1394-2.2.0/dc1394/control.c
dc1394_camera_free(dc1394camera_t *camera) dc1394_camera_free(dc1394camera_t *camera)
{ {
dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera);
diff -urN libdc1394-2.2.0.orig/dc1394/conversions.c libdc1394-2.2.0/dc1394/conversions.c diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conversions.c
--- libdc1394-2.2.0.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 --- libdc1394-2.2.1.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200
+++ libdc1394-2.2.0/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 +++ libdc1394-2.2.1/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#define _XOPEN_SOURCE #define _XOPEN_SOURCE
#include <unistd.h> #include <unistd.h>
@ -1218,9 +1218,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/conversions.c libdc1394-2.2.0/dc1394/conve
dc1394_deinterlace_stereo_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394stereo_method_t method) dc1394_deinterlace_stereo_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394stereo_method_t method)
{ {
dc1394error_t err; dc1394error_t err;
diff -urN libdc1394-2.2.0.orig/dc1394/enumeration.c libdc1394-2.2.0/dc1394/enumeration.c diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enumeration.c
--- libdc1394-2.2.0.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.2.1.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.0/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 +++ libdc1394-2.2.1/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include "internal.h" #include "internal.h"
#include "platform.h" #include "platform.h"
@ -1265,9 +1265,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/enumeration.c libdc1394-2.2.0/dc1394/enume
dc1394_camera_free_list (dc1394camera_list_t *list) dc1394_camera_free_list (dc1394camera_list_t *list)
{ {
if (list) if (list)
diff -urN libdc1394-2.2.0.orig/dc1394/format7.c libdc1394-2.2.0/dc1394/format7.c diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c
--- libdc1394-2.2.0.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.2.1.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.0/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 +++ libdc1394-2.2.1/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
#include "utils.h" #include "utils.h"
#include "config.h" #include "config.h"
@ -1555,9 +1555,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/format7.c libdc1394-2.2.0/dc1394/format7.c
dc1394_format7_get_roi(dc1394camera_t *camera, dc1394_format7_get_roi(dc1394camera_t *camera,
dc1394video_mode_t video_mode, dc1394video_mode_t video_mode,
dc1394color_coding_t *color_coding, dc1394color_coding_t *color_coding,
diff -urN libdc1394-2.2.0.orig/dc1394/juju/control.c libdc1394-2.2.0/dc1394/juju/control.c diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju/control.c
--- libdc1394-2.2.0.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.2.1.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.0/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
#include "platform.h" #include "platform.h"
#include "internal.h" #include "internal.h"
@ -1593,9 +1593,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/juju/control.c libdc1394-2.2.0/dc1394/juju
juju_init(dc1394_t * d) juju_init(dc1394_t * d)
{ {
register_platform (d, &juju_dispatch, "juju"); register_platform (d, &juju_dispatch, "juju");
diff -urN libdc1394-2.2.0.orig/dc1394/linux/capture.c libdc1394-2.2.0/dc1394/linux/capture.c diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/linux/capture.c
--- libdc1394-2.2.0.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200
@@ -43,13 +43,14 @@ @@ -43,13 +43,14 @@
#include "kernel-video1394.h" #include "kernel-video1394.h"
#include "linux.h" #include "linux.h"
@ -1666,9 +1666,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/linux/capture.c libdc1394-2.2.0/dc1394/lin
dc1394_linux_capture_get_fileno (platform_camera_t * craw) dc1394_linux_capture_get_fileno (platform_camera_t * craw)
{ {
return craw->capture.dma_fd; return craw->capture.dma_fd;
diff -urN libdc1394-2.2.0.orig/dc1394/linux/control.c libdc1394-2.2.0/dc1394/linux/control.c diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/linux/control.c
--- libdc1394-2.2.0.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.2.1.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.0/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#include "linux.h" #include "linux.h"
#include "offsets.h" #include "offsets.h"
@ -1686,9 +1686,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/linux/control.c libdc1394-2.2.0/dc1394/lin
linux_init(dc1394_t * d) linux_init(dc1394_t * d)
{ {
register_platform (d, &linux_dispatch, "linux"); register_platform (d, &linux_dispatch, "linux");
diff -urN libdc1394-2.2.0.orig/dc1394/log.c libdc1394-2.2.0/dc1394/log.c diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c
--- libdc1394-2.2.0.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 --- libdc1394-2.2.1.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.2.0/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include "log.h" #include "log.h"
#include <stdarg.h> #include <stdarg.h>
@ -1742,9 +1742,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/log.c libdc1394-2.2.0/dc1394/log.c
{ {
char string[1024]; char string[1024];
if (system_debuglog_handler != NULL) { if (system_debuglog_handler != NULL) {
diff -urN libdc1394-2.2.0.orig/dc1394/register.c libdc1394-2.2.0/dc1394/register.c diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register.c
--- libdc1394-2.2.0.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 --- libdc1394-2.2.1.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.2.0/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include "register.h" #include "register.h"
#include "utils.h" #include "utils.h"
@ -1913,9 +1913,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/register.c libdc1394-2.2.0/dc1394/register
dc1394_set_strobe_register(dc1394camera_t *camera, uint64_t offset, dc1394_set_strobe_register(dc1394camera_t *camera, uint64_t offset,
uint32_t value) uint32_t value)
{ {
diff -urN libdc1394-2.2.0.orig/dc1394/usb/capture.c libdc1394-2.2.0/dc1394/usb/capture.c diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/capture.c
--- libdc1394-2.2.0.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.2.1/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <unistd.h> #include <unistd.h>
@ -1978,9 +1978,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/usb/capture.c libdc1394-2.2.0/dc1394/usb/c
dc1394_usb_capture_is_frame_corrupt (platform_camera_t * craw, dc1394_usb_capture_is_frame_corrupt (platform_camera_t * craw,
dc1394video_frame_t * frame) dc1394video_frame_t * frame)
{ {
diff -urN libdc1394-2.2.0.orig/dc1394/usb/control.c libdc1394-2.2.0/dc1394/usb/control.c diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/control.c
--- libdc1394-2.2.0.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.2.1/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
#include "platform.h" #include "platform.h"
#include "internal.h" #include "internal.h"
@ -1999,9 +1999,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/usb/control.c libdc1394-2.2.0/dc1394/usb/c
dc1394_usb_init(dc1394_t * d) dc1394_usb_init(dc1394_t * d)
{ {
register_platform (d, &usb_dispatch, "usb"); register_platform (d, &usb_dispatch, "usb");
diff -urN libdc1394-2.2.0.orig/dc1394/utils.c libdc1394-2.2.0/dc1394/utils.c diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c
--- libdc1394-2.2.0.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 --- libdc1394-2.2.1.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.2.0/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.2.1/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
*/ */
@ -2112,9 +2112,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/utils.c libdc1394-2.2.0/dc1394/utils.c
dc1394_checksum_crc16 (const uint8_t* buffer, uint32_t buffer_size) dc1394_checksum_crc16 (const uint8_t* buffer, uint32_t buffer_size)
{ {
uint32_t i, j, c, bit; uint32_t i, j, c, bit;
diff -urN libdc1394-2.2.0.orig/dc1394/vendor/avt.c libdc1394-2.2.0/dc1394/vendor/avt.c diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor/avt.c
--- libdc1394-2.2.0.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.2.1/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -2609,9 +2609,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/vendor/avt.c libdc1394-2.2.0/dc1394/vendor
{ {
dc1394error_t err; dc1394error_t err;
uint32_t curval; uint32_t curval;
diff -urN libdc1394-2.2.0.orig/dc1394/vendor/basler.c libdc1394-2.2.0/dc1394/vendor/basler.c diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/vendor/basler.c
--- libdc1394-2.2.0.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.2.1.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.0/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.2.1/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include "../control.h" #include "../control.h"
#include "basler.h" #include "basler.h"
@ -2719,9 +2719,9 @@ diff -urN libdc1394-2.2.0.orig/dc1394/vendor/basler.c libdc1394-2.2.0/dc1394/ven
{ {
dc1394basler_sff_t chunk; dc1394basler_sff_t chunk;
dc1394bool_t found = DC1394_FALSE; dc1394bool_t found = DC1394_FALSE;
diff -urN libdc1394-2.2.0.orig/dc1394/visibility.h libdc1394-2.2.0/dc1394/visibility.h diff -urN libdc1394-2.2.1.orig/dc1394/visibility.h libdc1394-2.2.1/dc1394/visibility.h
--- libdc1394-2.2.0.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 --- libdc1394-2.2.1.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100
+++ libdc1394-2.2.0/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 +++ libdc1394-2.2.1/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+ +
+#ifndef __DC1394_VISIBILITY_H__ +#ifndef __DC1394_VISIBILITY_H__

4
libdc1394.ac.patch
View File

@ -1,5 +1,5 @@
--- a/libdc1394-2.2.0/configure.in 2009-11-23 10:11:16.000000000 +0300 --- a/libdc1394-2.2.1/configure.in 2009-11-23 10:11:16.000000000 +0300
+++ b/libdc1394-2.2.0/configure.in 2009-11-23 10:11:51.000000000 +0300 +++ b/libdc1394-2.2.1/configure.in 2009-11-23 10:11:51.000000000 +0300
@@ -6,12 +6,6 @@ @@ -6,12 +6,6 @@
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

13
libdc1394.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Jan 29 14:27:01 UTC 2013 - matwey.kornilov@gmail.com
- Drop support of libdc1394-1 (which is unused for a long time)
-------------------------------------------------------------------
Mon Jan 28 07:17:50 UTC 2013 - matwey.kornilov@gmail.com
- Update to 2.2.1
- updated all licenses to LPGL2 (bnc#777083)
- misc fixes
- don't expose internal symbols
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 09 17:09:02 MSK 2012 - matwey.kornilov@gmail.com Fri Mar 09 17:09:02 MSK 2012 - matwey.kornilov@gmail.com

19
libdc1394.no-x11.patch
View File

@ -1,20 +1,5 @@
--- --- a/libdc1394-2.2.1/configure.in
libdc1394-1.2.2/examples/Makefile.am | 2 +- +++ b/libdc1394-2.2.1/configure.in
libdc1394-2.0.2/configure.in | 34 +++++++++++++++++++++-------------
2 files changed, 22 insertions(+), 14 deletions(-)
--- a/libdc1394-1.2.2/examples/Makefile.am
+++ b/libdc1394-1.2.2/examples/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dc1394_vloopback
-noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image
+noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image
grab_gray_image_SOURCES = grab_gray_image.c
grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
--- a/libdc1394-2.2.0/configure.in
+++ b/libdc1394-2.2.0/configure.in
@@ -102,21 +102,30 @@ @@ -102,21 +102,30 @@
# check for Xv extensions (necessary for examples/dc1394_multiview) # check for Xv extensions (necessary for examples/dc1394_multiview)

24
libdc1394.raw1394_set_iso_handler.patch
View File

@ -1,24 +0,0 @@
Bug 431916 - libdc1394-2.0.0-7: ordered comparison of pointer with integer zero
dc1394_capture.c:441: warning: ordered comparison of pointer with integer zero
---
libdc1394-1.2.2/libdc1394/dc1394_capture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/libdc1394-1.2.2/libdc1394/dc1394_capture.c
+++ b/libdc1394-1.2.2/libdc1394/dc1394_capture.c
@@ -438,11 +438,11 @@ dc1394_multi_capture(raw1394handle_t han
_dc1394_buffer[cams[i].channel]= cams[i].capture_buffer;
if (raw1394_set_iso_handler(handle,cams[i].channel,
- _dc1394_video_iso_handler) < 0)
+ _dc1394_video_iso_handler) == (iso_handler_t)-1)
{
/* error handling- for some reason something didn't work,
so we have to reset everything....*/
- printf("(%s:%d) error!\n",__FILE__, __LINE__);
+ printf("(%s:%s:%d) error while calling raw1394_set_iso_handler!\n",__FILE__, __func__, __LINE__);
for (j= i - 1; j > -1; j--)
{

117
libdc1394.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libdc1394 # spec file for package libdc1394
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,12 +16,7 @@
# #
# if Build_12 is equal to 0 don't build version 1.2.2
%define Build_12 0
Name: libdc1394 Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.2.0
BuildRequires: autoconf BuildRequires: autoconf
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: libSDL-devel BuildRequires: libSDL-devel
@ -38,21 +33,19 @@ BuildRequires: pkg-config
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4 BuildRequires: libv4l-devel >= 0.8.4
%endif %endif
Version: %{libdc1394_version} Version: 2.2.1
Release: 0 Release: 0
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
License: LGPL-2.1+ License: LGPL-2.1+
Group: Hardware/Camera Group: Hardware/Camera
Url: http://sourceforge.net/projects/libdc1394/ Url: http://sourceforge.net/projects/libdc1394/
Source1: libdc1394-%{libdc1394_12_version}.tar.bz2 Source0: libdc1394-%{version}.tar.bz2
Source2: libdc1394-%{libdc1394_version}.tar.bz2 Source1: %{name}-rpmlintrc
Source3: %{name}-rpmlintrc
Patch0: libdc1394.no-x11.patch Patch0: libdc1394.no-x11.patch
Patch1: libdc1394.ac.patch Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch Patch2: libdc1394-swab_fix.patch
Patch3: libdc1394.raw1394_set_iso_handler.patch Patch3: libdc1394-v4l-2.6.38.patch
Patch4: libdc1394-v4l-2.6.38.patch Patch4: libdc1394-visibility.patch
Patch5: libdc1394-visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -61,38 +54,6 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes
the low-level functionality provided by libraw1394 to communicate with the low-level functionality provided by libraw1394 to communicate with
the camera. the camera.
%if %{Build_12} >= 1
%package -n libdc1394_control12
Version: %{libdc1394_12_version}
Release: 0
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
%description -n libdc1394_control12
This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be
found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera.
%package -n libdc1394_control12-devel
Version: %{libdc1394_12_version}
Release: 0
Summary: 1394-Based Digital Camera Control Library
Group: Development/Libraries/C and C++
Requires: libdc1394_control12 = %{libdc1394_12_version}
Requires: libraw1394-devel
%description -n libdc1394_control12-devel
This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be
found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera.
%endif
%package 22 %package 22
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera Group: Hardware/Camera
@ -107,8 +68,8 @@ communicate with the camera.
%package devel %package devel
Summary: Development libraries and header files for dc1394 Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libdc1394 = %{libdc1394_version} Requires: libdc1394 = %{version}
Requires: libdc1394-22 = %{libdc1394_version} Requires: libdc1394-22 = %{version}
Requires: libraw1394-devel Requires: libraw1394-devel
%description devel %description devel
@ -116,61 +77,35 @@ This package contains the header files and libraries for building
programs using the dc1394 library. programs using the dc1394 library.
%prep %prep
%setup -q -T -c -a 1 -a 2 %setup -q
%patch0 -p1 %patch0 -p2
%patch1 -p1 %patch1 -p2
%patch2 -p1 %patch2 -p2
%patch3 -p1
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%patch4 %patch3 -p1
%endif %endif
%patch5 %patch4 -p1
%build %build
doit() { autoreconf --force --install
if pushd "$1" ; then export CFLAGS="%{optflags}"
autoreconf --force --install %{configure} --disable-static --with-pic --disable-xv
export CFLAGS="%{optflags}" make %{?_smp_mflags}
%{configure} --disable-static --with-pic --disable-xv
make %{?_smp_mflags}
popd
fi
}
%if %{Build_12} >= 1
doit libdc1394-%{libdc1394_12_version}
%endif
doit libdc1394-%{libdc1394_version}
%install %install
doit() { make DESTDIR=%{buildroot} install
if pushd "$1" ; then
make DESTDIR=%{buildroot} install
popd
fi
}
%if %{Build_12} >= 1
doit libdc1394-%{libdc1394_12_version}
%endif
doit libdc1394-%{libdc1394_version}
rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1*
rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
%if %{Build_12} >= 1
%post -n libdc1394_control12 -p /sbin/ldconfig
%postun -n libdc1394_control12 -p /sbin/ldconfig
%endif
%post 22 -p /sbin/ldconfig %post 22 -p /sbin/ldconfig
%postun 22 -p /sbin/ldconfig %postun 22 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README} %doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/dc1394_reset_bus %{_bindir}/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1* %{_mandir}/man1/dc1394_reset_bus.1*
@ -178,18 +113,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libdc1394.so.22* %{_libdir}/libdc1394.so.22*
%if %{Build_12} >= 1
%files -n libdc1394_control12
%defattr(-,root,root)
%{_libdir}/libdc1394_control.so.*
%files -n libdc1394_control12-devel
%defattr(-,root,root)
%{_includedir}/libdc1394
%{_libdir}/libdc1394_control*.so
%endif
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/dc1394 %{_includedir}/dc1394