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

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

Browse Source 
- Update to 2.2.1
   - updated all licenses to LPGL2 (bnc#777083)
   - misc fixes
   - don't expose internal symbols

OBS-URL: https://build.opensuse.org/request/show/150083
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=25
This commit is contained in:
Sascha Peilicke 2013-01-28 13:18:43 +00:00 committed by Git OBS Bridge
parent e715f2f3ba
commit 611b6b3d92
9 changed files with 75 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

4
libdc1394-swab_fix.patch
View File

@ -2,8 +2,8 @@
libdc1394-2.0.2/dc1394/conversions.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/libdc1394-2.2.0/dc1394/conversions.c
+++ b/libdc1394-2.2.0/dc1394/conversions.c
--- a/libdc1394-2.2.1/dc1394/conversions.c
+++ b/libdc1394-2.2.1/dc1394/conversions.c
@@ -22,11 +22,10 @@
#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.0/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200
--- libdc1394-2.2.1/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200
+++ libdc1394-2.2.1/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200
@@ -46,7 +46,7 @@
#include <signal.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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/configure.in libdc1394-2.2.1/configure.in
--- libdc1394-2.2.1.orig/configure.in 2011-08-29 09:58:17.271211906 +0200
+++ libdc1394-2.2.1/configure.in 2011-08-29 10:01:52.563014990 +0200
@@ -132,6 +132,23 @@
AC_FUNC_MMAP
@ -25,9 +25,9 @@ diff -urN libdc1394-2.2.0.orig/configure.in libdc1394-2.2.0/configure.in
dnl ---------------------------------------------------------------------------
dnl When making a 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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c
--- libdc1394-2.2.1.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.2.1/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200
@@ -26,6 +26,7 @@
#include <stdlib.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)
{
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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c
--- libdc1394-2.2.1.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200
@@ -23,8 +23,9 @@
#include "control.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,
dc1394video_frame_t * frame)
{
diff -urN libdc1394-2.2.0.orig/dc1394/control.c libdc1394-2.2.0/dc1394/control.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c
--- libdc1394-2.2.1.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200
@@ -27,8 +27,9 @@
#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)
{
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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conversions.c
--- libdc1394-2.2.1.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200
+++ libdc1394-2.2.1/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200
@@ -25,6 +25,7 @@
#define _XOPEN_SOURCE
#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)
{
dc1394error_t err;
diff -urN libdc1394-2.2.0.orig/dc1394/enumeration.c libdc1394-2.2.0/dc1394/enumeration.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enumeration.c
--- libdc1394-2.2.1.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.1/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200
@@ -27,6 +27,7 @@
#include "internal.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)
{
if (list)
diff -urN libdc1394-2.2.0.orig/dc1394/format7.c libdc1394-2.2.0/dc1394/format7.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c
--- libdc1394-2.2.1.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.1/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200
@@ -34,6 +34,7 @@
#include "utils.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,
dc1394video_mode_t video_mode,
dc1394color_coding_t *color_coding,
diff -urN libdc1394-2.2.0.orig/dc1394/juju/control.c libdc1394-2.2.0/dc1394/juju/control.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju/control.c
--- libdc1394-2.2.1.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.1/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200
@@ -35,6 +35,7 @@
#include "platform.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)
{
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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/linux/capture.c
--- libdc1394-2.2.1.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200
@@ -43,13 +43,14 @@
#include "kernel-video1394.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)
{
return craw->capture.dma_fd;
diff -urN libdc1394-2.2.0.orig/dc1394/linux/control.c libdc1394-2.2.0/dc1394/linux/control.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/linux/control.c
--- libdc1394-2.2.1.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200
+++ libdc1394-2.2.1/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200
@@ -40,6 +40,7 @@
#include "linux.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)
{
register_platform (d, &linux_dispatch, "linux");
diff -urN libdc1394-2.2.0.orig/dc1394/log.c libdc1394-2.2.0/dc1394/log.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c
--- libdc1394-2.2.1.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.2.1/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200
@@ -24,6 +24,7 @@
#include "log.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];
if (system_debuglog_handler != NULL) {
diff -urN libdc1394-2.2.0.orig/dc1394/register.c libdc1394-2.2.0/dc1394/register.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register.c
--- libdc1394-2.2.1.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200
+++ libdc1394-2.2.1/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200
@@ -27,6 +27,7 @@
#include "register.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,
uint32_t value)
{
diff -urN libdc1394-2.2.0.orig/dc1394/usb/capture.c libdc1394-2.2.0/dc1394/usb/capture.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/capture.c
--- libdc1394-2.2.1.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200
@@ -28,6 +28,7 @@
#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,
dc1394video_frame_t * frame)
{
diff -urN libdc1394-2.2.0.orig/dc1394/usb/control.c libdc1394-2.2.0/dc1394/usb/control.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/control.c
--- libdc1394-2.2.1.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200
@@ -29,7 +29,7 @@
#include "platform.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)
{
register_platform (d, &usb_dispatch, "usb");
diff -urN libdc1394-2.2.0.orig/dc1394/utils.c libdc1394-2.2.0/dc1394/utils.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c
--- libdc1394-2.2.1.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200
+++ libdc1394-2.2.1/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200
@@ -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)
{
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
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor/avt.c
--- libdc1394-2.2.1.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200
@@ -26,6 +26,7 @@
#include <stdlib.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;
uint32_t curval;
diff -urN libdc1394-2.2.0.orig/dc1394/vendor/basler.c libdc1394-2.2.0/dc1394/vendor/basler.c
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/vendor/basler.c
--- libdc1394-2.2.1.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200
+++ libdc1394-2.2.1/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200
@@ -30,6 +30,7 @@
#include "../control.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;
dc1394bool_t found = DC1394_FALSE;
diff -urN libdc1394-2.2.0.orig/dc1394/visibility.h libdc1394-2.2.0/dc1394/visibility.h
--- libdc1394-2.2.0.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
diff -urN libdc1394-2.2.1.orig/dc1394/visibility.h libdc1394-2.2.1/dc1394/visibility.h
--- libdc1394-2.2.1.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100
+++ libdc1394-2.2.1/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200
@@ -0,0 +1,31 @@
+
+#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
+++ b/libdc1394-2.2.0/configure.in 2009-11-23 10:11:51.000000000 +0300
--- a/libdc1394-2.2.1/configure.in 2009-11-23 10:11:16.000000000 +0300
+++ b/libdc1394-2.2.1/configure.in 2009-11-23 10:11:51.000000000 +0300
@@ -6,12 +6,6 @@
AC_CANONICAL_SYSTEM

8
libdc1394.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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

4
libdc1394.no-x11.patch
View File

@ -13,8 +13,8 @@
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
--- a/libdc1394-2.2.1/configure.in
+++ b/libdc1394-2.2.1/configure.in
@@ -102,21 +102,30 @@
# check for Xv extensions (necessary for examples/dc1394_multiview)

4
libdc1394.spec
View File

@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.2.0
%define libdc1394_version 2.2.1
BuildRequires: autoconf
%if 0%{?suse_version} > 1110
BuildRequires: libSDL-devel