packages: gstreamer-ffmpeg/gstreamer-ffmpeg.spec - system ffmpeg bcond, cla...
glen
glen at pld-linux.org
Mon Nov 8 14:51:19 CET 2010
Author: glen Date: Mon Nov 8 13:51:19 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- system ffmpeg bcond, clarify license
---- Files affected:
packages/gstreamer-ffmpeg:
gstreamer-ffmpeg.spec (1.36 -> 1.37)
---- Diffs:
================================================================
Index: packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec
diff -u packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec:1.36 packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec:1.37
--- packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec:1.36 Sat Jul 17 12:07:10 2010
+++ packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec Mon Nov 8 14:51:14 2010
@@ -1,19 +1,21 @@
# $Revision$, $Date$
+#
# Conditional build:
%bcond_with vdpau # build FFmpeg with nvidia VDPAU
-#
+%bcond_without system_ffmpeg # system FFmpeg. upstream does not accept bugs with system ffmpeg
+
%define gstname gst-ffmpeg
%define gst_major_ver 0.10
%define gst_req_ver 0.10.22
-#
+
%include /usr/lib/rpm/macros.gstreamer
-#
Summary: GStreamer Streaming-media framework plug-in using FFmpeg
Summary(pl.UTF-8): Wtyczka do środowiska obróbki strumieni GStreamer używająca FFmpeg
Name: gstreamer-ffmpeg
Version: 0.10.11
Release: 1
-License: GPL v2+
+# the ffmpeg plugin is LGPL, the postproc plugin is GPL
+License: GPL v2+ and LGPL v2+
Group: Libraries
Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/%{gstname}-%{version}.tar.bz2
# Source0-md5: 0d23197ba7ac06ea34fa66d38469ebe5
@@ -22,6 +24,7 @@
BuildRequires: automake
BuildRequires: gstreamer-devel >= %{gst_req_ver}
# libavutil,libswscale needed
+%{?with_system_ffmpeg:BuildRequires: ffmpeg-devel}
BuildRequires: gstreamer-plugins-base-devel >= %{gst_req_ver}
BuildRequires: liboil-devel >= 0.3.6
BuildRequires: libtool
@@ -68,6 +71,7 @@
%configure \
CPPFLAGS="%{rpmcppflags}" \
+ %{?with_system_ffmpeg:--with-system-ffmpeg} \
%{?with_vdpau:--with-ffmpeg-extra-configure="--enable-vdpau"} \
--disable-static
%{__make}
@@ -96,6 +100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2010/11/08 13:51:14 glen
+- system ffmpeg bcond, clarify license
+
Revision 1.36 2010/07/17 10:07:10 patrys
- 0.10.11
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-ffmpeg/gstreamer-ffmpeg.spec?r1=1.36&r2=1.37&f=u
More information about the pld-cvs-commit
mailing list