Author: hawk                         Date: Sat Sep 13 12:51:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added avc1394 bcond, disabled by default (avc video plugin uses obsolete
  API which was removed in libraw1394 2.0.0, needs rewrite which is not
  going to happen probably)
- fixed dc1394 bcond (really disable, no matter if libdc1394-devel is
  installed or not)

---- Files affected:
SPECS:
   pwlib.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: SPECS/pwlib.spec
diff -u SPECS/pwlib.spec:1.147 SPECS/pwlib.spec:1.148
--- SPECS/pwlib.spec:1.147      Tue Aug 26 20:21:22 2008
+++ SPECS/pwlib.spec    Sat Sep 13 14:51:30 2008
@@ -2,13 +2,14 @@
 #
 # Conditional build:
 %bcond_with    dc1394          # build DC 1394 video input plugin
+%bcond_with    avc1394         # build AVC 1394 video input plugin
 #
 Summary:       Portable Windows Libary
 Summary(pl.UTF-8):     Biblioteka zapewniająca przenośność między Windows i 
Uniksami
 Summary(pt_BR.UTF-8):  Biblioteca Windows Portavel
 Name:          pwlib
 Version:       1.10.10
-Release:       5
+Release:       6
 Epoch:         0
 License:       MPL 1.0
 Group:         Libraries
@@ -31,7 +32,7 @@
 BuildRequires: cyrus-sasl-devel >= 2.0
 BuildRequires: expat-devel
 BuildRequires: flex
-BuildRequires: libavc1394-devel
+%{?with_avc1394:BuildRequires: libavc1394-devel}
 %{?with_dc1394:BuildRequires:  libdc1394-devel < 2.0.0}
 BuildRequires: libdv-devel
 BuildRequires: libraw1394-devel
@@ -192,7 +193,9 @@
 %{__autoconf}
 %configure \
        --enable-plugins \
-       --enable-v4l2
+       --enable-v4l2 \
+       %{!?with_avc1394:--disable-avc} \
+       %{!?with_dc1394:--disable-dc}
 
 dir=$(pwd)
 %{__make} %{?debug:debugshared}%{!?debug:optshared} \
@@ -256,9 +259,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pwlib/devices/sound/oss_pwplugin.so
 
+%if %{with avc1394}
 %files video-avc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pwlib/devices/videoinput/avc_pwplugin.so
+%endif
 
 %if %{with dc1394}
 %files video-dc
@@ -280,6 +285,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2008/09/13 12:51:30  hawk
+- added avc1394 bcond, disabled by default (avc video plugin uses obsolete
+  API which was removed in libraw1394 2.0.0, needs rewrite which is not
+  going to happen probably)
+- fixed dc1394 bcond (really disable, no matter if libdc1394-devel is
+  installed or not)
+
 Revision 1.147  2008/08/26 18:21:22  arekm
 - release 5
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pwlib.spec?r1=1.147&r2=1.148&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to