8:24 p.m.
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22516
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-pkgconfig.patch
Log Message:
* Thu Dec 11 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.54.20081202
- fix pkgconfig file generation
ffmpeg-pkgconfig.patch:
--- NEW FILE ffmpeg-pkgconfig.patch ---
diff -up ffmpeg-20081202/configure.p ffmpeg-20081202/configure
--- ffmpeg-20081202/configure.p 2008-11-30 01:20:19.000000000 +0100
+++ ffmpeg-20081202/configure 2008-12-11 20:33:55.000000000 +0100
@@ -2114,11 +2114,6 @@ check_deps $CONFIG_LIST \
$OUTDEV_LIST \
$PROTOCOL_LIST \
-enabled libdc1394 && append pkg_requires "libraw1394"
-enabled libdirac && append pkg_requires "dirac"
-enabled libtheora && append pkg_requires "theora"
-enabled libvorbis && append pkg_requires "vorbisenc"
-
echo "install prefix $prefix"
echo "source path $source_path"
echo "C compiler $cc"
@@ -2442,16 +2437,16 @@ EOF
}
pkgconfig_generate libavutil "FFmpeg utility library"
"$LIBAVUTIL_VERSION"
-pkgconfig_generate libavcodec "FFmpeg codec library"
"$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil =
$LIBAVUTIL_VERSION"
-pkgconfig_generate libavformat "FFmpeg container format library"
"$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec =
$LIBAVCODEC_VERSION"
-pkgconfig_generate libavdevice "FFmpeg device handling library"
"$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat =
$LIBAVFORMAT_VERSION"
+pkgconfig_generate libavcodec "FFmpeg codec library"
"$LIBAVCODEC_VERSION" "$extralibs" "libavutil =
$LIBAVUTIL_VERSION"
+pkgconfig_generate libavformat "FFmpeg container format library"
"$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec =
$LIBAVCODEC_VERSION"
+pkgconfig_generate libavdevice "FFmpeg device handling library"
"$LIBAVDEVICE_VERSION" "$extralibs" "libavformat =
$LIBAVFORMAT_VERSION"
enabled avfilter &&
- pkgconfig_generate libavfilter "FFmpeg video filtering library"
"$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil =
$LIBAVUTIL_VERSION"
+ pkgconfig_generate libavfilter "FFmpeg video filtering library"
"$LIBAVFILTER_VERSION" "$extralibs" "libavutil =
$LIBAVUTIL_VERSION"
enabled postproc &&
pkgconfig_generate libpostproc "FFmpeg post processing library"
"$LIBPOSTPROC_VERSION"
if enabled swscale; then
pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
else
- pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec =
$LIBAVCODEC_VERSION"
+ pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION"
apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/
fi
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ffmpeg.spec 4 Dec 2008 20:15:31 -0000 1.8
+++ ffmpeg.spec 12 Dec 2008 20:24:25 -0000 1.9
@@ -6,12 +6,13 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.53.%{svn}%{?dist}
+Release: 0.54.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
+Patch0: %{name}-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
@@ -100,6 +101,7 @@
%prep
%setup -q -n %{name}-%{svn}
+%patch0 -p1 -b .p
%build
mkdir generic
@@ -250,6 +252,9 @@
%changelog
+* Thu Dec 11 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.54.20081202
+- fix pkgconfig file generation
+
* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.53.20081202
- 20081202 snapshot
- drop upstreamed/obsolete patches