[packages/libav] - up to 10 - updated opencv24,avserver patches - removed obsolete gsm,openjpeg patches
qboosh
qboosh at pld-linux.org
Sun Mar 30 06:27:49 CEST 2014
commit 1e2aba2c6bc3546b375d1bc46c8c53a8537e6efb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 30 06:31:25 2014 +0200
- up to 10
- updated opencv24,avserver patches
- removed obsolete gsm,openjpeg patches
libav-avserver.patch | 16 ++++++++--------
libav-gsm.patch | 22 ----------------------
libav-opencv24.patch | 22 +++++++++++-----------
libav-openjpeg.patch | 11 -----------
libav.spec | 27 ++++++++++++---------------
5 files changed, 31 insertions(+), 67 deletions(-)
---
diff --git a/libav.spec b/libav.spec
index 927efe9..46a6d04 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.11
+Version: 10
Release: 0.1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (some filters, x264, xavs, xvid, x11grab)
@@ -32,14 +32,12 @@ Release: 0.1
License: GPL v3+ with LGPL v3+ parts
Group: Libraries
Source0: http://libav.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 7052da92d5eda8934874300b314b7ae4
+# Source0-md5: c38b5a66224ff21ad9869e1f3f6c1f0b
Source1: avserver.init
Source2: avserver.sysconfig
Source3: avserver.conf
-Patch0: %{name}-gsm.patch
-Patch1: %{name}-opencv24.patch
-Patch2: %{name}-openjpeg.patch
-Patch3: %{name}-avserver.patch
+Patch0: %{name}-opencv24.patch
+Patch1: %{name}-avserver.patch
URL: http://libav.org/
BuildRequires: SDL-devel >= 1.2.1
BuildRequires: alsa-lib-devel
@@ -234,8 +232,6 @@ dużej przestrzeni na dane skonfigurowanej w avserver.conf).
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > libav-avconfig
@@ -379,8 +375,6 @@ for a in libavutil/*/bswap.h; do
done
cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat
cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat
-# for lim-omx ffmpeg components
-cp -a libavcodec/audioconvert.h $RPM_BUILD_ROOT%{_includedir}/libavcodec
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/avserver
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/avserver
@@ -393,6 +387,9 @@ install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}/avqt-faststart
# simple to do (by querying pkgconfig), but why?
install -p libav-avconfig $RPM_BUILD_ROOT%{_bindir}/libav-avconfig
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/libav/*.html
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -423,17 +420,17 @@ fi
%defattr(644,root,root,755)
%doc CREDITS Changelog LICENSE README doc/{APIchanges,RELEASE_NOTES} %{?with_doc:doc/*.html}
%attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.54
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.55
%attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.54
%attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.3
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.4
%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.54
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.55
%attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libavresample.so.1
%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.52
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.53
%attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
diff --git a/libav-avserver.patch b/libav-avserver.patch
index a9acb0d..47a78a2 100644
--- a/libav-avserver.patch
+++ b/libav-avserver.patch
@@ -1,14 +1,14 @@
---- libav-9.1/configure.orig 2013-01-10 21:32:17.613593592 +0100
-+++ libav-9.1/configure 2013-01-11 22:20:57.565065216 +0100
-@@ -1782,7 +1782,7 @@
- avplay_deps="avcodec avformat avresample swscale sdl"
+--- libav-10/configure.orig 2014-03-29 19:25:18.992079006 +0100
++++ libav-10/configure 2014-03-29 19:47:21.502023509 +0100
+@@ -2040,7 +2040,7 @@
+ avplay_libs='$sdl_libs'
avplay_select="rdft"
avprobe_deps="avcodec avformat"
--avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
-+avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer static"
- avserver_extralibs='$ldl'
+-avserver_deps="avformat fork !shared"
++avserver_deps="avformat fork static"
+ avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
- doc_deps="texi2html"
+ # documentation
--- libav-9.1/Makefile.orig 2013-01-07 11:17:21.000000000 +0100
+++ libav-9.1/Makefile 2013-01-12 10:58:43.537450899 +0100
@@ -137,6 +137,8 @@
diff --git a/libav-gsm.patch b/libav-gsm.patch
deleted file mode 100644
index 4f37798..0000000
--- a/libav-gsm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libav-9.1/configure.orig 2013-01-10 20:51:10.110311689 +0100
-+++ libav-9.1/configure 2013-01-10 20:55:14.063639939 +0100
-@@ -3467,7 +3467,7 @@
- enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
- enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
- enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
--enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
-+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
- enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
- enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
---- ffmpeg-0.10/libavcodec/libgsm.c.orig 2012-01-26 23:15:59.000000000 +0100
-+++ ffmpeg-0.10/libavcodec/libgsm.c 2012-01-27 17:58:28.495275196 +0100
-@@ -27,7 +27,7 @@
-
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
--#include <gsm/gsm.h>
-+#include <gsm.h>
-
- #include "avcodec.h"
- #include "gsm.h"
diff --git a/libav-opencv24.patch b/libav-opencv24.patch
index eb1d133..349904f 100644
--- a/libav-opencv24.patch
+++ b/libav-opencv24.patch
@@ -1,11 +1,11 @@
---- libav-0.8.4/configure.orig 2012-12-22 17:53:05.373224102 +0100
-+++ libav-0.8.4/configure 2012-12-22 17:58:36.386550536 +0100
-@@ -2947,7 +2947,7 @@
- enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
--enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
-+enabled libopencv && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect
- enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
- enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
- enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
+--- libav-10/configure.orig 2014-03-29 19:14:54.328771887 +0100
++++ libav-10/configure 2014-03-29 19:19:19.158760770 +0100
+@@ -3937,7 +3937,7 @@
+ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
+ enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
+-enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
++enabled libopencv && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect
+ enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } ||
+ { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } }
+ enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
diff --git a/libav-openjpeg.patch b/libav-openjpeg.patch
deleted file mode 100644
index 988c6c2..0000000
--- a/libav-openjpeg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libav-9.1/configure.orig 2013-01-10 20:55:39.673639404 +0100
-+++ libav-9.1/configure 2013-01-10 20:59:51.676967488 +0100
-@@ -3473,7 +3473,7 @@
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- enabled libopencv && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect
--enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
-+enabled libopenjpeg && require_pkg_config libopenjpeg openjpeg.h opj_version
- enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
- enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
- enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libav.git/commitdiff/1e2aba2c6bc3546b375d1bc46c8c53a8537e6efb
More information about the pld-cvs-commit
mailing list