5:11 p.m.
Author: firewing
Update of /cvs/free/rpms/avidemux/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19408/F-9
Modified Files:
sources
Added Files:
avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch
avidemux-2.4.2-pulseaudio-default.patch
avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch
avidemux.spec
Log Message:
Populate F-8 and F-9
avidemux-2.4-i18n.patch:
--- NEW FILE avidemux-2.4-i18n.patch ---
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 @@
{
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 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
@@ -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/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
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.2-pulseaudio-default.patch:
--- NEW FILE avidemux-2.4.2-pulseaudio-default.patch ---
--- avidemux/prefs.in.old 2008-06-22 15:24:53.000000000 -0400
+++ avidemux/prefs.in 2008-07-19 21:08:03.000000000 -0400
@@ -55,7 +55,7 @@
#else
device.audiodevice, STRING, ALSA
#endif
-device.audio.alsa_device, STRING, "dmix"
+device.audio.alsa_device, STRING, "pulse"
device.videodevice, UINT, 0, 0, 10
# Posproc
default.postproc_type, UINT, 3, 0, 7
avidemux-2.4.3-ppc.patch:
--- NEW FILE avidemux-2.4.3-ppc.patch ---
--- ConfigureChecks.cmake (revision 4376)
+++ ConfigureChecks.cmake (working copy)
@@ -32,6 +32,9 @@
SET(ADM_CPU_X86_64 1)
ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
SET(ADM_CPU_PPC 1)
+ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+ SET(ADM_CPU_PPC 1)
+ SET(ARCH_64_BITS 1)
ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL "i586" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
ENDIF (WIN32)
avidemux-2.4.3-qt4.patch:
--- NEW FILE avidemux-2.4.3-qt4.patch ---
--- cmake/Ts.cmake.orig 2008-09-26 20:37:17.000000000 -0400
+++ cmake/Ts.cmake 2008-09-26 20:37:20.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)
--- NEW FILE avidemux.spec ---
#define svndate 20080521
Name: avidemux
Version: 2.4.3
Release: 5%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.avidemux.org/
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
Patch0: avidemux-2.4.2-pulseaudio-default.patch
Patch1: avidemux-2.4.3-qt4.patch
Patch2: avidemux-2.4-i18n.patch
#
http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f...
Patch3: avidemux-2.4-libdca.patch
# http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582
# http://avidemux.org/admForum/viewtopic.php?id=3991
Patch4: avidemux-2.4.3-ppc.patch
#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-cli = %{version}
Requires: %{name}-gui = %{version}
# Compiling
BuildRequires: cmake
BuildRequires: gettext-devel
# Libraries
BuildRequires: nasm >= 0.98.38
BuildRequires: libxml2-devel >= 2.6.8
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: js-devel
BuildRequires: libXv-devel
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
BuildRequires: esound-devel >= 0.2.0
# Video out
BuildRequires: SDL-devel >= 1.2.7
# Audio Codecs
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: faac-devel >= 1.24
BuildRequires: faad2-devel >= 2.0
BuildRequires: lame-devel >= 3.96.1
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
%description
Avidemux is a free video editor designed for simple cutting, filtering and
encoding tasks. It supports many file types, including AVI, DVD compatible
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
%package cli
Summary: CLI for %{name}
Group: Applications/Multimedia
Provides: %{name}-cli = %{version}-%{release}
%description cli
This package provides command-line interface for %{name}
%package gtk
Summary: GTK GUI for %{name}
Group: Applications/Multimedia
BuildRequires: gtk2-devel >= 2.8.0
BuildRequires: cairo-devel
# Slightly higher so it is default, but it can be avoided by installing
# avidemux-qt directly or it can be removed later once avidemux-qt is installed
Provides: %{name}-gui = %{version}-%{release}.1
%description gtk
This package provides the GTK interface for %{name}
%package qt
Summary: QT GUI for %{name}
Group: Applications/Multimedia
BuildRequires: qt4-devel
Provides: %{name}-gui = %{version}-%{release}
%description qt
This package provides the QT interface for %{name}
%prep
%setup -q -n avidemux_%{version}
%patch0 -b .pulse
%patch1 -b .qt4
%patch2 -b .i18n
%patch3 -b .libdca
%patch4 -b .ppc
%build
%cmake
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog History README TODO
%{_datadir}/%{name}/
%files cli
%defattr(-,root,root,-)
%{_bindir}/avidemux2_cli
%files gtk
%defattr(-,root,root,-)
%{_bindir}/avidemux2_gtk
%{_datadir}/applications/*gtk*.desktop
%files qt
%defattr(-,root,root,-)
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
%changelog
* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5
- Add CMake patch for PPC64
- Update patches for 2.4.3
- Remove outdated libmad patch (Nov. 2007)
* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4
- Add another patch to fix ppc64 build (pointer type), first
patch was for libmad
* Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3
- Add patch to fix ppc64 build
* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-2
- retag
* 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
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.2-2
- rebuild
* Sat Jul 19 2008 Thorsten Leemhuis <s.adam at diffingo.com> - 2.4.2-1
- Update to 2.4.2
* Wed May 21 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-3.20080521svn
- Disable --new-faad
- 20080521 subversion snapshot
* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-2
- Disable %%{?_smp_mflags}
* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-1
- Update to 2.4.1
- Don't list the bin files twice, revisited
- Default to GTK frontend
* Wed Feb 20 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-6.20080126svn
- Make pulseaudio default for sound out
- Don't list the bin files twice
- Don't build with arts support
* Fri Feb 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-5.20080126svn
- Don't list the .desktop files twice (bz#1870)
- Oops, we should have %%{svndate}svn in release tag!
* Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-4
- F-8/F-7 x86_64 does seem to need --with-newfaad
* Fri Feb 1 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-3
- Update to version 2.4 (20080126svn) and include fixes from devel branch
* Mon Jan 14 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-2
- Fix many copy/paste errors and desktop file's Exec field
* Sun Jan 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-1
- Update to 2.4 final
- Split up desktop files and make them pass desktop-file-validate
- Add structure to split into gtk and qt pacakges
- Disable qt4 for now, doesn't compile
* Sun Oct 7 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info>3- 2.3.0-4.3
- move js-include to a place where it is honored
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.2
- Fix macro problem
- Fix changelog date
- Rebuild with faad, but don't pass --newfaad
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.1
- Rebuild with no faad
* Sat Oct 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4
- Rebuild for ffmpeg dependency problems
- Update License: tag per Fedora guidelines
* Sat Jan 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-3
- more features with new BR's: x264-devel libXv-devel
- make a note regarding the libdca-devel problem
- remove the "0:" from the versioned BR's
* Thu Jan 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-2
- don't use smp_mflags during make for now
* Sat Dec 23 2006 kwizart < kwizart at gmail.com > - 2.3.0-1
- Update to 2.3.0 Final
- Use find_lang
* Mon Apr 03 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.2-1
- Update to 2.1.2
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Jan 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.0-0.lvn.1
- Update to 2.1.0
- Drop epoch
- gtk 2.6 now, so drop FC3 support
* Sat Aug 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.42-0.lvn.3
- Remove bogus BR ffmpeg-devel (#555)
* Thu Jul 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.42-0.lvn.2
- Add missing BR desktop-file-utils (thanks to ixs)
* Thu Jul 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.42-0.lvn.1
- Update to 2.0.42
* Sat Jan 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.36-0.lvn.1
- Update to 2.0.34
- Rename package to avidemux -- no need for avidemux2 afaics
* Sun Nov 21 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.34-0.lvn.1.test1
- Update to 2.0.34-test1
- BR gettext, libtool
* Tue Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> -
0:2.0.30-0.lvn.1
- Initial RPM release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:48:14 -0000 1.1
+++ sources 27 Sep 2008 17:11:23 -0000 1.2
@@ -0,0 +1 @@
+ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz