commit 10c3898d2816c79b761fc6affe7b786680b8fa44
Author: Jakub Bogusz <[email protected]>
Date: Thu Mar 5 16:17:02 2015 +0100
- add linking error fix to link patch instead of hiding it on particular
arch;
it worked on other only by accident (pthread came from libusb)
with an exception of x32 because of another accident (broken library
search path in libtool)
- release 2
libdc1394-link.patch | 11 +++++++++++
libdc1394.spec | 14 ++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/libdc1394.spec b/libdc1394.spec
index 4aa49eb..11785ff 100644
--- a/libdc1394.spec
+++ b/libdc1394.spec
@@ -1,13 +1,13 @@
#
# Conditional build:
%bcond_without static_libs # don't build static library
-%bcond_with v4l1 # build with Video4Linux 1.x API (dropped in linux
kernel 2.6.38)
+%bcond_with v4l1 # build with Video4Linux 1.x API (dropped in
linux kernel 2.6.38)
Summary: Library for 1394 Digital Camera Specification
Summary(pl.UTF-8): Biblioteka dla specyfikacji Kamera Cyfrowa 1394
Name: libdc1394
Version: 2.2.1
-Release: 1
+Release: 2
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/libdc1394/%{name}-%{version}.tar.gz
@@ -17,27 +17,25 @@ Patch1: %{name}-ac.patch
# libdc1394-2.1.2 vs libdc1394_avt-2.1.2 diff
(http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar/libdc1394_avt-2.1.2.tar.gz)
Patch2: %{name}-avt.patch
URL: http://damien.douxchamps.net/ieee1394/libdc1394/
-BuildRequires: SDL-devel
+BuildRequires: OpenGL-devel
+BuildRequires: SDL-devel >= 1.2.4
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9.6
BuildRequires: libraw1394-devel >= 1.2.0
BuildRequires: libtool
BuildRequires: libusb-devel >= 1.0
+%{?with_v4l1:BuildRequires: linux-libc-headers < 7:2.6.38}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.583
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXv-devel
+Requires: SDL >= 1.2.4
Requires: libraw1394 >= 1.2.0
Requires: libusb >= 1.0
Provides: libdc1394(avt) = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%ifarch x32
-# Unresolved symbols pthread_join pthread_create on x32
-%define skip_post_check_so libdc1394.so.22.1.8
-%endif
-
%description
libdc1394 is a library that is intended to provide a high level
programming interface for application developers who wish to control
diff --git a/libdc1394-link.patch b/libdc1394-link.patch
index 268ccb9..c53f998 100644
--- a/libdc1394-link.patch
+++ b/libdc1394-link.patch
@@ -9,3 +9,14 @@
dc1394_iso_CFLAGS = $(SDL_CFLAGS)
dc1394_iso_SOURCES = dc1394_iso.c
+--- libdc1394-2.2.1/dc1394/usb/Makefile.am.orig 2013-01-28
03:43:18.000000000 +0100
++++ libdc1394-2.2.1/dc1394/usb/Makefile.am 2015-03-05 15:40:46.950618939
+0100
+@@ -8,7 +8,7 @@
+ endif
+
+ AM_CFLAGS = -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
+-libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS)
++libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS) -lpthread
+ libdc1394_usb_la_SOURCES = \
+ control.c \
+ usb.h \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdc1394.git/commitdiff/10c3898d2816c79b761fc6affe7b786680b8fa44
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
