12:42 a.m.
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23575
Modified Files:
avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch
avidemux-2.4.2-pulseaudio-default.patch avidemux-gtk.desktop
avidemux-qt.desktop avidemux.spec
Added Files:
avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch
Removed Files:
avidemux-2.4-ppc-libmad.patch avidemux-2.4.1-qt4.patch
avidemux-2.4.3-lrelease.patch avidemux-2.4.3-ppc-ptr.patch
Log Message:
Add new ppc patch from avidemux forums, remove outdated libmad patch
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)
avidemux-2.4-i18n.patch:
Index: avidemux-2.4-i18n.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/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 16 Aug 2008 16:50:48 -0000 1.1
+++ avidemux-2.4-i18n.patch 27 Sep 2008 00:42:06 -0000 1.2
@@ -1,6 +1,6 @@
-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
+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());
@@ -10,9 +10,9 @@
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
+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})
avidemux-2.4-libdca.patch:
Index: avidemux-2.4-libdca.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/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 16 Aug 2008 16:50:48 -0000 1.1
+++ avidemux-2.4-libdca.patch 27 Sep 2008 00:42:06 -0000 1.2
@@ -1,6 +1,6 @@
-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
+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
@@ -10,9 +10,9 @@
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
+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)
@@ -22,9 +22,9 @@
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
+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
avidemux-2.4.2-pulseaudio-default.patch:
Index: avidemux-2.4.2-pulseaudio-default.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4.2-pulseaudio-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.4.2-pulseaudio-default.patch 3 Aug 2008 16:47:38 -0000 1.1
+++ avidemux-2.4.2-pulseaudio-default.patch 27 Sep 2008 00:42:06 -0000 1.2
@@ -1,5 +1,5 @@
---- prefs.in.old 2008-06-22 15:24:53.000000000 -0400
-+++ prefs.in 2008-07-19 21:08:03.000000000 -0400
+--- 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
Index: avidemux-gtk.desktop
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-gtk.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-gtk.desktop 3 Aug 2008 16:47:38 -0000 1.1
+++ avidemux-gtk.desktop 27 Sep 2008 00:42:06 -0000 1.2
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Avidemux Video Editor (GTK)
-Comment=Graphical video editing tool
+Comment=Graphical video editing tool - GTK interface
Icon=gnome-multimedia
Exec=avidemux2_gtk
Terminal=false
Index: avidemux-qt.desktop
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-qt.desktop 3 Aug 2008 16:47:38 -0000 1.1
+++ avidemux-qt.desktop 27 Sep 2008 00:42:06 -0000 1.2
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=Avidemux Video Editor (QT)
-Comment=Graphical video editing tool
+Name=Avidemux Video Editor (Qt)
+Comment=Graphical video editing tool - Qt interface
Icon=gnome-multimedia
Exec=avidemux2_qt4
Terminal=false
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avidemux.spec 18 Sep 2008 21:00:01 -0000 1.6
+++ avidemux.spec 27 Sep 2008 00:42:06 -0000 1.7
@@ -1,11 +1,9 @@
-%define with_gtk 1
-%define with_qt 1
#define svndate 20080521
Name: avidemux
Version: 2.4.3
-Release: 4%{?dist}
-Summary: Graphical video editing tool
+Release: 5%{?dist}
+Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
License: GPLv2+
@@ -14,22 +12,22 @@
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
Patch0: avidemux-2.4.2-pulseaudio-default.patch
-Patch1: avidemux-2.4.1-qt4.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
-Patch4: avidemux-2.4.3-lrelease.patch
-Patch5: avidemux-2.4-ppc-libmad.patch
-Patch6: avidemux-2.4.3-ppc-ptr.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}-gui
+Requires: %{name}-cli = %{version}
+Requires: %{name}-gui = %{version}
# Compiling
BuildRequires: cmake
BuildRequires: gettext-devel
-#BuildRequires: libtool >= 1.5.6
-#BuildRequires: autoconf
# Libraries
BuildRequires: nasm >= 0.98.38
@@ -82,19 +80,26 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
-%if %{with_gtk}
+%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}
-%endif
-%if %{with_qt}
%package qt
Summary: QT GUI for %{name}
Group: Applications/Multimedia
@@ -103,21 +108,14 @@
%description qt
This package provides the QT interface for %{name}
-%endif
%prep
%setup -q -n avidemux_%{version}
-pushd avidemux
%patch0 -b .pulse
-popd
-%patch1 -p1 -b .qt4
-%patch2 -p1 -b .i18n
-%patch3 -p1 -b .libdca
-%patch4 -b .lrelease
-%patch5 -b .ppc_libmad
-pushd avidemux/ADM_codecs/
-%patch6 -b .ppc_ptr
-popd
+%patch1 -b .qt4
+%patch2 -b .i18n
+%patch3 -b .libdca
+%patch4 -b .ppc
%build
%cmake
@@ -127,17 +125,13 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-%if %{with_gtk}
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-%endif
-%if %{with_qt}
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
-%endif
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}
@@ -148,24 +142,28 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog History README TODO
-%{_bindir}/avidemux2_cli
%{_datadir}/%{name}/
-%if %{with_gtk}
+%files cli
+%defattr(-,root,root,-)
+%{_bindir}/avidemux2_cli
+
%files gtk
%defattr(-,root,root,-)
%{_bindir}/avidemux2_gtk
%{_datadir}/applications/*gtk*.desktop
-%endif
-%if %{with_qt}
%files qt
%defattr(-,root,root,-)
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
-%endif
%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
--- avidemux-2.4-ppc-libmad.patch DELETED ---
--- avidemux-2.4.1-qt4.patch DELETED ---
--- avidemux-2.4.3-lrelease.patch DELETED ---
--- avidemux-2.4.3-ppc-ptr.patch DELETED ---