diff --git a/libdc1394.changes b/libdc1394.changes index 3b42bef..ff24789 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 24 20:23:11 CET 2008 - olh@suse.de + +- remove buildrequires for xorg-x11-devel + ------------------------------------------------------------------- Tue Jan 15 08:50:11 CET 2008 - olh@suse.de diff --git a/libdc1394.no-x11.patch b/libdc1394.no-x11.patch new file mode 100644 index 0000000..a4c6ccb --- /dev/null +++ b/libdc1394.no-x11.patch @@ -0,0 +1,27 @@ +--- + libdc1394-1.2.2/examples/Makefile.am | 2 +- + libdc1394-2.0.0/examples/Makefile.am | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +--- a/libdc1394-1/examples/Makefile.am ++++ b/libdc1394-1/examples/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + bin_PROGRAMS = dc1394_vloopback +-noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image ++noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image + + grab_gray_image_SOURCES = grab_gray_image.c + grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 +--- a/libdc1394-2/examples/Makefile.am ++++ b/libdc1394-2/examples/Makefile.am +@@ -8,9 +8,6 @@ B = dc1394_reset_bus + + if USE_LINUX + B += dc1394_vloopback +-if XVOK +-A += dc1394_multiview +-endif + endif + + noinst_PROGRAMS = $(A) diff --git a/libdc1394.spec b/libdc1394.spec index af8ceb0..e32e368 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -13,7 +13,7 @@ Name: libdc1394 %define libdc1394_12_version 1.2.2 %define libdc1394_version 2.0.0 -BuildRequires: libraw1394-devel xorg-x11-devel +BuildRequires: libraw1394-devel License: LGPL v2.1 or later Group: Hardware/Camera AutoReqProv: on @@ -24,6 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: 1394-Based Digital Camera Control Library Source1: libdc1394-%{libdc1394_12_version}.tar.bz2 Source2: libdc1394-%{libdc1394_version}.tar.bz2 +Patch0: libdc1394.no-x11.patch %description This library provides functionality for controlling any camera that @@ -146,6 +147,7 @@ Authors: %setup -q -T -c -a 1 -a 2 mv libdc1394-1* libdc1394-1 mv libdc1394-2* libdc1394-2 +%patch0 -p1 %build for i in libdc1394-1 libdc1394-2 @@ -207,66 +209,68 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback %_libdir/pkgconfig/*.pc %changelog -* Tue Jan 15 2008 - olh@suse.de +* Thu Jan 24 2008 olh@suse.de +- remove buildrequires for xorg-x11-devel +* Tue Jan 15 2008 olh@suse.de - libdc1394-devel requires libdc1394-22 -* Mon Jan 14 2008 - olh@suse.de +* Mon Jan 14 2008 olh@suse.de - update to 2.0.0 final rename libdc1394-20 to libdc1394-22 due to SONAME change -* Thu Aug 16 2007 - olh@suse.de +* Thu Aug 16 2007 olh@suse.de - libdc1394_control12-devel needs libraw1394-devel -* Thu Aug 16 2007 - olh@suse.de +* Thu Aug 16 2007 olh@suse.de - remove inclusion of code which is labeled as GPL (298152) removes topology.h, cooked1394_read() and others remove dc1394_vloopback binary -* Sun Aug 05 2007 - olh@suse.de +* Sun Aug 05 2007 olh@suse.de - split libdc1394-20 package which contains only libraries split libdc1394_control12 and libdc1394_control12-devel upgrade to 1.2.2, color filter fix -* Fri Jul 13 2007 - olh@suse.de +* Fri Jul 13 2007 olh@suse.de - update to 2.0.0-rc7 API fixes -* Tue Aug 15 2006 - olh@suse.de +* Tue Aug 15 2006 olh@suse.de - update to 2.0.0-rc3 (#198102) all new API - keep old library version until every app is converted -* Wed Jul 19 2006 - olh@suse.de +* Wed Jul 19 2006 olh@suse.de - update to 1.2.1 replaced camera version detection in dc1394_is_camera() by a proper call to dc1394_get_sw_version(). fixed compilation warnings due to mixed signedness in the whole code. fixed a serious bug in the camera detection. updated TRIGGER_MODE_NUM definition -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Oct 21 2005 - olh@suse.de +* Fri Oct 21 2005 olh@suse.de - correct usage of CLK_TCK - update to current cvs fixed memory leak in capture functions (dma device name not freed) fixed trigger capabilities detection (Markus Niebel) fixed some confusion between raw1394_new_handle and dc1394_create_handle (Thanks to Thorondor) -* Mon Sep 26 2005 - mls@suse.de +* Mon Sep 26 2005 mls@suse.de - make devel package require base package -* Tue Jul 05 2005 - olh@suse.de +* Tue Jul 05 2005 olh@suse.de - go back to version 1, version 2 still needs some time -* Fri Jul 01 2005 - olh@suse.de +* Fri Jul 01 2005 olh@suse.de - update to version 2.0.0-pre3 -* Fri Jul 01 2005 - olh@suse.de +* Fri Jul 01 2005 olh@suse.de - update to version 1.1.0 -* Thu Jan 13 2005 - olh@suse.de +* Thu Jan 13 2005 olh@suse.de - update to version 1.0.0, cvs status 2004-11-12 -* Tue Jan 11 2005 - olh@suse.de +* Tue Jan 11 2005 olh@suse.de - update to version 1.0.0 -* Mon Mar 08 2004 - lmuelle@suse.de +* Mon Mar 08 2004 lmuelle@suse.de - update to version 0.9.3 - create devel sub package -* Wed Jan 07 2004 - lmuelle@suse.de +* Wed Jan 07 2004 lmuelle@suse.de - update to version 0.9.2 -* Mon Jul 28 2003 - adrian@suse.de +* Mon Jul 28 2003 adrian@suse.de - fix lib filename suffix -* Fri Jul 25 2003 - adrian@suse.de +* Fri Jul 25 2003 adrian@suse.de - update to version 0.9.1 - use BuildRoot - add %%run_ldconfig -* Fri Sep 27 2002 - uli@suse.de +* Fri Sep 27 2002 uli@suse.de - initial package