- fixed gtk and qt4 bconds: skip autodetection

- dropped BR: ffmpeg-devel - internal version is used
- dropped sse3 and ssse3 bcond remnants - not used

Changed files:
    avidemux.spec -> 1.79

diff --git a/avidemux.spec b/avidemux.spec
index 8fcf34456478bd6fcb52603abd2173ff63d9287b..b3f6be01213d0069630a2a4fedad2b23d881ca82 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,6 +1,6 @@
 # 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
@@ -12,17 +12,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
@@ -50,7 +45,6 @@ BuildRequires:        cmake >= 2.6.2
 %{?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}
@@ -118,6 +112,8 @@ find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -nam
 
 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
@@ -132,8 +128,8 @@ cd build
        -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
@@ -154,8 +150,8 @@ cd plugins/build
        -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