2:58 p.m.
Author: rdieter
Update of /cvs/free/rpms/kmediafactory/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24698
Modified Files:
kmediafactory.spec
Added Files:
kmediafactory-0.8.1-FindFFmpeg.patch
kmediafactory-0.8.1-desktop_validate.patch
Log Message:
sync w/devel branch
kmediafactory-0.8.1-FindFFmpeg.patch:
CMakeLists.txt | 8 ++++++--
lib/CMakeLists.txt | 21 +++++++++++++++++++--
2 files changed, 25 insertions(+), 4 deletions(-)
--- NEW FILE kmediafactory-0.8.1-FindFFmpeg.patch ---
diff -up kmediafactory-0.8.1/CMakeLists.txt.FindFFmpeg kmediafactory-0.8.1/CMakeLists.txt
--- kmediafactory-0.8.1/CMakeLists.txt.FindFFmpeg 2012-11-26 08:23:48.502384898 -0600
+++ kmediafactory-0.8.1/CMakeLists.txt 2012-11-26 08:23:48.514384761 -0600
@@ -53,8 +53,12 @@ macro_log_feature(DVDAUTHOR_EXECUTABLE "
find_program(MPEG2ENC_EXECUTABLE mpeg2enc)
macro_log_feature(MPEG2ENC_EXECUTABLE "mpeg2enc" "For making mpeg
files" "http://mjpeg.sourceforge.net/" FALSE "" "NOTE: Is
required runtime")
-find_package(Ffmpeg REQUIRED)
-macro_log_feature(FFMPEG_SWSCALE_FOUND "ffmpeg libraries" "Parsing of mpeg
files" "www.ffmpeg.org/" FALSE "" "")
+find_package(FFmpeg REQUIRED)
+macro_log_feature(FFMPEG_FOUND "ffmpeg libraries" "Parsing of mpeg
files" "www.ffmpeg.org/" FALSE "" "")
+macro_log_feature(AVCODEC_FOUND "ffmpeg avcodec libraries" "Parsing of
mpeg files" "www.ffmpeg.org/" FALSE "" "")
+macro_log_feature(AVFORMAT_FOUND "ffmpeg avformat libraries" "Parsing of
mpeg files" "www.ffmpeg.org/" FALSE "" "")
+macro_log_feature(AVUTIL_FOUND "ffmpeg avutil libraries" "Parsing of mpeg
files" "www.ffmpeg.org/" FALSE "" "")
+macro_log_feature(SWSCALE_FOUND "ffmpeg swscale libraries" "Parsing of
mpeg files" "www.ffmpeg.org/" FALSE "" "")
# Optional packages
find_package(LibDvdread)
diff -up kmediafactory-0.8.1/lib/CMakeLists.txt.FindFFmpeg
kmediafactory-0.8.1/lib/CMakeLists.txt
--- kmediafactory-0.8.1/lib/CMakeLists.txt.FindFFmpeg 2011-08-01 02:47:08.000000000 -0500
+++ kmediafactory-0.8.1/lib/CMakeLists.txt 2012-11-26 08:27:03.391015691 -0600
@@ -1,6 +1,20 @@
add_subdirectory(pics)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FFMPEG_INCLUDE_DIR})
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${AVCODEC_INCLUDE_DIRS}
+ ${AVFORMAT_INCLUDE_DIRS}
+ ${AVUTIL_INCLUDE_DIRS}
+ ${SWSCALE_INCLUDE_DIRS}
+)
+
+add_definitions(
+ ${AVCODEC_DEFINITIONS}
+ ${AVFORMAT_DEFINITIONS}
+ ${AVUTIL_DEFINITIONS}
+ ${SWSCALE_DEFINITIONS}
+)
+
if(LIBDVDREAD_FOUND)
include_directories(${LIBDVDREAD_INCLUDE_DIR})
endif(LIBDVDREAD_FOUND)
@@ -35,7 +49,10 @@ set(kmf_HEADERS
)
kde4_add_library(kmf SHARED ${kmf_LIB_SRCS})
-target_link_libraries(kmf ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUTILS_LIBS}
${XINE_LIBRARY} ${FONTCONFIG_LIBRARIES} ${FFMPEG_LIBRARIES})
+target_link_libraries(kmf
+ ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUTILS_LIBS} ${XINE_LIBRARY}
${FONTCONFIG_LIBRARIES}
+ ${AVCODEC_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWSCALE_LIBRARIES}
+)
if(LIBDVDREAD_FOUND)
target_link_libraries(kmf ${LIBDVDREAD_LIBRARY})
endif(LIBDVDREAD_FOUND)
kmediafactory-0.8.1-desktop_validate.patch:
kmediafactory.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kmediafactory-0.8.1-desktop_validate.patch ---
diff -up kmediafactory-0.8.1/src/kmediafactory.desktop.desktop_validate
kmediafactory-0.8.1/src/kmediafactory.desktop
--- kmediafactory-0.8.1/src/kmediafactory.desktop.desktop_validate 2011-08-01
02:47:08.000000000 -0500
+++ kmediafactory-0.8.1/src/kmediafactory.desktop 2012-11-26 08:38:01.039007506 -0600
@@ -11,4 +11,4 @@ GenericName[fi]=DVD:n kokoaminen
Terminal=false
MimeType=application/x-kmediafactory;
X-KDE-NativeMimeType=application/x-kmediafactory;
-Categories=KDE;AudioVideo;AudioVideoEditing
+Categories=KDE;AudioVideo;AudioVideoEditing;
Index: kmediafactory.spec
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/F-18/kmediafactory.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kmediafactory.spec 24 Nov 2012 15:21:20 -0000 1.18
+++ kmediafactory.spec 26 Nov 2012 14:58:00 -0000 1.19
@@ -1,13 +1,11 @@
Name: kmediafactory
-Version: 0.8.1
-Release: 4%{?dist}
Summary: A template based DVD authoring tool
+Version: 0.8.1
+Release: 5%{?dist}
-Group: User Interface/Desktops
License: GPLv2+
URL: http://code.google.com/p/kmediafactory/
Source0:
http://kmediafactory.googlecode.com/files/kmediafactory-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# rpmfusion's mlt binary is named mlt-melt:
Patch1: kmediafactory-0.8.0-mlt-melt.patch
@@ -19,24 +17,28 @@
Patch51: kmediafactory-0.8.0-dso.patch
# fix for newer ffmpeg
Patch52: kmediafactory-0.8.1-ffmpeg.patch
+# use kdelibs' FindFFMPEG.cmake instead of bundled FindFfmpeg.cmake here
+Patch53: kmediafactory-0.8.1-FindFFmpeg.patch
+# make kmediafactory.desktop pass desktop-file-validate
+Patch54: kmediafactory-0.8.1-desktop_validate.patch
-BuildRequires: kdelibs4-devel
+BuildRequires: desktop-file-utils
BuildRequires: dvdauthor
BuildRequires: dvd-slideshow
-BuildRequires: desktop-file-utils
-BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: giflib-devel
+BuildRequires: kdelibs4-devel
BuildRequires: libdvdread-devel
BuildRequires: mlt
BuildRequires: mjpegtools
BuildRequires: pcre-devel
+## ffmpeg
+BuildRequires: pkgconfig(libavcodec) pkgconfig(libavformat) pkgconfig(libavutil)
pkgconfig(libswscale)
BuildRequires: pkgconfig(libkexiv2)
BuildRequires: zip
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
# needed for normal functionality
Requires: dvdauthor
@@ -54,17 +56,15 @@
%package libs
Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%package devel
-Summary: Development files for kmediafactory
-Group: Development/Libraries
+Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
-Development files for %{name}.
+%{summary}.
%prep
@@ -74,6 +74,8 @@
%patch50 -p1 -b .gcc47
%patch51 -p1 -b .dso
%patch52 -p1 -b .ffmpeg
+%patch53 -p1 -b .FindFFmpeg
+%patch54 -p1 -b .desktop_validate
%build
@@ -86,16 +88,8 @@
%install
-rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-# validate desktop file
-desktop-file-install --vendor="" \
- --dir=%{buildroot}%{_kde4_datadir}/applications/kde4 \
- --remove-category="Application" \
- --add-category="X-OutputGeneration" \
- %{buildroot}%{_kde4_datadir}/applications/kde4/kmediafactory.desktop
-
# locale
%find_lang kmediafactory --with-kde
%find_lang kmediafactory_kstore
@@ -108,8 +102,8 @@
cat kmediafactory*.lang > kmediafactory-all.lang
-%clean
-rm -rf %{buildroot}
+%check
+desktop-file-validate
%{buildroot}%{_kde4_datadir}/applications/kde4/kmediafactory.desktop
%post
@@ -117,19 +111,18 @@
%postun
if [ $1 -eq 0 ]; then
-update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_kde4_iconsdir}/hicolor || :
gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
fi
%posttrans
+gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
-gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
%files -f kmediafactory-all.lang
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS NEWS README TODO
%{_kde4_bindir}/kmediafactory
%{_kde4_appsdir}/kmediafactory/
@@ -149,18 +142,20 @@
%postun libs -p /sbin/ldconfig
%files libs -f libkmf.lang
-%defattr(-,root,root,-)
%{_kde4_libdir}/libkmediafactoryinterfaces.so.0*
%{_kde4_libdir}/libkmediafactorykstore.so.0*
%{_kde4_libdir}/libkmf.so.0*
%files devel
-%defattr(-,root,root,-)
%{_kde4_includedir}/kmediafactory/
%{_kde4_libdir}/lib*.so
%changelog
+* Mon Nov 26 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.1-5
+- .spec cleanup (remove deprecated stuff)
+- use kdelibs' FindFFmpeg.cmake (rpmfusion#2585)
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.1-4
- Rebuilt for FFmpeg 1.0