Author: firewing Update of /cvs/free/rpms/avidemux/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6953/F-9 Modified Files: avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux.spec Log Message: * Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-2 - Sync libdca and i18n patches with devel avidemux-2.4-i18n.patch: Index: avidemux-2.4-i18n.patch =================================================================== RCS file: /cvs/free/rpms/avidemux/F-9/avidemux-2.4-i18n.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.4-i18n.patch 27 Sep 2008 17:11:23 -0000 1.1 +++ avidemux-2.4-i18n.patch 20 Feb 2009 05:19:37 -0000 1.2 @@ -1,7 +1,6 @@ -diff -ur avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp ---- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 -+++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 -@@ -53,7 +53,7 @@ +--- avidemux_2.4.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2008-09-23 21:09:49.000000000 -0400 ++++ avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-02-19 23:05:30.000000000 -0500 +@@ -60,7 +60,7 @@ { printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); @@ -10,9 +9,8 @@ loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); -diff -ur cmake/Ts.cmake cmake/Ts.cmake ---- cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 -+++ cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 +--- avidemux_2.4.4.orig/cmake/Ts.cmake 2007-10-14 07:58:28.000000000 -0400 ++++ avidemux_2.4.4/cmake/Ts.cmake 2009-02-19 23:04:55.000000000 -0500 @@ -63,7 +63,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) avidemux-2.4-libdca.patch: Index: avidemux-2.4-libdca.patch =================================================================== RCS file: /cvs/free/rpms/avidemux/F-9/avidemux-2.4-libdca.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.4-libdca.patch 27 Sep 2008 17:11:23 -0000 1.1 +++ avidemux-2.4-libdca.patch 20 Feb 2009 05:19:37 -0000 1.2 @@ -1,39 +1,13 @@ -diff -p -up avidemux/CMakeLists.txt.libdca avidemux/CMakeLists.txt ---- avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 -+++ avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200 -@@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN - - #libdts - if(USE_LIBDCA AND NOT USE_LATE_BINDING) -- add_libs_all_targets(dts) -+ add_libs_all_targets(dca) - endif(USE_LIBDCA AND NOT USE_LATE_BINDING) - - # Lame -diff -p -up ConfigureChecks.cmake.libdca ConfigureChecks.cmake ---- ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 -+++ ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200 -@@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm") - IF (USE_LATE_BINDING) - CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) - ELSE (USE_LATE_BINDING) -- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA) -+ ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA) - ENDIF (USE_LATE_BINDING) - - SET(CMAKE_REQUIRED_LIBRARIES) -diff -p -up configure.in.in.libdca configure.in.in ---- configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 -+++ configure.in.in 2008-07-24 15:51:57.000000000 +0200 -@@ -891,18 +891,14 @@ have_libdca=no +--- avidemux_2.4.4.orig/configure.in.in 2009-02-06 14:07:37.000000000 -0500 ++++ avidemux_2.4.4/configure.in.in 2009-02-18 23:48:22.000000000 -0500 +@@ -874,18 +874,14 @@ if test "x$with_libdca" != "xno"; then have_libdca=yes AC_CHECK_HEADERS([dts.h], , have_libdca=no) - - if test "x$have_libdca" = "xyes"; then - AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no) -- -+ + if test "x$have_libdca" = "xyes"; then if test "x$use_late_binding" = "xno"; then - AC_CHECK_LIB(dts, dts_init, , have_libdca=no) @@ -46,3 +20,14 @@ if test "x$have_libdca" = "xyes"; then AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]") +--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt 2008-10-03 07:05:09.000000000 -0400 ++++ avidemux_2.4.4/avidemux/CMakeLists.txt 2009-02-18 23:45:12.000000000 -0500 +@@ -315,7 +315,7 @@ + + #libdts + if(USE_LIBDCA AND NOT USE_LATE_BINDING) +- add_libs_all_targets(dts) ++ add_libs_all_targets(dca) + endif(USE_LIBDCA AND NOT USE_LATE_BINDING) + + # Lame Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-9/avidemux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- avidemux.spec 20 Feb 2009 04:56:42 -0000 1.4 +++ avidemux.spec 20 Feb 2009 05:19:37 -0000 1.5 @@ -2,7 +2,7 @@ Name: avidemux Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -161,6 +161,9 @@ %{_datadir}/applications/*qt*.desktop %changelog +* Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-2 +- Sync libdca and i18n patches with devel + * Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1 - Update to 2.4.4 final, update patches accordingly - Move Qt translation files to qt subpackage