Author: sergiomb Update of /cvs/free/rpms/k9copy/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5968 Modified Files: .cvsignore k9copy-2.3.8-mimetype.patch k9copy.spec sources Added Files: k9copy-mimetype.patch unbundled_dvdread_dvdnav.patch Log Message: * Thu May 28 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 3.0.3-1 - Update to k9copy-3.0.3 . - New upstream URL http://k9copy-reloaded.sourceforge.net/ . - Unbundle libdvdread and libdvdnav . - Clean up the spec file and trailing withspaces . k9copy-mimetype.patch: k9copy_assistant.desktop | 3 +-- k9copy_assistant_open.desktop | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) --- NEW FILE k9copy-mimetype.patch --- --- k9copy.orig/k9copy_assistant.desktop 2014-09-29 16:00:12.000000000 +0100 +++ k9copy/k9copy_assistant.desktop 2015-05-28 20:08:49.318602109 +0100 @@ -14,9 +14,8 @@ GenericName[fr]=Backup de DVD Video GenericName[tr]=DVD Vidyo Yedekleme Aracı GenericName[ru]=КПпОрПваМОе с вОЎеП-DVD GenericName[uk]=КПпіюваММя віЎеП-DVD -MimeTypes= Terminal=false Icon=k9copy X-DocPath=k9copy/index.html Categories=Qt;KDE;AudioVideo;DiscBurning; -X-KDE-StartupNotify=true \ No newline at end of file +X-KDE-StartupNotify=true --- k9copy.orig/k9copy_assistant_open.desktop 2014-09-29 16:00:12.000000000 +0100 +++ k9copy/k9copy_assistant_open.desktop 2015-05-28 20:06:11.140619453 +0100 @@ -11,4 +11,4 @@ NAme[uk]=КПпіюватО за ЎПпР[Desktop Entry] X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]] Type=Service -Actions=open; \ No newline at end of file +Actions=open; unbundled_dvdread_dvdnav.patch: CMakeLists.txt | 28 +++++++++---------- cmake/FindAvformat.cmake | 68 ++++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 47 deletions(-) --- NEW FILE unbundled_dvdread_dvdnav.patch --- --- k9copy/CMakeLists.txt.orig 2014-10-16 12:58:20.000000000 +0100 +++ k9copy/CMakeLists.txt 2015-05-28 19:42:03.942426473 +0100 @@ -58,11 +58,11 @@ INCLUDE(CMakeDetermineSystem) INCLUDE(CheckIncludeFiles) INCLUDE(FindLibMpeg2) INCLUDE(FindXine) -#INCLUDE(FindAvcodec) +INCLUDE(FindAvcodec) INCLUDE(FindAvformat) #INCLUDE(FindAvutil) INCLUDE(FindFFmpegScale) -#INCLUDE(FindLibDvdread) +INCLUDE(FindLibDvdread) # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> ) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) # inttypes.h @@ -102,17 +102,17 @@ ELSE (LIBDL_LIBRARY) FIND_LIBRARY(LIBDL_LIBRARY NAMES "c" PATHS ) MESSAGE(STATUS "Found library libc: ${LIBDL_LIBRARY}") ENDIF (LIBDL_LIBRARY) -#FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread") +FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread") -#FINDAVFORMAT("avformat") -#FINDAVCODEC("avcodec") +FINDAVFORMAT("avformat") +FINDAVCODEC("avcodec") #FINDAVUTIL("avutil") add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS) -add_subdirectory( src/libdvdnav-NOW) #from dvdnav -add_subdirectory( src/libdvdnav-NOW/dvdnav) -add_subdirectory( src/libdvdnav-NOW/vm) +#add_subdirectory( src/libdvdnav-NOW) #from dvdnav +#add_subdirectory( src/libdvdnav-NOW/dvdnav) +#add_subdirectory( src/libdvdnav-NOW/vm) add_subdirectory( src/core ) add_subdirectory( src/mpeg2) add_subdirectory(src/vamps) @@ -127,7 +127,7 @@ add_subdirectory(po) add_subdirectory(doc) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdnav-NOW #from dvdnav + #${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdnav-NOW #from dvdnav ${CMAKE_CURRENT_SOURCE_DIR}/src/devices ${CMAKE_CURRENT_SOURCE_DIR}/src/core ${CMAKE_CURRENT_SOURCE_DIR}/src/vamps @@ -139,10 +139,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src/import ${CMAKE_CURRENT_SOURCE_DIR}/src/player ${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles - ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdread-NOW #from dvdread +# ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdread-NOW #from dvdread ${CMAKE_CURRENT_SOURCE_DIR}/src/batch ${KDE4_INCLUDES} ${QT_INCLUDES} -#${LIBDVDREAD_INCLUDE_DIR}/dvdread +${LIBDVDREAD_INCLUDE_DIR}/dvdread ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} @@ -490,9 +490,9 @@ set (k9xineplayer_SRCS ) -add_library(dvdread STATIC ${dvdread_SRCS}) -add_library(dvdnav STATIC ${libdvdnav_SRCS}) -target_link_libraries(dvdnav dvdread) +#add_library(dvdread STATIC ${dvdread_SRCS}) +#add_library(dvdnav STATIC ${libdvdnav_SRCS}) +#target_link_libraries(dvdnav dvdread) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") if(QT5_BUILD) message("Qt5 Version") --- k9copy/cmake/FindAvformat.cmake.orig 2014-09-29 16:00:12.000000000 +0100 +++ k9copy/cmake/FindAvformat.cmake 2015-05-28 19:42:03.942426473 +0100 @@ -1,33 +1,35 @@ -# - Try to find LibAvformat -# Once done this will define -# LIBAVFORMAT_FOUND - System has LibAvformat -# LIBAVFORMAT_INCLUDE_DIRS - The LibAvformat include directories -# LIBAVFORMAT_LIBRARIES - The libraries needed to use LibAvformat -# LIBAVFORMAT_DEFINITIONS - Compiler switches required for using LibAvformat - -#find_package(PkgConfig) -#pkg_check_modules(PC_LIBAVFORMAT QUIET libAvFormat) -#set(LIBAVFORMAT_DEFINITIONS ${PC_LIBAVFORMAT_CFLAGS_OTHER}) - -#find_path(LIBAVFORMAT_INCLUDE_DIR ffmpeg/libAvformat/avformat.h -# HINTS ${PC_LIBAVFORMAT_INCLUDEDIR} ${PC_LIBAVFORMAT_INCLUDE_DIRS} -# PATH_SUFFIXES ffmpeg ) - -#find_library(LIBAVFORMAT_LIBRARY NAMES libavformat libAvFormat LibAvformat -# HINTS ${PC_LIBAVFORMAT_LIBDIR} ${PC_LIBAVFORMAT_LIBRARY_DIRS} ) - -#set(LIBAVFORMAT_LIBRARIES ${LIBAVFORMAT_LIBRARY} ) -#set(LIBAVFORMAT_INCLUDE_DIRS ${LIBAVFORMAT_INCLUDE_DIR} ) - -#include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LIBAVFORMAT_FOUND to TRUE -# if all listed variables are TRUE -#find_package_handle_standard_args(LibAvformat DEFAULT_MSG -# LIBAVFORMAT_LIBRARY LIBAVFORMAT_INCLUDE_DIR) - -#mark_as_advanced(LIBAVFORMAT_INCLUDE_DIR LIBAVFORMAT_LIBRARY ) - - -INCLUDE(FindPkgConfig) -PKG_SEARCH_MODULE(LIBAVFORMAT REQUIRED libavformat) -INCLUDE_DIRECTORIES(${LIBAVFORMAT_INCLUDE_DIRS}) +MACRO (FINDAVFORMAT _lib) + +FIND_PATH(AVFORMAT_INCLUDE_DIR_FF "ffmpeg/avformat.h" PATHS) +IF (AVFORMAT_INCLUDE_DIR_FF) + SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg") +ELSE (AVFORMAT_INCLUDE_DIR_FF) + FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS) + IF (AVFORMAT_INCLUDE_DIR_LAVC) + SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat") + ELSE (AVFORMAT_INCLUDE_DIR_LAVC) + FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS) + IF (AVFORMAT_INCLUDE_DIR_FF_LAVF) + SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat") + ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF) + ENDIF (AVFORMAT_INCLUDE_DIR_LAVC) +ENDIF (AVFORMAT_INCLUDE_DIR_FF) + + + +FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS ) + +IF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY) + SET(INC_FOUND TRUE) +ELSE (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY) + SET(INC_FOUND FALSE) +ENDIF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY) + + +IF (INC_FOUND) + MESSAGE(STATUS "Found include avformat.h: ${AVFORMAT_INCLUDE_DIR}") + MESSAGE(STATUS "Found library ${_lib}: ${AVFORMAT_LIBRARY}") +ELSE (INC_FOUND) + MESSAGE(FATAL_ERROR "Could not find ${_lib}") +ENDIF (INC_FOUND) +ENDMACRO (FINDAVFORMAT _lib ) \ No newline at end of file Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/k9copy/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 10 Feb 2012 15:14:05 -0000 1.13 +++ .cvsignore 28 May 2015 23:02:28 -0000 1.14 @@ -1 +1 @@ -k9copy-2.3.8-Source.tar.gz +k9copy-3.0.3.tar.gz k9copy-2.3.8-mimetype.patch: k9copy_assistant.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: k9copy-2.3.8-mimetype.patch =================================================================== RCS file: /cvs/free/rpms/k9copy/devel/k9copy-2.3.8-mimetype.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- k9copy-2.3.8-mimetype.patch 10 Feb 2012 15:14:05 -0000 1.1 +++ k9copy-2.3.8-mimetype.patch 28 May 2015 23:02:28 -0000 1.2 @@ -14,19 +14,3 @@ -X-KDE-StartupNotify=true \ No newline at end of file +X-KDE-StartupNotify=true -diff -up k9copy-2.3.8-Source/k9copy.desktop.mimetype k9copy-2.3.8-Source/k9copy.desktop ---- k9copy-2.3.8-Source/k9copy.desktop.mimetype 2011-12-09 15:08:41.000000000 -0600 -+++ k9copy-2.3.8-Source/k9copy.desktop 2012-02-10 09:01:02.330098511 -0600 -@@ -14,9 +14,9 @@ GenericName[fr]=Backup de DVD Video - GenericName[tr]=DVD Vidyo Yedekleme Aracı - GenericName[ru]=КПпОрПваМОе с вОЎеП-DVD - GenericName[uk]=КПпіюваММя віЎеП-DVD --MimeTypes= -+MimeType= - Terminal=false - Icon=k9copy - X-DocPath=k9copy/index.html - Categories=Qt;KDE;AudioVideo;DiscBurning; --X-KDE-StartupNotify=true -\ No newline at end of file -+X-KDE-StartupNotify=true Index: k9copy.spec =================================================================== RCS file: /cvs/free/rpms/k9copy/devel/k9copy.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- k9copy.spec 31 Aug 2014 03:49:14 -0000 1.28 +++ k9copy.spec 28 May 2015 23:02:28 -0000 1.29 @@ -1,28 +1,27 @@ Name: k9copy -Version: 2.3.8 -Release: 7%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Video DVD backup and creation program Group: Applications/Multimedia License: GPLv2+ -URL: http://k9copy.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Patch01: FindAv-compat.patch -## upstreamable patches -# https://sourceforge.net/tracker/?func=detail&aid=3016058&group_id... -Patch52: k9copy-2.3.8-mimetype.patch +URL: http://k9copy-reloaded.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}-reloaded/%{name}-%{version}.tar.gz + +#Patch01: FindAv-compat.patch +Patch02: unbundled_dvdread_dvdnav.patch +# upstreamable patches +Patch52: k9copy-mimetype.patch BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: ffmpeg-compat-devel +BuildRequires: ffmpeg-devel BuildRequires: gettext %if 0%{?fedora} && 0%{?fedora} < 16 BuildRequires: hal-devel %endif BuildRequires: kdelibs4-devel -BuildRequires: libdvdread-devel +BuildRequires: libdvdread-devel libdvdnav-devel BuildRequires: libmpeg2-devel BuildRequires: pkgconfig BuildRequires: xine-lib-devel @@ -46,23 +45,26 @@ %prep -%setup -q -n %{name}-%{version}-Source +%setup -q -n %{name} + +%{__rm} -rf src/libdvdnav-NOW/ +%{__rm} -rf src/libdvdread-NOW/ +#patch1 -p0 -b .ffmpeg-compat +%patch2 -p1 -b .unbundle -%patch1 -p0 -b .ffmpeg-compat %patch52 -p1 -b .mimetype %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} @@ -74,10 +76,6 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop -%clean -rm -rf %{buildroot} - - %post touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: @@ -92,7 +90,6 @@ %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING %{_kde4_bindir}/k9copy %{_kde4_bindir}/k9play @@ -105,6 +102,12 @@ %changelog +* Thu May 28 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 3.0.3-1 +- Update to k9copy-3.0.3 . +- New upstream URL http://k9copy-reloaded.sourceforge.net/ . +- Unbundle libdvdread and libdvdnav . +- Clean up the spec file and trailing withspaces . + * Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 2.3.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -114,7 +117,7 @@ * Mon May 27 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.8-5 - Rebuilt for x264/FFmpeg -* Sat Apr 27 2013 Sérgio Basto <sergio(a)serjux.com&gt; +* Sat Apr 27 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 2.3.8-4 - Switch to ffmpeg-compat. * Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.8-3 Index: sources =================================================================== RCS file: /cvs/free/rpms/k9copy/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 10 Feb 2012 15:14:05 -0000 1.13 +++ sources 28 May 2015 23:02:28 -0000 1.14 @@ -1 +1 @@ -584f6cc50f28befbeb0d5c1ec9476456 k9copy-2.3.8-Source.tar.gz +53158282e23a4aa4fb8f4336f1424521 k9copy-3.0.3.tar.gz