Author: firewing Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11904/devel Modified Files: .cvsignore avidemux.spec sources Added Files: 2.5.0-coreImage-parallel-build.patch avidemux-2.5-checkfunction-includes.patch avidemux-2.5-i18n.patch avidemux-2.5-libmpeg2enc-altivec.patch avidemux-2.5-pulseaudio-default.patch Removed Files: avidemux-2.4-cmake264.patch avidemux-2.4-gcc44.patch avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux-2.4-pulseaudio-default.patch Log Message: * Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-1.20091010svn - Update to 2.5.1 subversion r5371 2.5.0-coreImage-parallel-build.patch: --- NEW FILE 2.5.0-coreImage-parallel-build.patch --- diff --git a/avidemux/ADM_coreImage/src/CMakeLists.txt b/avidemux/ADM_coreImage/src/CMakeLists.txt index fab38a3..4fc236a 100644 --- a/avidemux/ADM_coreImage/src/CMakeLists.txt +++ b/avidemux/ADM_coreImage/src/CMakeLists.txt @@ -20,6 +20,7 @@ SET(ADM_coreImage_SRCS ) ADD_LIBRARY(ADM_coreImage SHARED ${ADM_coreImage_SRCS}) +ADD_DEPENDENCIES(ADM_coreImage ffmpeg) ADD_SOURCE_CFLAGS(DIA_flyDialog.cpp " -DADM_UI_TYPE_BUILD=99") IF (APPLE) TARGET_LINK_LIBRARIES(ADM_coreImage -Wl,-read_only_relocs,suppress) avidemux-2.5-checkfunction-includes.patch: --- NEW FILE avidemux-2.5-checkfunction-includes.patch --- --- avidemux-2.5.0-20090814-r5245.orig/cmake/admConfigHelper.cmake 2009-08-14 19:01:01.828383207 -0400 +++ avidemux-2.5.0-20090814-r5245/cmake/admConfigHelper.cmake 2009-08-14 19:02:02.895383035 -0400 @@ -91,7 +91,7 @@ SET(CHECK_FUNCTION_DEFINE "-DCHECK_FUNCTION_EXISTS=${_function}" ${ARGV4}) SET(CHECK_FUNCTION_LIB ${_lib} ${ARGV3}) - ADM_COMPILE(CheckFunctionExists.c "${CHECK_FUNCTION_DEFINE}" "" "${CHECK_FUNCTION_LIB}" ${_varToSet} OUTPUT) + ADM_COMPILE(CheckFunctionExists.c "${CHECK_FUNCTION_DEFINE}" "${AVIDEMUX_SOURCE_DIR}/cmake_compile_check" "${CHECK_FUNCTION_LIB}" ${_varToSet} OUTPUT) IF (${_varToSet}) MESSAGE(STATUS "Found ${_function} in ${_lib}") avidemux-2.5-i18n.patch: --- NEW FILE avidemux-2.5-i18n.patch --- --- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2008-10-01 09:49:39.000000000 -0400 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-02 16:16:34.474297592 -0400 @@ -73,7 +73,7 @@ #ifdef __APPLE__ QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/"; #else - QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; + QString appdir = "/usr/share/avidemux/i18n/"; #endif loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); @@ -164,4 +164,4 @@ } return "Qt"; -} \ No newline at end of file +} --- avidemux_2.5.0.orig/cmake/Ts.cmake 2009-07-02 16:29:10.899297616 -0400 +++ avidemux_2.5.0/cmake/Ts.cmake 2009-07-02 16:32:52.218297313 -0400 @@ -64,7 +64,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) @@ -95,7 +95,7 @@ SET(qm_files ${qm_files} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) avidemux-2.5-libmpeg2enc-altivec.patch: --- NEW FILE avidemux-2.5-libmpeg2enc-altivec.patch --- --- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h.orig 2009-07-31 12:09:42.574079146 -0400 +++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h 2009-07-31 12:10:13.522203051 -0400 @@ -22,63 +22,9 @@ #define __MJPEG_TYPES_H__ //#include <config.h> -#if defined(HAVE_STDINT_H) -# include <stdint.h> -#elif defined(HAVE_INTTYPES_H) -# include <inttypes.h> -#elif defined(__CYGWIN__) -# include <sys/types.h> -typedef u_int8_t uint8_t; -typedef u_int16_t uint16_t; -typedef u_int32_t uint32_t; -typedef u_int64_t uint64_t; -# define INT8_C(c) c -# define INT16_C(c) c -# define INT32_C(c) c -# define INT64_C(c) c ## LL -# define UINT8_C(c) c ## U -# define UINT16_C(c) c ## U -# define UINT32_C(c) c ## U -# define UINT64_C(c) c ## ULL -#elif defined(_WIN32) -#include <win32defs.h> -#else -/* warning ISO/IEC 9899:1999 <stdint.h> was missing and even <inttypes.h> */ -/* fixme */ -/* (Ronald) we'll just give an error now...Better solutions might come later */ -#error You don't seem to have sys/types.h, inttypes.h or stdint.h! \ -This might mean two things: \ -Either you really don't have them, in which case you should \ -install the system headers and/or C-library headers. \ -You might also have forgotten to define whether you have them. \ -You can do this by either defining their presence before including \ -mjpegtools' header files (e.g. "#define HAVE_STDINT_H"), or you can check \ -for their presence in a configure script. mjpegtools' configure \ -script is a good example of how to do this. You need to check for \ -PRId64, stdbool.h, inttypes.h, stdint.h and sys/types.h -#endif /* HAVE_STDINT_H */ - -#if defined(__FreeBSD__) -#include <sys/types.h> /* FreeBSD - ssize_t */ -#endif - -#if defined(HAVE_STDBOOL_H) && !defined(__cplusplus) -#include <stdbool.h> -#else -/* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */ - -# ifndef __cplusplus -typedef enum - { - false = 0, - true = 1 - } locBool; - -# define false false -# define true true -# define bool locBool -# endif -#endif +#include <sys/types.h> /* FreeBSD, others - ssize_t */ +#include <stdint.h> +#include <inttypes.h> #ifndef PRId64 #define PRId64 PRID64_STRING_FORMAT avidemux-2.5-pulseaudio-default.patch: --- NEW FILE avidemux-2.5-pulseaudio-default.patch --- --- avidemux_2.5.0.orig/avidemux/prefs.in 2009-02-22 08:36:02.000000000 -0500 +++ avidemux_2.5.0/avidemux/prefs.in 2009-07-10 15:07:05.100178665 -0400 @@ -53,9 +53,9 @@ #ifdef __WIN32 device.audiodevice, STRING, WIN32 #else -device.audiodevice, STRING, ALSA +device.audiodevice, STRING, PulseAudioS #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.5.0.orig/avidemux/ADM_libraries/ADM_utilities/prefs.cpp 2009-02-22 08:36:02.000000000 -0500 +++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_utilities/prefs.cpp 2009-07-10 15:07:21.436178612 -0400 @@ -97,9 +97,9 @@ #ifdef __WIN32 {"device.audiodevice", STRING,"WIN32",NULL, NULL, NULL }, #else - {"device.audiodevice", STRING,"ALSA", NULL, NULL, NULL }, + {"device.audiodevice", STRING,"PulseAudioS", NULL, NULL, NULL }, #endif - {"device.audio.alsa_device", STRING,"dmix", NULL, NULL, NULL }, + {"device.audio.alsa_device", STRING,"pulse", NULL, NULL, NULL }, {"device.videodevice", UINT, "0", NULL, "0", "10" }, {"default.postproc_type", UINT, "3", NULL, "0", "7" }, {"default.postproc_value", UINT, "3", NULL, "0", "5" }, Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Feb 2009 04:41:56 -0000 1.4 +++ .cvsignore 10 Oct 2009 06:52:13 -0000 1.5 @@ -1 +1 @@ -avidemux_2.4.4.tar.gz +avidemux-2.5.1-20091010svn-r5371.tar.bz2 Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- avidemux.spec 19 Jun 2009 20:04:34 -0000 1.22 +++ avidemux.spec 10 Oct 2009 06:52:13 -0000 1.23 @@ -1,39 +1,50 @@ #define svndate 20080521 Name: avidemux -Version: 2.4.4 -Release: 9%{?dist} +Version: 2.5.1 +Release: 2.20091010svn%{?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 +#Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz +# svn co svn://svn.berlios.de/avidemux/branches/avidemux_2.5_branch_gruntster +# svn export avidemux_2.5_branch_gruntster avidemux-2.5.1-20091010svn-r5371 +# pushd avidemux-2.5.1-20091010svn-r5371/avidemux/ADM_libraries +# rm {ffmpeg,libswscale}*.tar.gz +##(cmake/admFFmpegBuild.cmake provides the up-to-date SVN revision numbers) +# svn co svn://svn.ffmpeg.org/ffmpeg/trunk -r 19894 --ignore-externals ffmpeg_r19894 +# svn export ffmpeg{_r19894,} --ignore-externals +# tar cfz ffmpeg_r19894.tar.gz ffmpeg && rm -rf ffmpeg{,_r19894} +# svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale -r 29686 libswscale_r29686 +# svn export libswscale{_r29686,} +# tar cfz libswscale_r29686.tar.gz libswscale && rm -rf libswscale{,_r29686} +# popd +# tar cfj avidemux-2.5.1-20091010svn-r5371.tar.bz2 avidemux-2.5.1-20091010svn-r5371 +Source0: avidemux-%{version}-20091010svn-r5371.tar.bz2 Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop -# Make PulseAudio the default audio out device -Patch0: avidemux-2.4-pulseaudio-default.patch -# Search for lrelease-qt4 instead of lrelease -Patch1: avidemux-2.4-qt4.patch -# Why are i18n files stored in bindir? Move to datadir... -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 -# Our report: https://bugzilla.rpmfusion.org/attachment.cgi?id=131 -# Upstream report: http://bugs.avidemux.org/index.php?do=details&task_id=592 -# Patch from: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/file... -Patch4: avidemux-2.4-gcc44.patch -# Fix building with cmake 2.6.4+ -# Patch from: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/file... -Patch5: avidemux-2.4-cmake264.patch +# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2: +# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5... +Patch0: 2.5.0-coreImage-parallel-build.patch +Patch1: avidemux-2.5-pulseaudio-default.patch +Patch2: avidemux-2.4-qt4.patch +Patch3: avidemux-2.5-i18n.patch +Patch4: avidemux-2.5-libmpeg2enc-altivec.patch +Patch5: avidemux-2.5-checkfunction-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: %{name}-cli = %{version} -Requires: %{name}-gui = %{version} +# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447 +ExcludeArch: ppc ppc64 + +Requires: %{name}-cli = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} +Requires: %{name}-plugins = %{version} # Compiling -BuildRequires: cmake +BuildRequires: cmake BuildRequires: gettext-devel # Libraries @@ -46,12 +57,13 @@ 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 +BuildRequires: libsamplerate-devel +BuildRequires: jack-audio-connection-kit-devel # Sound out BuildRequires: alsa-lib-devel >= 1.0.3 BuildRequires: esound-devel >= 0.2.0 +BuildRequires: pulseaudio-libs-devel # Video out BuildRequires: SDL-devel >= 1.2.7 @@ -64,10 +76,6 @@ 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 @@ -87,58 +95,108 @@ MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. +For compatability reasons, avidemux is a meta-package which installs the +graphical, command line and plugin packages. If you want a smaller setup, +you may selectively install one or more of the avidemux-* subpackages. + %package cli Summary: CLI for %{name} Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description cli -This package provides command-line interface for %{name}. +This package provides a command-line interface to editing videos with %{name}. + +%package libs +Summary: Libraries for %{name} +Group: System Environment/Libraries + +%description libs +This package contains the runtime libraries for %{name}. %package gtk -Summary: GTK GUI for %{name} +Summary: GTK interface 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 -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description gtk -This package provides the GTK interface for %{name}. +This package provides the GTK graphical interface for %{name}. %package qt -Summary: QT GUI for %{name} +Summary: Qt interface for %{name} Group: Applications/Multimedia # 4.5.0-9 fixes a failure when there are duplicate translated strings # https://bugzilla.redhat.com/show_bug.cgi?id=491514 BuildRequires: qt4-devel >= 4.5.0-9 Provides: %{name}-gui = %{version}-%{release} -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description qt -This package provides the Qt interface for %{name}. +This package contains the Qt graphical interface for %{name}. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +This package contains files required to develop with or extend %{name}. + +%package plugins +Summary: Plugins for the avidemux video editing and transcoding tool +Group: Applications/Multimedia +Requires: %{name}-libs = %{version}-%{release} + +%description plugins +This package contains various plugins for avidemux. %prep -%setup -q -n avidemux_%{version} -%patch0 -b .pulse -%patch1 -p1 -b .qt4 -%patch2 -p1 -b .i18n -%patch3 -p1 -b .libdca -%patch4 -b .gcc44 -%patch5 -p1 -b .cmake +%setup -q -n avidemux-%{version}-20091010svn-r5371 + +# change hardcoded libdir paths +%ifarch x86_64 ppc64 +sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp +sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp +%endif + +%patch0 -p1 -b .parallel +%patch1 -p1 -b .pulse +%patch2 -p1 -b .qt4 +%patch3 -p1 -b .i18n +%patch4 -p1 -b .altivec +%patch5 -p1 -b .cfincludes %build -%cmake -# po/ not smp safe - http://bugs.avidemux.org/index.php?do=details&task_id=605 -make -C po +# Out of source build +mkdir build && cd build +%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ + -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ + -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ + .. +make %{?_smp_mflags} +mkdir ../build_plugins && cd ../build_plugins +%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ + -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ + -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ + ../plugins make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make -C build install DESTDIR=$RPM_BUILD_ROOT +make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT +# Install the build configuration for devel package +install -d -m755 $RPM_BUILD_ROOT%{_includedir} +install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h + +# Find and remove all la files +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +# Install .desktop shortcuts desktop-file-install --vendor rpmfusion \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} @@ -147,16 +205,23 @@ --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 +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog History README TODO +# metapackage, no files + +%files libs -f %{name}.lang +%doc AUTHORS COPYING README TODO %dir %{_datadir}/%{name} +%{_datadir}/ADM_scripts/ +%{_libdir}/libADM* %files cli %defattr(-,root,root,-) @@ -169,12 +234,22 @@ %files qt %defattr(-,root,root,-) -%dir %{_datadir}/%{name}/i18n/ -%{_datadir}/%{name}/i18n/*.qm +%{_datadir}/%{name}/i18n/ %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop +%files plugins +%defattr(-,root,root,-) +%{_libdir}/ADM_plugins/ + +%files devel +%defattr(-,root,root,-) +%{_includedir}/ADM_coreConfig.h + %changelog +* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-2.20091010svn +- Update to 2.5.1 subversion r5371 + * Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-9 - Add patch to fix build with CMake 2.6.4 - Update gcc44 patch to match Gentoo upstream Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Feb 2009 04:41:56 -0000 1.4 +++ sources 10 Oct 2009 06:52:13 -0000 1.5 @@ -1 +1 @@ -503dfd25842ef81be7c769811e7bc54e avidemux_2.4.4.tar.gz +6441ce265896fda78e845d296f14f20e avidemux-2.5.1-20091010svn-r5371.tar.bz2 --- avidemux-2.4-cmake264.patch DELETED --- --- avidemux-2.4-gcc44.patch DELETED --- --- avidemux-2.4-i18n.patch DELETED --- --- avidemux-2.4-libdca.patch DELETED --- --- avidemux-2.4-pulseaudio-default.patch DELETED ---