8 p.m.
Author: rdieter
Update of /cvs/free/rpms/k9copy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26521
Modified Files:
k9copy.spec
Added Files:
k9copy-2.0.2-ffmpeg.patch
Log Message:
* Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-2
- ffmpeg patch
k9copy-2.0.2-ffmpeg.patch:
--- NEW FILE k9copy-2.0.2-ffmpeg.patch ---
diff -up k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg k9copy-2.0.2-Source/CMakeLists.txt
--- k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg 2008-07-05 01:08:53.000000000 -0500
+++ k9copy-2.0.2-Source/CMakeLists.txt 2008-09-16 14:50:22.000000000 -0500
@@ -94,7 +94,7 @@ CHECK_INCLUDE_FILES(sys/types.h HAVE
CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) # simapi.h
CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) # simapi.h
-FINDFFMPEGSCALE("ffmpeg/swscale.h" "swscale")
+FINDFFMPEGSCALE("libswscale/swscale.h" "swscale")
CONFIGURE_FILE(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -107,7 +107,7 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_CU
MESSAGE(STATUS "Checking dependencies" )
FINDXINE("xine.h" "xine")
FINDDVDREAD("dvdread/ifo_types.h" "dvdread")
-FINDFFMPEG("ffmpeg/avcodec.h" "avcodec")
+FINDFFMPEG("libavcodec/avcodec.h" "avcodec")
add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
@@ -132,6 +132,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src/main
${CMAKE_CURRENT_SOURCE_DIR}/src/mplayer
${CMAKE_CURRENT_SOURCE_DIR}/src/import
+ ${FFMPEG_INCLUDE_DIR} ${FFMPEGSCALE_INCLUDE_DIR}
${KDE4_INCLUDES} ${QT_INCLUDES}
)
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg
k9copy-2.0.2-Source/src/import/k9avidecode.cpp
--- k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg 2008-09-16 14:46:48.000000000
-0500
+++ k9copy-2.0.2-Source/src/import/k9avidecode.cpp 2008-09-16 14:46:48.000000000 -0500
@@ -11,14 +11,14 @@
//
#include "k9avidecode.h"
#include <cstdlib>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include <qimage.h>
#include <dlfcn.h>
#include <klocale.h>
#include "ac.h"
#ifdef HAVE_SWSCALE
-#include "ffmpeg/swscale.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg
k9copy-2.0.2-Source/src/import/k9avidecode.h
--- k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg 2008-07-05 01:08:53.000000000
-0500
+++ k9copy-2.0.2-Source/src/import/k9avidecode.h 2008-09-16 14:46:48.000000000 -0500
@@ -14,12 +14,12 @@
#include "k9common.h"
#include <qobject.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
#include <qimage.h>
#include <cstdlib>
#include <QObject>
#ifdef HAVE_SWSCALE
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
#endif
/**
@author Jean-Michel PETIT <k9copy(a)free.fr>
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/k9copy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k9copy.spec 15 Sep 2008 16:00:53 -0000 1.2
+++ k9copy.spec 16 Sep 2008 20:00:06 -0000 1.3
@@ -11,6 +11,8 @@
Patch1: k9copy-2.0.0-libdvdread_so4.patch
Patch2: k9copy-2.0.0-gcc43.patch
+# FIXME: use pkgconfig
+Patch3: k9copy-2.0.2-ffmpeg.patch
# FIXME: build fails here
ExcludeArch: ppc ppc64
@@ -23,8 +25,8 @@
BuildRequires: libdvdread-devel
BuildRequires: xine-lib-devel
-Requires(post): coreutils
-Requires(postun): coreutils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
Requires: dvd+rw-tools
Requires: dvdauthor
@@ -49,15 +51,19 @@
%patch1 -p1 -b .libdvdread_so4
%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .ffmpeg
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+ -DFFMPEG_INCLUDE_DIR=%{_includedir}/ffmpeg \
+ -DFFMPEGSCALE_INCLUDE_DIR=%{_includedir}/ffmpeg \
+ ..
popd
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
%install
@@ -72,13 +78,10 @@
%post
-touch --no-create %{_datadir}/icons/hicolor
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
%files -f %{name}.lang
@@ -89,13 +92,13 @@
%{_kde4_bindir}/k9xineplayer
%{_kde4_appsdir}/k9copy/
%{_kde4_datadir}/applications/kde4/k9copy.desktop
-%{_kde4_datadir}/icons/hicolor/*/*/*
%{_kde4_datadir}/kde4/services/*
+%{_kde4_iconsdir}/hicolor/*/*/*
%changelog
-* Mon Sep 15 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-2
-- respin for rpmfusion
+* Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-2
+- ffmpeg patch
* Mon Jun 16 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-1
- k9copy-2.0.2