[kdemultimedia] rebase no mplayerthumbs patch
Rex Dieter
rdieter at fedoraproject.org
Sat Aug 28 20:08:29 UTC 2010
commit eff236fc0f87128e929be5ee06ff93798f04b352
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Aug 28 15:13:19 2010 -0500
rebase no mplayerthumbs patch
kdemultimedia-4.3.75-nomplayerthumbs.patch | 16 ----------------
kdemultimedia-4.5.1-no_mplayerthumbs.patch | 12 ++++++++++++
kdemultimedia.spec | 2 +-
3 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/kdemultimedia-4.5.1-no_mplayerthumbs.patch b/kdemultimedia-4.5.1-no_mplayerthumbs.patch
new file mode 100644
index 0000000..6cd5edf
--- /dev/null
+++ b/kdemultimedia-4.5.1-no_mplayerthumbs.patch
@@ -0,0 +1,12 @@
+diff -up kdemultimedia-4.5.1/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.5.1/CMakeLists.txt
+--- kdemultimedia-4.5.1/CMakeLists.txt.nomplayerthumbs 2010-07-07 12:12:23.000000000 -0500
++++ kdemultimedia-4.5.1/CMakeLists.txt 2010-08-28 15:12:23.515676309 -0500
+@@ -42,7 +42,7 @@ configure_file (config.h.cmake ${CMAKE_C
+
+ add_subdirectory(libkcddb)
+ add_subdirectory(libkcompactdisc)
+-add_subdirectory(mplayerthumbs)
++#add_subdirectory(mplayerthumbs)
+
+ if (FFMPEG_FOUND AND SWSCALE_FOUND)
+ macro_optional_add_subdirectory(ffmpegthumbs)
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 4f14d81..bcb74e1 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -11,7 +11,7 @@ URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}%{?alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kdemultimedia-4.3.75-nomplayerthumbs.patch
+Patch1: kdemultimedia-4.5.1-no_mplayerthumbs.patch
# FIXME
Patch2: kdemultimedia-4.3.75-kscd_doc.patch
More information about the scm-commits
mailing list