rpms/avidemux/F-11 .cvsignore, 1.7, 1.8 avidemux.spec, 1.33, 1.34 sources, 1.8, 1.9
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11904/F-11
Modified Files:
.cvsignore avidemux.spec sources
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
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 12 Sep 2009 03:02:16 -0000 1.7
+++ .cvsignore 10 Oct 2009 06:52:13 -0000 1.8
@@ -1 +1 @@
-avidemux-2.5.1-20090911svn-r5328.tar.bz2
+avidemux-2.5.1-20091010svn-r5371.tar.bz2
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- avidemux.spec 15 Sep 2009 20:33:06 -0000 1.33
+++ avidemux.spec 10 Oct 2009 06:52:13 -0000 1.34
@@ -1,6 +1,6 @@
Name: avidemux
Version: 2.5.1
-Release: 2.20090911svn%{?dist}
+Release: 2.20091010svn%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -8,19 +8,17 @@
URL: http://www.avidemux.org/
#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-20090911svn-r5328
-# pushd avidemux-2.5.1-20090911svn-r5328/avidemux/ADM_libraries
+# 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 19733 --ignore-externals ffmpeg_r19733
-# svn export --ignore-externals ffmpeg{_r19733,}
-# tar cfz ffmpeg.tar.gz ffmpeg && rm -rf ffmpeg{_r19733,}
-# svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale -r 29569 libswscale_r29569
-# svn export libswscale{_r29569,}
-# tar cfz libswscale.tar.gz libswscale && rm -rf libswscale{_r29569,}
-# popd
-# tar cfj avidemux-2.5.1-20090911svn-r5328.tar.bz2 avidemux-2.5.1-20090911svn-r5328
-Source0: avidemux-%{version}-20090911svn-r5328.tar.bz2
+# 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}
+Source0: avidemux-%{version}-20091010svn-r5371.tar.bz2
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
@@ -154,7 +152,7 @@
This package contains various plugins for avidemux.
%prep
-%setup -q -n avidemux-%{version}-20090911svn-r5328
+%setup -q -n avidemux-%{version}-20091010svn-r5371
# change hardcoded libdir paths
%ifarch x86_64 ppc64
@@ -174,14 +172,14 @@
# Out of source build
mkdir build && cd build
%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
- -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328" \
- -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328/build/config" \
+ -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}-20090911svn-r5328" \
- -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328/build/config" \
+ -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \
+ -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \
../plugins
make %{?_smp_mflags}
@@ -248,6 +246,9 @@
%{_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
+
* Tue Sep 15 2009 Stewart Adam <s.adam at diffingo.com> 2.5.1-2.20090911svn
- Bump for rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 13 Sep 2009 17:14:18 -0000 1.8
+++ sources 10 Oct 2009 06:52:13 -0000 1.9
@@ -1 +1 @@
-3b1bebf9fc2eb4b178a691e7b55f77de avidemux-2.5.1-20090911svn-r5328.tar.bz2
+6441ce265896fda78e845d296f14f20e avidemux-2.5.1-20091010svn-r5371.tar.bz2
14 years, 7 months
rpms/avidemux/devel 2.5.0-coreImage-parallel-build.patch, NONE, 1.1 avidemux-2.5-checkfunction-includes.patch, NONE, 1.1 avidemux-2.5-i18n.patch, NONE, 1.1 avidemux-2.5-libmpeg2enc-altivec.patch, NONE, 1.1 avidemux-2.5-pulseaudio-default.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 avidemux.spec, 1.22, 1.23 sources, 1.4, 1.5 avidemux-2.4-cmake264.patch, 1.1, NONE avidemux-2.4-gcc44.patch, 1.1, NONE avidemux-2.4-i18n.patch, 1.3, NONE avidemux-2.4-libdca.patch, 1.4, NONE avidemux-2.4-pulseaudio-default.patch, 1.2, N
by Stewart Adam
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 ---
14 years, 7 months
rpms/cairo-dock/F-11 .cvsignore, 1.21, 1.22 cairo-dock.spec, 1.29, 1.30 sources, 1.23, 1.24
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2315/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 29 Sep 2009 16:36:03 -0000 1.21
+++ .cvsignore 9 Oct 2009 17:42:21 -0000 1.22
@@ -1,2 +1,2 @@
-cairo-dock-2.0.8.2.tar.bz2
-cairo-dock-plugins-2.0.8.2.tar.bz2
+cairo-dock-2.1.0.tar.gz
+cairo-dock-plugins-2.1.0.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cairo-dock.spec 29 Sep 2009 17:15:15 -0000 1.29
+++ cairo-dock.spec 9 Oct 2009 17:42:21 -0000 1.30
@@ -11,11 +11,9 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.8.2
+%global mainver 2.1.0
%undefine betaver
-%global build_themes 0
-
%global build_webkit 1
%global build_xfce 1
@@ -27,10 +25,6 @@
%if 0%{?released} >= 1
%global build_other 0
%endif
-# Now WebKit plug-in is (will be) included in released tarball
-%if %{build_other} < 1
-%global build_webkit 1
-%endif
Name: cairo-dock
@@ -44,11 +38,8 @@
%if 0%{?released} < 1
Source0: %{name}-sources-%{betaver}.tar.bz2
%else
-Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%beta...
-%if %{build_themes}
-Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver...
-%endif
-Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave...
+Source0: http://launchpad.net/cairo-dock-core/2.1/2.1.0/+download/cairo-dock-%{mai...
+Source2: http://launchpad.net/cairo-dock-plug-ins/2.1/2.1.0/+download/cairo-dock-p...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,11 +74,6 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
-# (for now make it sure that buildtree used is correctly synced with rawhide tree
-# and new libxklavier is correctly used)
-%if 0%{?fedora} >= 12
-BuildRequires: libxklavier-devel >= 4.0
-%endif
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -117,26 +103,13 @@
Obsoletes: %{name}-plug-ins-xfce < %{version}-%{release}
%endif
# cairo-dock-themes is obsoleted
-%if ! %{build_themes}
Obsoletes: %{name}-themes < %{version}-%{release}
-%endif
%description
An light eye-candy fully themable animated dock for any
Linux desktop. It has a family-likeness with OSX dock,
but with more options.
-%package themes
-# Kill AutoProv to remove unwilling desktop prov
-AutoProv: No
-BuildArch: noarch
-Summary: Additional themes for %{name}
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-
-%description themes
-This package contains a set of additional themes for %{name}.
-
%package plug-ins
Summary: Plug-ins files for %{name}
Group: User Interface/Desktops
@@ -186,15 +159,8 @@
%else
###
-%if %{build_themes}
-%setup -q -c -a 1 -a 2
-%else
%setup -q -c -a 2
-%endif
%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
-%if %{build_themes}
-%{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
-%endif
%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
%endif
###
@@ -233,15 +199,6 @@
-e 's|Icon=\*|Icon=cairo-dock|' \
data/cairo-dock*.desktop
-# B. themes
-%if %{build_themes}
-cd ../themes
-
-%if 0%{?released} < 1
-autoreconf -i -f
-%endif
-%endif
-
# C. plug-ins
cd ../plug-ins
@@ -253,10 +210,7 @@
# source code fix
-# dialog-rendering
-find dialog-rendering -type f \
- \( -not -path '*/.svn/*' -and -not -name \*.png \) \
- | xargs %{__sed} -i -e 's|\r||'
+# Scooby-Do: see below
# stacks: directory fix
%if 0%{?released} < 1
@@ -350,26 +304,26 @@
export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
-# B themes
-%if %{build_themes}
-cd ../themes
-
-%configure
-%{__make} %{?_smp_mflags} || status=$((status+1))
-%endif
-
# C plug-ins
cd ../plug-ins
# First deal with subdirs in topdir configure.ac, then else
-
%configure \
--enable-gio-in-gmenu \
+ --enable-mail \
+ --enable-network-monitor \
+ --enable-scooby-do \
# Workaround to avoid endless loop on po/
touch po/stamp-it
+# Scooby-Do: workaround
+cd Scooby-Do
+touch config.status
+ln -sf ../libtool
+cd ..
+
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
retry=0
@@ -416,10 +370,6 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
-%{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
-# debian file, not useful
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/cairo-dock-update.sh
-
for f in $RPM_BUILD_ROOT%{_datadir}/applications/*desktop
do
desktop-file-validate $f
@@ -434,6 +384,7 @@
for f in \
LICENSE \
+ copyright \
data/ChangeLog.txt \
%if 0%{?released} < 1
doc/HOW-TO__applets.txt \
@@ -447,19 +398,6 @@
%find_lang %{name}
%{__mv} -f %{name}.lang $TOPDIR
-# B. themes
-%if %{build_themes}
-cd ../themes
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- INSTALL="%{__install} -p"
-
-# clean up
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
-# no...
-%{__rm} -rf ./_Ubuntu_/
-popd # from $RPM_BUILD_ROOT
-%endif
# C plug-ins
%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-webkit}
@@ -471,6 +409,9 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
+%find_lang %{name}-plugins
+cp -p %{name}-plugins.lang $TOPDIR/lang-plug-ins/
+
Subdirs=$(cat Subdirs.list)
for dir in */
do
@@ -519,10 +460,6 @@
cd ..
done
-# Temporary hack
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock/ -name \*.so | xargs %{__chmod} 0755
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock -name \*.so.* | xargs %{__rm} -f
-
# documents
%if 0%{?released} < 1
%{__cp} -p Applets.stable $TOPDIR/documents/main/
@@ -595,12 +532,6 @@
# only directory
%dir %{_libdir}/%{name}/
-%if %{build_themes}
-%files themes
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/themes/_[A-Z]*/
-%endif
-
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}/*
@@ -634,6 +565,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
+- 2.1.0
+
* Wed Sep 30 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8.2-1
- 2.0.8.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 29 Sep 2009 16:36:03 -0000 1.23
+++ sources 9 Oct 2009 17:42:21 -0000 1.24
@@ -1,2 +1,2 @@
-a1340928f0297eee820453d8760c9011 cairo-dock-2.0.8.2.tar.bz2
-2f64f54b7c782bc8478e2ee4d0193803 cairo-dock-plugins-2.0.8.2.tar.bz2
+baa9ce9368abb685c99a76e69900b70c cairo-dock-2.1.0.tar.gz
+b461e39da5c34099310ea86b74bbc1b9 cairo-dock-plugins-2.1.0.tar.gz
14 years, 7 months
rpms/cairo-dock/devel .cvsignore, 1.29, 1.30 cairo-dock.spec, 1.37, 1.38 sources, 1.31, 1.32
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2315/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 29 Sep 2009 16:33:50 -0000 1.29
+++ .cvsignore 9 Oct 2009 17:42:21 -0000 1.30
@@ -1,2 +1,2 @@
-cairo-dock-2.0.8.2.tar.bz2
-cairo-dock-plugins-2.0.8.2.tar.bz2
+cairo-dock-2.1.0.tar.gz
+cairo-dock-plugins-2.1.0.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-dock.spec 29 Sep 2009 16:45:08 -0000 1.37
+++ cairo-dock.spec 9 Oct 2009 17:42:21 -0000 1.38
@@ -11,11 +11,9 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.8.2
+%global mainver 2.1.0
%undefine betaver
-%global build_themes 0
-
%global build_webkit 1
%global build_xfce 1
@@ -27,10 +25,6 @@
%if 0%{?released} >= 1
%global build_other 0
%endif
-# Now WebKit plug-in is (will be) included in released tarball
-%if %{build_other} < 1
-%global build_webkit 1
-%endif
Name: cairo-dock
@@ -44,11 +38,8 @@
%if 0%{?released} < 1
Source0: %{name}-sources-%{betaver}.tar.bz2
%else
-Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%beta...
-%if %{build_themes}
-Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver...
-%endif
-Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave...
+Source0: http://launchpad.net/cairo-dock-core/2.1/2.1.0/+download/cairo-dock-%{mai...
+Source2: http://launchpad.net/cairo-dock-plug-ins/2.1/2.1.0/+download/cairo-dock-p...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,11 +74,6 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
-# (for now make it sure that buildtree used is correctly synced with rawhide tree
-# and new libxklavier is correctly used)
-%if 0%{?fedora} >= 12
-BuildRequires: libxklavier-devel >= 4.0
-%endif
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -117,26 +103,13 @@
Obsoletes: %{name}-plug-ins-xfce < %{version}-%{release}
%endif
# cairo-dock-themes is obsoleted
-%if ! %{build_themes}
Obsoletes: %{name}-themes < %{version}-%{release}
-%endif
%description
An light eye-candy fully themable animated dock for any
Linux desktop. It has a family-likeness with OSX dock,
but with more options.
-%package themes
-# Kill AutoProv to remove unwilling desktop prov
-AutoProv: No
-BuildArch: noarch
-Summary: Additional themes for %{name}
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-
-%description themes
-This package contains a set of additional themes for %{name}.
-
%package plug-ins
Summary: Plug-ins files for %{name}
Group: User Interface/Desktops
@@ -186,15 +159,8 @@
%else
###
-%if %{build_themes}
-%setup -q -c -a 1 -a 2
-%else
%setup -q -c -a 2
-%endif
%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
-%if %{build_themes}
-%{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
-%endif
%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
%endif
###
@@ -233,15 +199,6 @@
-e 's|Icon=\*|Icon=cairo-dock|' \
data/cairo-dock*.desktop
-# B. themes
-%if %{build_themes}
-cd ../themes
-
-%if 0%{?released} < 1
-autoreconf -i -f
-%endif
-%endif
-
# C. plug-ins
cd ../plug-ins
@@ -253,10 +210,7 @@
# source code fix
-# dialog-rendering
-find dialog-rendering -type f \
- \( -not -path '*/.svn/*' -and -not -name \*.png \) \
- | xargs %{__sed} -i -e 's|\r||'
+# Scooby-Do: see below
# stacks: directory fix
%if 0%{?released} < 1
@@ -350,26 +304,26 @@
export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
-# B themes
-%if %{build_themes}
-cd ../themes
-
-%configure
-%{__make} %{?_smp_mflags} || status=$((status+1))
-%endif
-
# C plug-ins
cd ../plug-ins
# First deal with subdirs in topdir configure.ac, then else
-
%configure \
--enable-gio-in-gmenu \
+ --enable-mail \
+ --enable-network-monitor \
+ --enable-scooby-do \
# Workaround to avoid endless loop on po/
touch po/stamp-it
+# Scooby-Do: workaround
+cd Scooby-Do
+touch config.status
+ln -sf ../libtool
+cd ..
+
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
retry=0
@@ -416,10 +370,6 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
-%{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
-# debian file, not useful
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/cairo-dock-update.sh
-
for f in $RPM_BUILD_ROOT%{_datadir}/applications/*desktop
do
desktop-file-validate $f
@@ -434,6 +384,7 @@
for f in \
LICENSE \
+ copyright \
data/ChangeLog.txt \
%if 0%{?released} < 1
doc/HOW-TO__applets.txt \
@@ -447,19 +398,6 @@
%find_lang %{name}
%{__mv} -f %{name}.lang $TOPDIR
-# B. themes
-%if %{build_themes}
-cd ../themes
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- INSTALL="%{__install} -p"
-
-# clean up
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
-# no...
-%{__rm} -rf ./_Ubuntu_/
-popd # from $RPM_BUILD_ROOT
-%endif
# C plug-ins
%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-webkit}
@@ -471,6 +409,9 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
+%find_lang %{name}-plugins
+cp -p %{name}-plugins.lang $TOPDIR/lang-plug-ins/
+
Subdirs=$(cat Subdirs.list)
for dir in */
do
@@ -519,10 +460,6 @@
cd ..
done
-# Temporary hack
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock/ -name \*.so | xargs %{__chmod} 0755
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock -name \*.so.* | xargs %{__rm} -f
-
# documents
%if 0%{?released} < 1
%{__cp} -p Applets.stable $TOPDIR/documents/main/
@@ -595,12 +532,6 @@
# only directory
%dir %{_libdir}/%{name}/
-%if %{build_themes}
-%files themes
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/themes/_[A-Z]*/
-%endif
-
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}/*
@@ -634,6 +565,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
+- 2.1.0
+
* Wed Sep 30 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8.2-1
- 2.0.8.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 29 Sep 2009 16:33:50 -0000 1.31
+++ sources 9 Oct 2009 17:42:21 -0000 1.32
@@ -1,2 +1,2 @@
-a1340928f0297eee820453d8760c9011 cairo-dock-2.0.8.2.tar.bz2
-2f64f54b7c782bc8478e2ee4d0193803 cairo-dock-plugins-2.0.8.2.tar.bz2
+baa9ce9368abb685c99a76e69900b70c cairo-dock-2.1.0.tar.gz
+b461e39da5c34099310ea86b74bbc1b9 cairo-dock-plugins-2.1.0.tar.gz
14 years, 7 months
rpms/k9copy/F-10 .cvsignore, 1.5, 1.6 k9copy.spec, 1.9, 1.10 sources, 1.5, 1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22200
Modified Files:
.cvsignore k9copy.spec sources
Log Message:
* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
- k9copy-2.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 27 May 2009 14:19:22 -0000 1.5
+++ .cvsignore 9 Oct 2009 13:41:38 -0000 1.6
@@ -1 +1 @@
-k9copy-2.3.2-Source.tar.gz
+k9copy-2.3.3-Source.tar.gz
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-10/k9copy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k9copy.spec 27 May 2009 14:19:22 -0000 1.9
+++ k9copy.spec 9 Oct 2009 13:41:38 -0000 1.10
@@ -1,6 +1,6 @@
Name: k9copy
-Version: 2.3.2
+Version: 2.3.3
Release: 1%{?dist}
Summary: Video DVD backup and creation program
Group: Applications/Multimedia
@@ -11,7 +11,6 @@
Patch1: k9copy-2.3.1-ffmpeg.patch
Patch2: k9copy-2.1.0-mimetype.patch
-Patch3: k9copy-2.3.1-gcc44.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -46,8 +45,6 @@
%patch1 -p1 -b .ffmpeg
%patch2 -p1 -b .mimetype
-%patch3 -p1 -b .gcc44
-
%build
mkdir -p %{_target_platform}
@@ -107,6 +104,9 @@
%changelog
+* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
+- k9copy-2.3.3
+
* Wed May 27 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.2-1
- k9copy-2.3.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 27 May 2009 14:19:22 -0000 1.5
+++ sources 9 Oct 2009 13:41:38 -0000 1.6
@@ -1 +1 @@
-bd3eaa33c64d8a2ba28f5385cd85eea2 k9copy-2.3.2-Source.tar.gz
+8c3f3dc82949f9629cf619cd8aeb8160 k9copy-2.3.3-Source.tar.gz
14 years, 7 months
rpms/k9copy/F-11 .cvsignore, 1.8, 1.9 k9copy.spec, 1.14, 1.15 sources, 1.8, 1.9
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22050
Modified Files:
.cvsignore k9copy.spec sources
Log Message:
* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
- k9copy-2.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 27 May 2009 14:13:13 -0000 1.8
+++ .cvsignore 9 Oct 2009 13:41:00 -0000 1.9
@@ -1 +1 @@
-k9copy-2.3.2-Source.tar.gz
+k9copy-2.3.3-Source.tar.gz
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-11/k9copy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- k9copy.spec 27 May 2009 14:13:13 -0000 1.14
+++ k9copy.spec 9 Oct 2009 13:41:00 -0000 1.15
@@ -1,6 +1,6 @@
Name: k9copy
-Version: 2.3.2
+Version: 2.3.3
Release: 1%{?dist}
Summary: Video DVD backup and creation program
Group: Applications/Multimedia
@@ -11,7 +11,6 @@
Patch1: k9copy-2.3.1-ffmpeg.patch
Patch2: k9copy-2.1.0-mimetype.patch
-Patch3: k9copy-2.3.1-gcc44.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -46,8 +45,6 @@
%patch1 -p1 -b .ffmpeg
%patch2 -p1 -b .mimetype
-%patch3 -p1 -b .gcc44
-
%build
mkdir -p %{_target_platform}
@@ -107,6 +104,9 @@
%changelog
+* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
+- k9copy-2.3.3
+
* Wed May 27 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.2-1
- k9copy-2.3.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 27 May 2009 14:13:13 -0000 1.8
+++ sources 9 Oct 2009 13:41:00 -0000 1.9
@@ -1 +1 @@
-bd3eaa33c64d8a2ba28f5385cd85eea2 k9copy-2.3.2-Source.tar.gz
+8c3f3dc82949f9629cf619cd8aeb8160 k9copy-2.3.3-Source.tar.gz
14 years, 7 months
rpms/mlt/F-11 .cvsignore,1.4,1.5 mlt.spec,1.3,1.4 sources,1.4,1.5
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7390/F-11
Modified Files:
.cvsignore mlt.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Sep 2009 07:30:29 -0000 1.4
+++ .cvsignore 9 Oct 2009 09:04:07 -0000 1.5
@@ -1 +1 @@
-mlt-0.4.4.tar.gz
+mlt-0.4.6.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/mlt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlt.spec 8 Sep 2009 07:30:29 -0000 1.3
+++ mlt.spec 9 Oct 2009 09:04:07 -0000 1.4
@@ -1,6 +1,12 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global php_version %(php-config --version 2>/dev/null || echo 0)
+
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.4.4
+Version: 0.4.6
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
@@ -24,7 +30,9 @@
BuildRequires: ladspa-devel
BuildRequires: libxml2-devel
BuildRequires: sox-devel
-
+BuildRequires: swig
+BuildRequires: python-devel
+BuildRequires: php-devel
%description
MLT is an open source multimedia framework, designed and developed for
@@ -43,11 +51,26 @@
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
+%package python
+Requires: python
+Requires: %{name} = %{version}-%{release}
+Summary: Python package to work with MLT
+
+%package php
+Requires: php
+Requires: %{name} = %{version}-%{release}
+Summary: PHP package to work with MLT
%description devel
The %{name}-devel package contains the header files and static libraries for
building applications which use %{name}.
+%description python
+This module allows to work with MLT using python.
+
+%description php
+This module allows to work with MLT using PHP.
+
%prep
%setup -q
@@ -60,6 +83,7 @@
%build
+#export STRIP=/bin/true
%configure \
--enable-gpl \
--enable-motion-est \
@@ -70,7 +94,8 @@
--qimage-libdir=%{_qt4_libdir} \
--qimage-includedir=%{_qt4_headerdir} \
--rename-melt=%{name}-melt \
- --avformat-swscale
+ --avformat-swscale \
+ --swig-languages='python php'
make %{?_smp_mflags}
@@ -78,6 +103,13 @@
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT%{python_sitelib}
+install -d $RPM_BUILD_ROOT%{python_sitearch}
+install -d $RPM_BUILD_ROOT%{php_extdir}
+install -pm 0644 src/swig/python/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/
+install -pm 0755 src/swig/python/_%{name}.so $RPM_BUILD_ROOT%{python_sitearch}/
+install -pm 0755 src/swig/php/%{name}.so $RPM_BUILD_ROOT%{php_extdir}/
+
mv src/modules/motion_est/README README.motion_est
%clean
@@ -99,6 +131,17 @@
%{_datadir}/%{name}
+%files python
+%defattr(-,root,root,-)
+%{python_sitelib}/%{name}.py
+%{python_sitelib}/%{name}.pyc
+%{python_sitelib}/%{name}.pyo
+%{python_sitearch}/_%{name}.so
+
+%files php
+%defattr(-,root,root,-)
+%{php_extdir}/%{name}.so
+
%files devel
%defattr(-,root,root,-)
%doc docs/* demo
@@ -108,6 +151,10 @@
%changelog
+* Wed Oct 07 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.6-1
+- new version
+- added subpackages for: python, PHP
+
* Mon Sep 07 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.4-1
- new version
- renamed melt binary to mlt-melt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Sep 2009 07:30:29 -0000 1.4
+++ sources 9 Oct 2009 09:04:07 -0000 1.5
@@ -1 +1 @@
-0019996624b6a61ea27e07b4851ac765 mlt-0.4.4.tar.gz
+77b1affc2011eff9eedc2746c06b34e2 mlt-0.4.6.tar.gz
14 years, 7 months
rpms/mlt/devel .cvsignore,1.3,1.4 mlt.spec,1.2,1.3 sources,1.3,1.4
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6972/devel
Modified Files:
.cvsignore mlt.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Sep 2009 06:37:24 -0000 1.3
+++ .cvsignore 9 Oct 2009 09:03:28 -0000 1.4
@@ -1 +1 @@
-mlt-0.4.4.tar.gz
+mlt-0.4.6.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mlt.spec 8 Sep 2009 06:37:24 -0000 1.2
+++ mlt.spec 9 Oct 2009 09:03:28 -0000 1.3
@@ -1,6 +1,12 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global php_version %(php-config --version 2>/dev/null || echo 0)
+
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.4.4
+Version: 0.4.6
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
@@ -24,7 +30,9 @@
BuildRequires: ladspa-devel
BuildRequires: libxml2-devel
BuildRequires: sox-devel
-
+BuildRequires: swig
+BuildRequires: python-devel
+BuildRequires: php-devel
%description
MLT is an open source multimedia framework, designed and developed for
@@ -43,11 +51,26 @@
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
+%package python
+Requires: python
+Requires: %{name} = %{version}-%{release}
+Summary: Python package to work with MLT
+
+%package php
+Requires: php
+Requires: %{name} = %{version}-%{release}
+Summary: PHP package to work with MLT
%description devel
The %{name}-devel package contains the header files and static libraries for
building applications which use %{name}.
+%description python
+This module allows to work with MLT using python.
+
+%description php
+This module allows to work with MLT using PHP.
+
%prep
%setup -q
@@ -60,6 +83,7 @@
%build
+#export STRIP=/bin/true
%configure \
--enable-gpl \
--enable-motion-est \
@@ -70,7 +94,8 @@
--qimage-libdir=%{_qt4_libdir} \
--qimage-includedir=%{_qt4_headerdir} \
--rename-melt=%{name}-melt \
- --avformat-swscale
+ --avformat-swscale \
+ --swig-languages='python php'
make %{?_smp_mflags}
@@ -78,6 +103,13 @@
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT%{python_sitelib}
+install -d $RPM_BUILD_ROOT%{python_sitearch}
+install -d $RPM_BUILD_ROOT%{php_extdir}
+install -pm 0644 src/swig/python/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/
+install -pm 0755 src/swig/python/_%{name}.so $RPM_BUILD_ROOT%{python_sitearch}/
+install -pm 0755 src/swig/php/%{name}.so $RPM_BUILD_ROOT%{php_extdir}/
+
mv src/modules/motion_est/README README.motion_est
%clean
@@ -99,6 +131,17 @@
%{_datadir}/%{name}
+%files python
+%defattr(-,root,root,-)
+%{python_sitelib}/%{name}.py
+%{python_sitelib}/%{name}.pyc
+%{python_sitelib}/%{name}.pyo
+%{python_sitearch}/_%{name}.so
+
+%files php
+%defattr(-,root,root,-)
+%{php_extdir}/%{name}.so
+
%files devel
%defattr(-,root,root,-)
%doc docs/* demo
@@ -108,6 +151,10 @@
%changelog
+* Wed Oct 07 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.6-1
+- new version
+- added subpackages for: python, PHP
+
* Mon Sep 07 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.4-1
- new version
- renamed melt binary to mlt-melt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Sep 2009 06:37:24 -0000 1.3
+++ sources 9 Oct 2009 09:03:28 -0000 1.4
@@ -1 +1 @@
-0019996624b6a61ea27e07b4851ac765 mlt-0.4.4.tar.gz
+77b1affc2011eff9eedc2746c06b34e2 mlt-0.4.6.tar.gz
14 years, 7 months
rpms/libquicktime/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 libquicktime.spec, 1.9, 1.10
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28443
Modified Files:
.cvsignore sources libquicktime.spec
Log Message:
Update to 1.1.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Dec 2008 10:13:06 -0000 1.4
+++ .cvsignore 7 Oct 2009 22:55:30 -0000 1.5
@@ -1 +1 @@
-libquicktime-1.1.1.tar.gz
+libquicktime-1.1.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Dec 2008 10:13:06 -0000 1.4
+++ sources 7 Oct 2009 22:55:30 -0000 1.5
@@ -1 +1 @@
-88df838a450b6c6768819d45bacc0926 libquicktime-1.1.1.tar.gz
+e4fcda219f1e0ca508d9baa3700e4a59 libquicktime-1.1.3.tar.gz
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libquicktime.spec 27 Mar 2009 15:07:01 -0000 1.9
+++ libquicktime.spec 7 Oct 2009 22:55:30 -0000 1.10
@@ -1,7 +1,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
@@ -131,6 +131,9 @@
# --------------------------------------------------------------------
%changelog
+* Wed Oct 7 2009 kwizart <kwizart at gmail.com > - 1.1.3-1
+- Update to 1.1.3
+
* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 1.1.1-2
- Rebuild for faad x264
14 years, 7 months
rpms/ffmpeg/devel .cvsignore, 1.10, 1.11 ffmpeg.spec, 1.16, 1.17 sources, 1.10, 1.11 ffmpeg-snapshot.sh, 1.2, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27290/devel
Modified Files:
.cvsignore ffmpeg.spec sources
Removed Files:
ffmpeg-snapshot.sh
Log Message:
- Update to svn snapshot 20091007
- Add BR dirac and vdpau.
- Use --with nonfree as a separate conditional for amr and faac.
- Don't build faac by default because it's nonfree.
- Allow to --define 'ffmpegsuffix custom' for special SONAME.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 10 Mar 2009 23:24:14 -0000 1.10
+++ .cvsignore 7 Oct 2009 22:37:11 -0000 1.11
@@ -1 +1 @@
-ffmpeg-0.5.tar.bz2
+ffmpeg-20091007.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ffmpeg.spec 26 Mar 2009 23:06:34 -0000 1.16
+++ ffmpeg.spec 7 Oct 2009 22:37:11 -0000 1.17
@@ -1,35 +1,39 @@
# TODO: add make test to %%check section
-%define faad2min 1:2.6.1
+%global svn 20091007
+%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.5
-Release: 2%{?dist}
+Release: 3.svn%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
+Source0: http://rpms.kwizart.net/fedora/SOURCES/%{name}-%{svn}.tar.bz2
# get rid of textrels on x86_64 in yasm code
Patch0: %{name}-textrel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: bzip2-devel
-BuildRequires: faac-devel
+BuildRequires: dirac-devel
+%{?_with_faac:BuildRequires: faac-devel}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: gsm-devel
BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libtheora-devel
+%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0}
+BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.14.20080613
+BuildRequires: x264-devel >= 0.0.0-0.25.20091007
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -70,7 +74,7 @@
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains development files for %{name}
-%define ff_configure \
+%global ff_configure \
../configure \\\
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
@@ -81,10 +85,11 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS -I%{_includedir}/openjpeg" \\\
--extra-version=rpmfusion \\\
- %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\
+ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \\\
--enable-bzlib \\\
--enable-libdc1394 \\\
- --enable-libfaac \\\
+ --enable-libdirac \\\
+ %{?_with_faac:--enable-libfaac} \\\
--enable-libfaad \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
@@ -99,17 +104,17 @@
--enable-avfilter \\\
--enable-avfilter-lavf \\\
--enable-postproc \\\
- --enable-swscale \\\
--enable-pthreads \\\
--disable-static \\\
--enable-shared \\\
--enable-gpl \\\
+ %{?_with_nonfree:--enable-nonfree} \\\
--disable-debug \\\
--disable-stripping
%prep
-%setup -q
+%setup -q -n %{name}-%{svn}
%patch0 -p1 -b .textrel
%build
@@ -117,6 +122,9 @@
pushd generic
%{ff_configure}\
--shlibdir=%{_libdir} \
+%if 0%{?ffmpegsuffix:1}
+ --build-suffix=%{ffmpegsuffix} \
+%else
%ifarch %{ix86}
--cpu=%{_target_cpu} \
--disable-mmx2 \
@@ -130,11 +138,13 @@
%ifarch sparc sparc64
--disable-vis \
%endif
+%endif
make %{?_smp_mflags}
make documentation
popd
+%if 1%{?ffmpegsuffix:0}
mkdir simd
pushd simd
%ifarch %{ix86}
@@ -181,17 +191,20 @@
make %{?_smp_mflags}
%endif
popd
+%endif
%install
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
popd
+%if 1%{?ffmpegsuffix:0}
pushd simd
%ifarch %{ix86} ppc ppc64 sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
%endif
popd
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -203,7 +216,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING.GPL CREDITS Changelog README RELEASE doc/ffserver.conf
+%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffserver
@@ -215,18 +228,16 @@
%files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
-%{_libdir}/vhook/
+%if 1%{?ffmpegsuffix:0}
%ifarch %{ix86}
%{_libdir}/i686/lib*.so.*
-%{_libdir}/i686/vhook/
%endif
%ifarch ppc ppc64
%{_libdir}/altivec/lib*.so.*
-%{_libdir}/altivec/vhook/
%endif
%ifarch sparc sparc64
%{_libdir}/v9/lib*.so.*
-%{_libdir}/v9/vhook/
+%endif
%endif
%files devel
@@ -235,6 +246,7 @@
%{_includedir}/ffmpeg
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
+%if 1%{?ffmpegsuffix:0}
%ifarch %{ix86}
%{_libdir}/i686/lib*.so
%endif
@@ -244,9 +256,17 @@
%ifarch sparc sparc64
%{_libdir}/v9/lib*.so
%endif
+%endif
%changelog
+* Wed Oct 7 2009 kwizart <kwizart at gmail.com > - 0.5-3.svn20091007
+- Update to svn snapshot 20091007
+- Add BR dirac and vdpau.
+- Use --with nonfree as a separate conditional for amr and faac.
+- Don't build faac by default because it's nonfree.
+- Allow to --define 'ffmpegsuffix custom' for special SONAME.
+
* Fri Mar 27 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-2
- rebuild for new faad2 and x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 10 Mar 2009 23:24:14 -0000 1.10
+++ sources 7 Oct 2009 22:37:11 -0000 1.11
@@ -1 +1 @@
-be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2
+6a8939377b60a1e730dc7cce9af88d82 ffmpeg-20091007.tar.bz2
--- ffmpeg-snapshot.sh DELETED ---
14 years, 7 months