Author: qboosh Date: Thu Jun 24 06:42:16 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.1.2 - updated link,ac patches
---- Files affected: packages/libdc1394: libdc1394-ac.patch (1.1 -> 1.2) , libdc1394-link.patch (1.4 -> 1.5) , libdc1394.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: packages/libdc1394/libdc1394-ac.patch diff -u packages/libdc1394/libdc1394-ac.patch:1.1 packages/libdc1394/libdc1394-ac.patch:1.2 --- packages/libdc1394/libdc1394-ac.patch:1.1 Sat Jul 12 01:30:35 2008 +++ packages/libdc1394/libdc1394-ac.patch Thu Jun 24 08:42:10 2010 @@ -1,23 +1,3 @@ ---- libdc1394-2.0.2/acinclude.m4.orig 2008-05-01 07:14:50.000000000 +0200 -+++ libdc1394-2.0.2/acinclude.m4 2008-07-12 00:31:26.522038059 +0200 -@@ -78,7 +78,7 @@ - AC_PATH_TOOL([$1], [$2]) - if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then - AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) -- AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) -+ AC_SUBST([DX_FLAG_][DX_CURRENT_FEATURE], 0) - fi - ]) - -@@ -101,7 +101,7 @@ - # ---------------------------------------------------------- - # Turn off the DX_CURRENT_FEATURE if the required feature is off. - AC_DEFUN([DX_CLEAR_DEPEND], [ --test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) -+test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_][DX_CURRENT_FEATURE], 0) - ]) - - # DX_FEATURE_ARG(FEATURE, DESCRIPTION, --- libdc1394-2.0.2/configure.in.orig 2008-05-08 03:15:15.000000000 +0200 +++ libdc1394-2.0.2/configure.in 2008-07-12 01:01:23.882034707 +0200 @@ -3,11 +3,7 @@ ================================================================ Index: packages/libdc1394/libdc1394-link.patch diff -u packages/libdc1394/libdc1394-link.patch:1.4 packages/libdc1394/libdc1394-link.patch:1.5 --- packages/libdc1394/libdc1394-link.patch:1.4 Mon Jan 7 21:46:14 2008 +++ packages/libdc1394/libdc1394-link.patch Thu Jun 24 08:42:10 2010 @@ -1,9 +1,8 @@ ---- libdc1394-2.0.0/examples/Makefile.am.orig 2008-01-04 09:21:53.000000000 +0100 -+++ libdc1394-2.0.0/examples/Makefile.am 2008-01-07 21:13:23.295114640 +0100 -@@ -58,5 +58,5 @@ - if XVOK +--- 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 @@ + dc1394_multiview_CFLAGS = $(X_CFLAGS) $(XV_CFLAGS) dc1394_multiview_SOURCES = dc1394_multiview.c --dc1394_multiview_LDADD = $(LDADD) ../dc1394/libdc1394.la $(X_LIBS) $(X_PRE_LIBS) $(XV_LIBS) -lX11 $(X_EXTRA_LIBS) -+dc1394_multiview_LDADD = $(LDADD) ../dc1394/libdc1394.la $(X_LIBS) $(XV_LIBS) -lX11 $(X_EXTRA_LIBS) - endif +-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) ================================================================ Index: packages/libdc1394/libdc1394.spec diff -u packages/libdc1394/libdc1394.spec:1.29 packages/libdc1394/libdc1394.spec:1.30 --- packages/libdc1394/libdc1394.spec:1.29 Sun Aug 24 13:00:31 2008 +++ packages/libdc1394/libdc1394.spec Thu Jun 24 08:42:10 2010 @@ -6,12 +6,12 @@ Summary: Library for 1394 Digital Camera Specification Summary(pl.UTF-8): Biblioteka dla specyfikacji Kamera Cyfrowa 1394 Name: libdc1394 -Version: 2.0.2 -Release: 2 +Version: 2.1.2 +Release: 1 License: LGPL v2.1+ Group: Libraries -Source0: http://dl.sourceforge.net/libdc1394/%{name}-%{version}.tar.gz -# Source0-md5: c2dc94e9568765f34f7a23b31b9c2f6d +Source0: http://downloads.sourceforge.net/libdc1394/%{name}-%{version}.tar.gz +# Source0-md5: b85f1ade88d8d96688d5965ed8603d53 Patch0: %{name}-link.patch Patch1: %{name}-ac.patch URL: http://sourceforge.net/projects/libdc1394/ @@ -19,11 +19,13 @@ BuildRequires: automake >= 1:1.9.6 BuildRequires: libraw1394-devel >= 1.2.0 BuildRequires: libtool +BuildRequires: libusb-devel >= 1.0 BuildRequires: pkgconfig BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXv-devel Requires: libraw1394 >= 1.2.0 +Requires: libusb >= 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -45,6 +47,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libraw1394-devel >= 1.2.0 +Requires: libusb-devel >= 1.0 %description devel libdc1394 header files. @@ -120,6 +123,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2010/06/24 06:42:10 qboosh +- updated to 2.1.2 +- updated link,ac patches + Revision 1.29 2008/08/24 11:00:31 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libdc1394/libdc1394-ac.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libdc1394/libdc1394-link.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libdc1394/libdc1394.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
