commit 29cbb53294b9179bebfc732cc99fc7cca9ded6d1
Author: Jakub Bogusz <[email protected]>
Date: Sat Mar 2 18:56:54 2013 +0100
- up to 9.3
- removed obsolete cdio-paranoia patch
libav-cdio-paranoia.patch | 24 ------------------------
libav.spec | 8 +++-----
2 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/libav.spec b/libav.spec
index 5c92b8b..5fb76a8 100644
--- a/libav.spec
+++ b/libav.spec
@@ -24,7 +24,7 @@
Summary: libav - Open Source audio and video processing tools
Summary(pl.UTF-8): libav - narzędzia do przetwarzania dźwięku i obrazu o
otwartych źródłach
Name: libav
-Version: 9.1
+Version: 9.3
Release: 0.1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (some filters, x264, xavs, xvid, x11grab)
@@ -32,15 +32,14 @@ Release: 0.1
License: GPL v3+ with LGPL v3+ parts
Group: Libraries
Source0: http://libav.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 6c70d41a452762d16162f4d66120efbe
+# Source0-md5: dca4b801c8bf6bba7efa745e2fe441f0
Source1: avserver.init
Source2: avserver.sysconfig
Source3: avserver.conf
Patch0: %{name}-gsm.patch
Patch1: %{name}-opencv24.patch
Patch2: %{name}-openjpeg.patch
-Patch3: %{name}-cdio-paranoia.patch
-Patch4: %{name}-avserver.patch
+Patch3: %{name}-avserver.patch
URL: http://libav.org/
BuildRequires: SDL-devel >= 1.2.1
BuildRequires: alsa-lib-devel
@@ -237,7 +236,6 @@ dużej przestrzeni na dane skonfigurowanej w avserver.conf).
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > libav-avconfig
diff --git a/libav-cdio-paranoia.patch b/libav-cdio-paranoia.patch
deleted file mode 100644
index 5600562..0000000
--- a/libav-cdio-paranoia.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ffmpeg-1.0.1/libavdevice/libcdio.c.orig 2012-12-03 22:17:35.000000000
+0100
-+++ ffmpeg-1.0.1/libavdevice/libcdio.c 2012-12-06 19:03:32.695282861 +0100
-@@ -23,8 +23,8 @@
- * libcdio CD grabbing
- */
-
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
-
- #include "libavutil/log.h"
- #include "libavutil/mem.h"
---- libav-9.1/configure.orig 2013-01-10 21:00:22.840300169 +0100
-+++ libav-9.1/configure 2013-01-10 21:29:21.180263938 +0100
-@@ -3552,7 +3552,7 @@
- enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
-
- enabled libcdio &&
-- check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia
-lcdio_cdda -lcdio
-+ check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h"
cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
-
- enabled x11grab &&
- require X11 X11/Xlib.h XOpenDisplay -lX11 &&
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libav.git/commitdiff/29cbb53294b9179bebfc732cc99fc7cca9ded6d1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
