Author: glen Date: Thu Dec 17 18:35:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - gtk bcond (neither work)
---- Files affected: packages/avidemux: avidemux.spec (1.74 -> 1.75) ---- Diffs: ================================================================ Index: packages/avidemux/avidemux.spec diff -u packages/avidemux/avidemux.spec:1.74 packages/avidemux/avidemux.spec:1.75 --- packages/avidemux/avidemux.spec:1.74 Thu Dec 17 19:24:23 2009 +++ packages/avidemux/avidemux.spec Thu Dec 17 19:35:25 2009 @@ -12,7 +12,8 @@ %bcond_without esd # disable EsounD sound support %bcond_without arts # without arts audio output %bcond_with amr # enable 3GPP Adaptive Multi Rate (AMR) speech codec support -%bcond_without qt4 # build qt4-base interface +%bcond_without qt4 # build qt4 interface +%bcond_without gtk # build gtk interface %bcond_with ssse3 # use SSSE3 instructions %define qt4_version 4.2 @@ -132,6 +133,8 @@ -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ + %{!?with_gtk:-DNO_GTK=1 -DADM_UI_GTK=0} \ + %{!?with_qt4:-DNO_QT4=1 -DADM_UI_QT4=0} \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif @@ -142,10 +145,13 @@ # plugins cd plugin-build %cmake \ + -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ -DAVIDEMUX_SOURCE_DIR=$TOP/ \ -DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \ + %{!?with_gtk:-DNO_GTK=1 -DADM_UI_GTK=0} \ + %{!?with_qt4:-DNO_QT4=1 -DADM_UI_QT4=0} \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif @@ -280,6 +286,7 @@ %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaU.so %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaV.so %{_mandir}/man1/avidemux.1* +%{_pixmapsdir}/*.png %{_datadir}/ADM_scripts @@ -300,8 +307,7 @@ %lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm %lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm -%{_pixmapsdir}/*.png - +%if %{with gtk} %files ui-gtk %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/avidemux2_gtk @@ -322,6 +328,7 @@ %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so +%endif %if %{with qt4} %files ui-qt4 @@ -352,6 +359,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.75 2009/12/17 18:35:25 glen +- gtk bcond (neither work) + Revision 1.74 2009/12/17 18:24:23 sparky - BR: pulseaudio-devel, libxslt-progs, qt4-qmake, qt-linguist (should require qt4-linguist) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.74&r2=1.75&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit