Author: firewing Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20174 Modified Files: avidemux.spec sources Added Files: avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux-2.4.1-qt4.patch avidemux-2.4.3-lrelease.patch Removed Files: avidemux-2.4.2-x264-2pass.patch Log Message: Update to 2.4.3 avidemux-2.4-i18n.patch: --- NEW FILE avidemux-2.4-i18n.patch --- diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp --- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 +++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 @@ -53,7 +53,7 @@ { printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); - QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; + QString appdir = "/usr/share/avidemux/i18n/"; loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake --- avidemux_2.4.orig/cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 +++ avidemux_2.4/cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 @@ -63,7 +63,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) @@ -94,7 +94,7 @@ SET(qm_files ${qm_files} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) avidemux-2.4-libdca.patch: --- NEW FILE avidemux-2.4-libdca.patch --- diff -p -up avidemux_2.4.2/avidemux/CMakeLists.txt.libdca avidemux_2.4.2/avidemux/CMakeLists.txt --- avidemux_2.4.2/avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 +++ avidemux_2.4.2/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 avidemux_2.4.2/ConfigureChecks.cmake.libdca avidemux_2.4.2/ConfigureChecks.cmake --- avidemux_2.4.2/ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 +++ avidemux_2.4.2/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 avidemux_2.4.2/configure.in.in.libdca avidemux_2.4.2/configure.in.in --- avidemux_2.4.2/configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 +++ avidemux_2.4.2/configure.in.in 2008-07-24 15:51:57.000000000 +0200 @@ -891,18 +891,14 @@ have_libdca=no 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) + AC_CHECK_LIB(dca, dca_init, , have_libdca=no) fi else AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is) fi - fi if test "x$have_libdca" = "xyes"; then AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]") avidemux-2.4.1-qt4.patch: --- NEW FILE avidemux-2.4.1-qt4.patch --- diff -p -up avidemux_2.4.1/configure.in.in~ avidemux_2.4.1/configure.in.in --- avidemux_2.4.1/configure.in.in~ 2008-02-13 20:04:21.000000000 +0100 +++ avidemux_2.4.1/configure.in.in 2008-02-17 21:43:38.000000000 +0100 @@ -195,7 +195,6 @@ adm_qt4_enabled=yes echo " ------------------- Probing for QT 4.x ------------------" QTDIR=xxx -QTPOSTFIX="-qt4" QTEXTRAINC="/usr/include/qt4" QTEXTRALIB="/usr/lib/qt4" avidemux-2.4.3-lrelease.patch: --- NEW FILE avidemux-2.4.3-lrelease.patch --- --- cmake/Ts.cmake.orig 2008-08-16 11:42:53.000000000 -0400 +++ cmake/Ts.cmake 2008-08-16 11:42:59.000000000 -0400 @@ -14,7 +14,7 @@ MACRO(FIND_LRELEASE) IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND) - FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS + FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin) Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avidemux.spec 12 Aug 2008 04:19:31 -0000 1.2 +++ avidemux.spec 16 Aug 2008 16:50:48 -0000 1.3 @@ -3,8 +3,8 @@ #define svndate 20080521 Name: avidemux -Version: 2.4.2 -Release: 3%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: Graphical video editing tool Group: Applications/Multimedia @@ -14,17 +14,20 @@ Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop Patch0: avidemux-2.4.2-pulseaudio-default.patch +Patch1: avidemux-2.4.1-qt4.patch +Patch2: avidemux-2.4-i18n.patch +Patch3: avidemux-2.4-libdca.patch +Patch4: avidemux-2.4.3-lrelease.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view -Patch1: avidemux-2.4.2-x264-2pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# GTK interface is what people are used to, let's use that be default. -Requires: %{name}-gtk +Requires: %{name}-gui # Compiling -BuildRequires: libtool >= 1.5.6 +BuildRequires: cmake BuildRequires: gettext-devel -BuildRequires: autoconf +#BuildRequires: libtool >= 1.5.6 +#BuildRequires: autoconf # Libraries BuildRequires: nasm >= 0.98.38 @@ -36,6 +39,8 @@ BuildRequires: libXmu-devel # Required by gtk: libXi-devel, libXext-devel, libX11-devel # Required by qt: libXt-devel, libXext-devel, libX11-devel +BuildRequires: libsamplerate-devel +BuildRequires: jack-audio-connection-kit-devel # Sound out BuildRequires: alsa-lib-devel >= 1.0.3 @@ -49,18 +54,23 @@ BuildRequires: faac-devel >= 1.24 BuildRequires: faad2-devel >= 2.0 BuildRequires: lame-devel >= 3.96.1 -# BuildRequires: libdca-devel -# needs libdts/dts_internal.h; but that's not shipped by libdca-devel because -# it's an internal lib. Someone needs to report that upstream to get fixed BuildRequires: libmad-devel >= 0.15.1 BuildRequires: libogg-devel >= 1.1 BuildRequires: libvorbis-devel >= 1.0.1 +# needs libdts/dts_internal.h; but that's not shipped by libdca-devel because +# it's an internal lib. Someone needs to report that upstream to get fixed +# ** this is fixed by patch3 +BuildRequires: libdca-devel + + # Video Codecs BuildRequires: xvidcore-devel >= 1.0.2 BuildRequires: x264-devel BuildRequires: ffmpeg-devel +# FIXME: aften not packaged, add BR when it is + # Finally... BuildRequires: desktop-file-utils @@ -98,26 +108,14 @@ pushd avidemux %patch0 -b .pulse popd -%patch1 -p1 -b .x264_2pass +%patch1 -p1 -b .qt4 +%patch2 -p1 -b .i18n +%patch3 -p1 -b .libdca +%patch4 -b .lrelease %build -make -f Makefile.dist -# doesn't seem to fix ppc :/ -# edit: maybe it does? let's find out! -#--with-newfaad \ -%configure \ - --with-jsapi-include=%{_includedir} \ - --with-qt-include=%{_includedir} \ - --with-qt-lib=%{_libdir}/qt4 \ - --with-qt-dir=%{_libdir}/qt4 \ -%ifarch ppc ppc64 - --enable-altivec \ - --with-newfaad \ -%endif - -# Weird... %%{?_smp_mflags} works locally, but not on the buildsys? -make - +%cmake +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -145,6 +143,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog History README TODO %{_bindir}/avidemux2_cli +%{_datadir}/%{name}/ %if %{with_gtk} %files gtk @@ -161,6 +160,9 @@ %endif %changelog +* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-1 +- Update to 2.4.3 + * Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.2-3 - ppc64 uint_32 fun Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 16:47:38 -0000 1.2 +++ sources 16 Aug 2008 16:50:48 -0000 1.3 @@ -1 +1 @@ -6c86fcfa491491b83e1291112fe3a3be avidemux_2.4.2.tar.gz +ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz --- avidemux-2.4.2-x264-2pass.patch DELETED ---