packages: avidemux/avidemux.spec - fixed gtk and qt4 bconds: skip autodetec...

[sparky]

Author: sparky                       Date: Thu Dec 17 21:07:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed gtk and qt4 bconds: skip autodetection
- dropped BR: ffmpeg-devel - internal version is used
- dropped sse3 and ssse3 bcond remnants - not used

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

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.78 packages/avidemux/avidemux.spec:1.79
--- packages/avidemux/avidemux.spec:1.78	Thu Dec 17 21:39:18 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 22:07:44 2009
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 # - create aften.spec (aften.sf.net) and use it -D USE_AFTEN=1
-# - amr bcond - -D USE_AMR_NB=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
@@ -13,17 +13,12 @@
 # Conditional build:
 %bcond_without	esd	# disable EsounD sound support
 %bcond_without	arts	# without arts audio output
-%bcond_without	amr	# enable Adaptive Multi Rate (AMR) speech codec support
+%bcond_without	amr	# disable Adaptive Multi Rate (AMR) speech codec support
 %bcond_without	qt4	# build qt4 interface
 %bcond_without	gtk	# build gtk interface
-%bcond_with	ssse3	# use SSSE3 instructions
 
 %define		qt4_version	4.2
 
-%ifarch pentium4 %{x8664}
-%define		with_sse3	1
-%endif
-
 Summary:	A small audio/video editing software for Linux
 Summary(pl.UTF-8):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
@@ -51,7 +46,6 @@
 %{?with_esd:BuildRequires:	esound-devel}
 BuildRequires:	faac-devel
 BuildRequires:	faad2-devel
-BuildRequires:	ffmpeg-devel
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	gettext-devel
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 1:2.6.0}
@@ -119,6 +113,8 @@
 
 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
@@ -133,8 +129,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} \
+	%{!?with_gtk:-DGTK_CHECKED=1 -DADM_UI_GTK=0} \
+	%{!?with_qt4:-DQT4_CHECKED=1 -DADM_UI_QT4=0} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -155,8 +151,8 @@
 	-DAVIDEMUX_INSTALL_PREFIX=$TOP/build \
 	-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} \
+	%{!?with_gtk:-DGTK_CHECKED=1 -DADM_UI_GTK=0} \
+	%{!?with_qt4:-DQT4_CHECKED=1 -DADM_UI_QT4=0} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -372,6 +368,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+- dropped sse3 and ssse3 bcond remnants - not used
+
 Revision 1.78  2009/12/17 20:39:18  sparky
 - fix build without qt4: .qm translations belong to qt UI
 - BRequire gtk+2-devel only if building with gtk enabled
================================================================

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