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

Accepting request 91996 from home:matwey:branches:multimedia:libs

Browse Source 
Updated to new version 2.1.4.

OBS-URL: https://build.opensuse.org/request/show/91996
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=21
This commit is contained in:
Ismail Dönmez 2011-11-17 20:53:45 +00:00 committed by Git OBS Bridge
parent 51bcdfd4ba
commit d921008bd4
9 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-2.1.3.tar.bz2
View File

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

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

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

4
libdc1394-swab_fix.patch
View File

@ -2,8 +2,8 @@
libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- libdc1394-2.0.2/dc1394/conversions.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 3 deletions(-)
--- a/libdc1394-2.1.3/dc1394/conversions.c --- a/libdc1394-2.1.4/dc1394/conversions.c
+++ b/libdc1394-2.1.3/dc1394/conversions.c +++ b/libdc1394-2.1.4/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.1.3/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 --- libdc1394-2.1.4/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200
+++ libdc1394-2.1.3/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 +++ libdc1394-2.1.4/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

112
libdc1394-visibility.patch
View File

@ -1,7 +1,7 @@
diff -urN libdc1394-2.1.3.orig/configure.in libdc1394-2.1.3/configure.in diff -urN libdc1394-2.1.4.orig/configure.in libdc1394-2.1.4/configure.in
--- libdc1394-2.1.3.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 --- libdc1394-2.1.4.orig/configure.in 2011-08-29 09:58:17.271211906 +0200
+++ libdc1394-2.1.3/configure.in 2011-08-29 10:01:52.563014990 +0200 +++ libdc1394-2.1.4/configure.in 2011-08-29 10:01:52.563014990 +0200
@@ -107,6 +107,23 @@ @@ -114,6 +114,23 @@
AC_FUNC_MMAP AC_FUNC_MMAP
@ -25,9 +25,9 @@ diff -urN libdc1394-2.1.3.orig/configure.in libdc1394-2.1.3/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.1.3.orig/dc1394/bayer.c libdc1394-2.1.3/dc1394/bayer.c diff -urN libdc1394-2.1.4.orig/dc1394/bayer.c libdc1394-2.1.4/dc1394/bayer.c
--- libdc1394-2.1.3.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 --- libdc1394-2.1.4.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.1.3/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/bayer.c libdc1394-2.1.3/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.1.3.orig/dc1394/capture.c libdc1394-2.1.3/dc1394/capture.c diff -urN libdc1394-2.1.4.orig/dc1394/capture.c libdc1394-2.1.4/dc1394/capture.c
--- libdc1394-2.1.3.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/capture.c libdc1394-2.1.3/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.1.3.orig/dc1394/control.c libdc1394-2.1.3/dc1394/control.c diff -urN libdc1394-2.1.4.orig/dc1394/control.c libdc1394-2.1.4/dc1394/control.c
--- libdc1394-2.1.3.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/control.c libdc1394-2.1.3/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.1.3.orig/dc1394/conversions.c libdc1394-2.1.3/dc1394/conversions.c diff -urN libdc1394-2.1.4.orig/dc1394/conversions.c libdc1394-2.1.4/dc1394/conversions.c
--- libdc1394-2.1.3.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 --- libdc1394-2.1.4.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200
+++ libdc1394-2.1.3/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/conversions.c libdc1394-2.1.3/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.1.3.orig/dc1394/enumeration.c libdc1394-2.1.3/dc1394/enumeration.c diff -urN libdc1394-2.1.4.orig/dc1394/enumeration.c libdc1394-2.1.4/dc1394/enumeration.c
--- libdc1394-2.1.3.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.1.4.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.1.3/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/enumeration.c libdc1394-2.1.3/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.1.3.orig/dc1394/format7.c libdc1394-2.1.3/dc1394/format7.c diff -urN libdc1394-2.1.4.orig/dc1394/format7.c libdc1394-2.1.4/dc1394/format7.c
--- libdc1394-2.1.3.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.1.4.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.1.3/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/format7.c libdc1394-2.1.3/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.1.3.orig/dc1394/juju/control.c libdc1394-2.1.3/dc1394/juju/control.c diff -urN libdc1394-2.1.4.orig/dc1394/juju/control.c libdc1394-2.1.4/dc1394/juju/control.c
--- libdc1394-2.1.3.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.1.4.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.1.3/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/juju/control.c libdc1394-2.1.3/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.1.3.orig/dc1394/linux/capture.c libdc1394-2.1.3/dc1394/linux/capture.c diff -urN libdc1394-2.1.4.orig/dc1394/linux/capture.c libdc1394-2.1.4/dc1394/linux/capture.c
--- libdc1394-2.1.3.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/linux/capture.c libdc1394-2.1.3/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.1.3.orig/dc1394/linux/control.c libdc1394-2.1.3/dc1394/linux/control.c diff -urN libdc1394-2.1.4.orig/dc1394/linux/control.c libdc1394-2.1.4/dc1394/linux/control.c
--- libdc1394-2.1.3.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 --- libdc1394-2.1.4.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.1.3/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/linux/control.c libdc1394-2.1.3/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.1.3.orig/dc1394/log.c libdc1394-2.1.3/dc1394/log.c diff -urN libdc1394-2.1.4.orig/dc1394/log.c libdc1394-2.1.4/dc1394/log.c
--- libdc1394-2.1.3.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 --- libdc1394-2.1.4.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.1.3/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/log.c libdc1394-2.1.3/dc1394/log.c
{ {
char string[1024]; char string[1024];
if (system_debuglog_handler != NULL) { if (system_debuglog_handler != NULL) {
diff -urN libdc1394-2.1.3.orig/dc1394/register.c libdc1394-2.1.3/dc1394/register.c diff -urN libdc1394-2.1.4.orig/dc1394/register.c libdc1394-2.1.4/dc1394/register.c
--- libdc1394-2.1.3.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 --- libdc1394-2.1.4.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.1.3/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/register.c libdc1394-2.1.3/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.1.3.orig/dc1394/usb/capture.c libdc1394-2.1.3/dc1394/usb/capture.c diff -urN libdc1394-2.1.4.orig/dc1394/usb/capture.c libdc1394-2.1.4/dc1394/usb/capture.c
--- libdc1394-2.1.3.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/usb/capture.c libdc1394-2.1.3/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.1.3.orig/dc1394/usb/control.c libdc1394-2.1.3/dc1394/usb/control.c diff -urN libdc1394-2.1.4.orig/dc1394/usb/control.c libdc1394-2.1.4/dc1394/usb/control.c
--- libdc1394-2.1.3.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.1.4/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"
@ -1996,12 +1996,12 @@ diff -urN libdc1394-2.1.3.orig/dc1394/usb/control.c libdc1394-2.1.3/dc1394/usb/c
-void -void
+DLL_LOCAL void +DLL_LOCAL void
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.1.3.orig/dc1394/utils.c libdc1394-2.1.3/dc1394/utils.c diff -urN libdc1394-2.1.4.orig/dc1394/utils.c libdc1394-2.1.4/dc1394/utils.c
--- libdc1394-2.1.3.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 --- libdc1394-2.1.4.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.1.3/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/utils.c libdc1394-2.1.3/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.1.3.orig/dc1394/vendor/avt.c libdc1394-2.1.3/dc1394/vendor/avt.c diff -urN libdc1394-2.1.4.orig/dc1394/vendor/avt.c libdc1394-2.1.4/dc1394/vendor/avt.c
--- libdc1394-2.1.3.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/vendor/avt.c libdc1394-2.1.3/dc1394/vendor
{ {
dc1394error_t err; dc1394error_t err;
uint32_t curval; uint32_t curval;
diff -urN libdc1394-2.1.3.orig/dc1394/vendor/basler.c libdc1394-2.1.3/dc1394/vendor/basler.c diff -urN libdc1394-2.1.4.orig/dc1394/vendor/basler.c libdc1394-2.1.4/dc1394/vendor/basler.c
--- libdc1394-2.1.3.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 --- libdc1394-2.1.4.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.1.3/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 +++ libdc1394-2.1.4/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.1.3.orig/dc1394/vendor/basler.c libdc1394-2.1.3/dc1394/ven
{ {
dc1394basler_sff_t chunk; dc1394basler_sff_t chunk;
dc1394bool_t found = DC1394_FALSE; dc1394bool_t found = DC1394_FALSE;
diff -urN libdc1394-2.1.3.orig/dc1394/visibility.h libdc1394-2.1.3/dc1394/visibility.h diff -urN libdc1394-2.1.4.orig/dc1394/visibility.h libdc1394-2.1.4/dc1394/visibility.h
--- libdc1394-2.1.3.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 --- libdc1394-2.1.4.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100
+++ libdc1394-2.1.3/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 +++ libdc1394-2.1.4/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.1.3/configure.in 2009-11-23 10:11:16.000000000 +0300 --- a/libdc1394-2.1.4/configure.in 2009-11-23 10:11:16.000000000 +0300
+++ b/libdc1394-2.1.3/configure.in 2009-11-23 10:11:51.000000000 +0300 +++ b/libdc1394-2.1.4/configure.in 2009-11-23 10:11:51.000000000 +0300
@@ -5,12 +5,6 @@ @@ -5,12 +5,6 @@
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

7
libdc1394.changes
View File

@ -1,4 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 17 22:31:02 MSK 2011 - matwey.kornilov@gmail.com
- Update to 2.1.4.
- Allow image buffers to be editable by client apps on Linux juju
- Correct error in downsample bayer function
- Rename poorly named externally-visible symbol usb_init
(meanwhile libdc1394-visibility.patch is still kept)
-------------------------------------------------------------------
Sun Nov 13 09:15:01 UTC 2011 - coolo@suse.com Sun Nov 13 09:15:01 UTC 2011 - coolo@suse.com
- add libtool as explicit buildrequire to avoid implicit dependency from prjconf - add libtool as explicit buildrequire to avoid implicit dependency from prjconf

6
libdc1394.no-x11.patch
View File

@ -13,9 +13,9 @@
grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_SOURCES = grab_gray_image.c
grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
--- a/libdc1394-2.1.3/configure.in --- a/libdc1394-2.1.4/configure.in
+++ b/libdc1394-2.1.3/configure.in +++ b/libdc1394-2.1.4/configure.in
@@ -76,21 +76,30 @@ @@ -84,21 +84,30 @@
# check for Xv extensions (necessary for examples/dc1394_multiview) # check for Xv extensions (necessary for examples/dc1394_multiview)
# imported from Coriander # imported from Coriander

2
libdc1394.spec
View File

@ -21,7 +21,7 @@
Name: libdc1394 Name: libdc1394
%define libdc1394_12_version 1.2.2 %define libdc1394_12_version 1.2.2
%define libdc1394_version 2.1.3 %define libdc1394_version 2.1.4
BuildRequires: libraw1394-devel BuildRequires: libraw1394-devel
BuildRequires: libtool BuildRequires: libtool
%if 0%{?suse_version} > 1100 %if 0%{?suse_version} > 1100