commit 660a23fc4371e4f95dce28e559faa445c69cba77
Author: Andrzej Zawadzki <[email protected]>
Date: Wed Mar 30 23:11:01 2016 +0200
- arekm suggestion: add bcond, nice?
- forgotten patch - thanks baggins
cmake-duplicate-doc.patch | 9 +++++++++
k3b.spec | 10 ++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/k3b.spec b/k3b.spec
index 171378c..7a0d7e9 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -6,6 +6,8 @@
# c) kde4-konqueror-4.4.2-1.i686
# d) kde4-konqueror-4.4.1-1.i686
+%bcond_with ffmpeg
+
%define qtver 4.6.3
%define kdever 4.4.5
@@ -34,7 +36,7 @@ BuildRequires: QtWebKit-devel >= %{qtver}
BuildRequires: automoc4 >= 0.9.88
BuildRequires: cmake >= 2.8.0
BuildRequires: docbook-dtd42-xml
-BuildRequires: ffmpeg-devel
+%{?with_ffmpeg:BuildRequires: ffmpeg-devel}
BuildRequires: flac-c++-devel
BuildRequires: kde4-kdebase-workspace-devel >= %{kdever}
BuildRequires: kde4-kdelibs-devel >= %{kdever}
@@ -146,7 +148,7 @@ Pliki nagłówkowe biblioteki libk3bcore.
install -d build
cd build
%cmake \
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=no \
+ %{!?with_ffmpeg:-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=no} \
-DK3B_ENABLE_HAL_SUPPORT=no \
-LCMS_DIR=%{_libdir} \
../
@@ -186,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/kde4/k3boggvorbisencoder.so
%attr(755,root,root) %{_libdir}/kde4/k3bsoxencoder.so
%attr(755,root,root) %{_libdir}/kde4/k3bwavedecoder.so
-#%attr(755,root,root) %{_libdir}/kde4/k3bffmpegdecoder.so
+%{?with_ffmpeg:%attr(755,root,root) %{_libdir}/kde4/k3bffmpegdecoder.so}
%attr(755,root,root) %{_libdir}/kde4/k3bmpcdecoder.so
%attr(755,root,root) %{_libdir}/kde4/kcm_k3bexternalencoder.so
%attr(755,root,root) %{_libdir}/kde4/kcm_k3blameencoder.so
@@ -229,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kde4/services/k3bsetup.desktop
%{_datadir}/kde4/services/k3bsoxencoder.desktop
%{_datadir}/kde4/services/k3bwavedecoder.desktop
-#%{_datadir}/kde4/services/k3bffmpegdecoder.desktop
+%{?with_ffmpeg:%{_datadir}/kde4/services/k3bffmpegdecoder.desktop}
%{_datadir}/kde4/services/kcm_k3bexternalencoder.desktop
%{_datadir}/kde4/services/kcm_k3blameencoder.desktop
%{_datadir}/kde4/services/kcm_k3boggvorbisencoder.desktop
diff --git a/cmake-duplicate-doc.patch b/cmake-duplicate-doc.patch
new file mode 100644
index 0000000..89e416d
--- /dev/null
+++ b/cmake-duplicate-doc.patch
@@ -0,0 +1,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,3 @@ macro_display_feature_log()
+
+ include(MacroOptionalAddSubdirectory)
+ macro_optional_add_subdirectory( po )
+-
+-include(MacroOptionalAddSubdirectory)
+-macro_optional_add_subdirectory( doc )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/k3b.git/commitdiff/660a23fc4371e4f95dce28e559faa445c69cba77
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
