packages: avidemux/avidemux.spec - use gtk and qt4 bconds correctly, no mor...

[sparky]

Author: sparky                       Date: Thu Dec 17 21:32:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use gtk and qt4 bconds correctly, no more cmake magick
- fixed other bconds

---- Files affected:
packages/avidemux:
   avidemux.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.79 packages/avidemux/avidemux.spec:1.80
--- packages/avidemux/avidemux.spec:1.79	Thu Dec 17 22:07:44 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 22:32:40 2009
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - create aften.spec (aften.sf.net) and use it -D USE_AFTEN=1
-# - amr bcond - -D USE_AMR_NB=1, maybe just drop it ?
-# - the bconds don't work with cmake, all gets enabled if BR found -- needs some cmake magican to fixup the bconds
 # - use external seamonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
 # - uses patched ffmpeg
 # - Could not find Gettext -- libintl not required for gettext support
@@ -113,8 +111,6 @@
 
 echo 'pt_BR' >> po/LINGUAS
 
-sed -i -e '/SET(ADM_UI_.* 1)/d' CMakeLists.txt
-
 # libdir fix
 grep -rl 'DESTINATION lib' . | xargs sed -i -e's,DESTINATION lib,DESTINATION lib${LIB_SUFFIX},g'
 sed -i -e's,FFMPEG_INSTALL_DIR lib,FFMPEG_INSTALL_DIR lib${LIB_SUFFIX},' cmake/admFFmpegBuild.cmake
@@ -129,12 +125,13 @@
 	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-	%{!?with_gtk:-DGTK_CHECKED=1 -DADM_UI_GTK=0} \
-	%{!?with_qt4:-DQT4_CHECKED=1 -DADM_UI_QT4=0} \
+	%{!?with_gtk:-DGTK=0} \
+	%{!?with_qt4:-DQT4=0} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
 	..
+
 %{__make}
 
 # plugin build expects libraries to be already installed; we fake a prefix
@@ -151,8 +148,11 @@
 	-DAVIDEMUX_INSTALL_PREFIX=$TOP/build \
 	-DAVIDEMUX_SOURCE_DIR=$TOP/  \
 	-DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
-	%{!?with_gtk:-DGTK_CHECKED=1 -DADM_UI_GTK=0} \
-	%{!?with_qt4:-DQT4_CHECKED=1 -DADM_UI_QT4=0} \
+	%{!?with_arts:-DARTS=0} \
+	%{!?with_esd:-DESD=0} \
+	%{!?with_amr:-DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0} \
+	%{!?with_gtk:-DGTK=0} \
+	%{!?with_qt4:-DQT4=0} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -217,8 +217,8 @@
 %endif
 
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_alsa.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_esd.so
+%{?with_arts:%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so}
+%{?with_esd:%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_esd.so}
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_jack.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_oss.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
@@ -368,6 +368,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2009/12/17 21:32:40  sparky
+- use gtk and qt4 bconds correctly, no more cmake magick
+- fixed other bconds
+
 Revision 1.79  2009/12/17 21:07:44  sparky
 - fixed gtk and qt4 bconds: skip autodetection
 - dropped BR: ffmpeg-devel - internal version is used
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.79&r2=1.80&f=u