commit a6a5d99a353bc090850848328229b1e05a6ac54f
Author: Elan Ruusamäe <[email protected]>
Date: Tue Mar 3 18:21:16 2015 +0200
up to 2.2.1
dc1394_vloopback seems not built
libdc1394-link.patch | 9 ++++++---
libdc1394.spec | 14 +++++++-------
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/libdc1394.spec b/libdc1394.spec
index d49d20b..2f58876 100644
--- a/libdc1394.spec
+++ b/libdc1394.spec
@@ -1,21 +1,21 @@
#
# Conditional build:
%bcond_without static_libs # don't build static library
-#
+
Summary: Library for 1394 Digital Camera Specification
Summary(pl.UTF-8): Biblioteka dla specyfikacji Kamera Cyfrowa 1394
Name: libdc1394
-Version: 2.1.3
-Release: 2
+Version: 2.2.1
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/libdc1394/%{name}-%{version}.tar.gz
-# Source0-md5: d8b2cbfae1b329fdeaa638da80427334
+# Source0-md5: 5c4b78bb8265d6dc971433ec1da381ab
Patch0: %{name}-link.patch
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://sourceforge.net/projects/libdc1394/
+URL: http://damien.douxchamps.net/ieee1394/libdc1394/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9.6
BuildRequires: libraw1394-devel >= 1.2.0
@@ -107,11 +107,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/dc1394_reset_bus
-%attr(755,root,root) %{_bindir}/dc1394_vloopback
+#%attr(755,root,root) %{_bindir}/dc1394_vloopback
%attr(755,root,root) %{_libdir}/libdc1394.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdc1394.so.22
%{_mandir}/man1/dc1394_reset_bus.1*
-%{_mandir}/man1/dc1394_vloopback.1*
+#%{_mandir}/man1/dc1394_vloopback.1*
%files devel
%defattr(644,root,root,755)
diff --git a/libdc1394-link.patch b/libdc1394-link.patch
index 1d78681..268ccb9 100644
--- a/libdc1394-link.patch
+++ b/libdc1394-link.patch
@@ -1,8 +1,11 @@
---- libdc1394-2.1.2/examples/Makefile.am.orig 2009-06-11 06:05:47.000000000
+0200
-+++ libdc1394-2.1.2/examples/Makefile.am 2010-06-23 22:50:51.331445612
+0200
-@@ -48,4 +48,4 @@
+--- libdc1394-2.2.1/examples/Makefile.am~ 2013-01-28 04:43:18.000000000
+0200
++++ libdc1394-2.2.1/examples/Makefile.am 2015-03-03 18:19:41.324454128
+0200
+@@ -66,7 +66,7 @@
dc1394_multiview_CFLAGS = $(X_CFLAGS) $(XV_CFLAGS)
dc1394_multiview_SOURCES = dc1394_multiview.c
-dc1394_multiview_LDADD = $(LDADD) $(X_LIBS) $(X_PRE_LIBS) $(XV_LIBS) -lX11
$(X_EXTRA_LIBS)
+dc1394_multiview_LDADD = $(LDADD) $(X_LIBS) $(XV_LIBS) -lX11 $(X_EXTRA_LIBS)
+
+ dc1394_iso_CFLAGS = $(SDL_CFLAGS)
+ dc1394_iso_SOURCES = dc1394_iso.c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdc1394.git/commitdiff/a6a5d99a353bc090850848328229b1e05a6ac54f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
