rpms/ffmpeg/EL-5 ffmpeg-pkgconfig.patch, NONE, 1.1 ffmpeg.spec, 1.4,
1.5
Dominik Mierzejewski
rathann at rpmfusion.org
Wed Jan 28 23:58:46 CET 2009
- Previous message: rpms/smplayer/F-10 .cvsignore, 1.6, 1.7 smplayer.spec, 1.7,
1.8 sources, 1.6, 1.7
- Next message: rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.8, 1.9 sources, 1.8,
1.9 xorg-x11-drv-nvidia.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/free/rpms/ffmpeg/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8920
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-pkgconfig.patch
Log Message:
* Wed Jan 28 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.51.20080908
- 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/EL-5/ffmpeg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ffmpeg.spec 17 Sep 2008 22:55:34 -0000 1.4
+++ ffmpeg.spec 28 Jan 2009 22:58:46 -0000 1.5
@@ -6,12 +6,13 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.50.%{svn}%{?dist}
+Release: 0.51.%{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
Patch4: %{name}-asmreg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +67,7 @@
%prep
%setup -q -n %{name}-%{svn}
+%patch0 -p1 -b .pkgconfig
%patch4 -p1 -b .asmreg
@@ -163,6 +165,9 @@
%changelog
+* Wed Jan 28 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.51.20080908
+- fix pkgconfig file generation
+
* Thu Sep 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.50.20080908
- 20080908 snapshot (r25261), last before ABI change
- Previous message: rpms/smplayer/F-10 .cvsignore, 1.6, 1.7 smplayer.spec, 1.7,
1.8 sources, 1.6, 1.7
- Next message: rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.8, 1.9 sources, 1.8,
1.9 xorg-x11-drv-nvidia.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list