Allow building with ffmpeg24

el8
Nicolas Chauvet 10 years ago
parent a90c73b6f0
commit daaf0fb5d5

@ -0,0 +1,16 @@
diff --git a/configure.ac b/configure.ac
index a684338..053713a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
- PKG_CHECK_EXISTS([libavcodec < 56],, [
- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
+ PKG_CHECK_EXISTS([libavcodec < 57],, [
+ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"

@ -33,12 +33,13 @@
Summary: The cross-platform open-source multimedia framework, player and server Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc Name: vlc
Version: 2.1.5 Version: 2.1.5
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.videolan.org URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: vlc-2.1.5-ffmpeg-2.4.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -222,6 +223,7 @@ JACK audio plugin for the VLC media player.
%prep %prep
%setup -q -n %{name}-%{version}%{?vlc_rc} %setup -q -n %{name}-%{version}%{?vlc_rc}
%patch0 -p1 -b .ffmpeg24
%{?_with_bootstrap: %{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@ -491,6 +493,9 @@ fi || :
%changelog %changelog
* Sun Sep 28 2014 kwizart <kwizart@gmail.com> - 2.1.5-4
- Allow build with ffmpeg24
* Fri Sep 26 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.1.5-3 * Fri Sep 26 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.1.5-3
- Rebuilt for FFmpeg 2.4.x - Rebuilt for FFmpeg 2.4.x

Loading…
Cancel
Save