[packages/libav] - up to 11 (new sonames, avserver is gone) - updated opencv24 patch - removed outdated avserver patc
qboosh
qboosh at pld-linux.org
Wed Sep 17 21:04:47 CEST 2014
commit 0e8da2d9b85344d2841953a1345d10dc58ef8435
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 17 21:04:40 2014 +0200
- up to 11 (new sonames, avserver is gone)
- updated opencv24 patch
- removed outdated avserver patch and config files
avserver.conf | 349 ---------------------------------------------------
avserver.init | 93 --------------
avserver.sysconfig | 1 -
libav-avserver.patch | 22 ----
libav-opencv24.patch | 10 +-
libav.spec | 107 +++++-----------
6 files changed, 38 insertions(+), 544 deletions(-)
---
diff --git a/libav.spec b/libav.spec
index de51553..597188c 100644
--- a/libav.spec
+++ b/libav.spec
@@ -1,4 +1,3 @@
-# TODO: avserver no longer supports daemon mode, so adjust init script
# NOTE: don't send it to Th unless you resolve libraries (incl. sonames) conflict with ffmpeg
# libav is a fork of ffmpeg; as of Dec 2012 they are not 100% compatible
# (e.g. libav didn't drop some deprecated APIs); ffmpeg 1.0.x seems more powerful than libav 0.8.x.
@@ -12,40 +11,45 @@
# Conditional build:
%bcond_with nonfree # non free options of package (currently: faac)
%bcond_with fdk_aac # AAC de/encoding via libfdk_aac (requires nonfree)
+%bcond_without bs2b # BS2B audio filter support
%bcond_without frei0r # frei0r video filtering
%bcond_without ilbc # iLBC de/encoding via WebRTC libilbc
%bcond_without opencv # OpenCV video filtering
%bcond_without pulseaudio # PulseAudio input support
%bcond_without x264 # x264 encoder
+%bcond_without x265 # H.265/HEVC x265 encoder
%bcond_without va # VAAPI (Video Acceleration API)
%bcond_without vpx # VP8, a high-quality video codec
%bcond_without wavpack # wavpack encoding support
%bcond_without webp # WebP encoding support
%bcond_without doc # don't build docs
+%ifnarch %{ix86} %{x8664} arm
+%undefine with_x265
+%endif
+%ifarch i386 i486
+%undefine with_x265
+%endif
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: 10.4
+Version: 11
Release: 0.1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (some filters, x264, xavs, xvid, x11grab)
+# (some filters, x264, x265, xavs, xvid, x11grab)
# using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
License: GPL v3+ with LGPL v3+ parts
Group: Libraries
Source0: http://libav.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 218bdfa1b2ff56c2a3daa2501c2e893f
-Source1: avserver.init
-Source2: avserver.sysconfig
-Source3: avserver.conf
+# Source0-md5: bfc894b3a2747212c2f48a38a468a15e
Patch0: %{name}-opencv24.patch
-Patch1: %{name}-avserver.patch
URL: http://libav.org/
BuildRequires: SDL-devel >= 1.2.1
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?with_nonfree:BuildRequires: faac-devel}
%{?with_fdk_aac:BuildRequires: fdk-aac-devel}
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
%{?with_frei0r:BuildRequires: frei0r-devel}
%ifarch ppc
@@ -55,6 +59,7 @@ BuildRequires: gcc >= 5:3.3.2-3
BuildRequires: gnutls-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lame-libs-devel >= 3.98.3
+%{?with_bs2b:BuildRequires: libbs2b-devel}
BuildRequires: libcdio-paranoia-devel >= 0.90-2
BuildRequires: libdc1394-devel >= 2
BuildRequires: libgsm-devel
@@ -69,6 +74,8 @@ BuildRequires: libvorbis-devel
%{?with_webp:BuildRequires: libwebp-devel}
# X264_BUILD >= 118
%{?with_x264:BuildRequires: libx264-devel >= 0.1.3-1.20111212_2245}
+# X265_BUILD >= 17
+%{?with_x265:BuildRequires: libx265-devel >= 1.3}
%ifarch %{ix86}
%ifnarch i386 i486
BuildRequires: nasm
@@ -89,6 +96,7 @@ BuildRequires: tar >= 1:1.22
%{?with_doc:BuildRequires: tetex}
%{?with_doc:BuildRequires: texi2html}
%{?with_doc:BuildRequires: texinfo}
+BuildRequires: twolame-devel
BuildRequires: vo-aacenc-devel
BuildRequires: vo-amrwbenc-devel
%{?with_wavpack:BuildRequires: wavpack-devel}
@@ -103,6 +111,7 @@ BuildRequires: zlib-devel
%{?with_vpx:Requires: libvpx >= 0.9.6}
%{?with_ilbc:Requires: webrtc-libilbc}
Requires: xvid >= 1:1.1.0
+Obsoletes: libav-avserver
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -137,9 +146,11 @@ Requires: alsa-lib-devel
Requires: bzip2-devel
%{?with_nonfree:Requires: faac-devel}
%{?with_fdk_aac:Requires: fdk-aac-devel}
+Requires: fontconfig-devel
Requires: freetype-devel
Requires: jack-audio-connection-kit-devel
Requires: lame-libs-devel >= 3.98.3
+%{?with_bs2b:Requires: libbs2b-devel}
Requires: libcdio-paranoia-devel >= 0.90-2
Requires: libdc1394-devel >= 2
Requires: libgsm-devel
@@ -151,12 +162,14 @@ Requires: libvorbis-devel
%{?with_vpx:Requires: libvpx-devel >= 0.9.6}
%{?with_webp:Requires: libwebp-devel}
%{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245}
+%{?with_x265:Requires: libx265-devel >= 1.3}
Requires: opencore-amr-devel
%{?with_opencv:Requires: opencv-devel}
Requires: openjpeg-devel >= 1.5
Requires: opus-devel
Requires: schroedinger-devel
Requires: speex-devel >= 1:1.2-rc1
+Requires: twolame-devel
Requires: vo-aacenc-devel
Requires: vo-amrwbenc-devel
%{?with_wavpack:Requires: wavpack-devel}
@@ -214,31 +227,9 @@ avplay to bardzo prosty i przenośny odtwarzacz mediów używający
bibliotek libav oraz biblioteki SDL. Jest używany głównie do
testowania różnych API libav.
-%package avserver
-Summary: avserver video server
-Summary(pl.UTF-8): avserver - serwer strumieni obrazu
-Group: Daemons
-Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{version}-%{release}
-Requires: rc-scripts >= 0.4.0.10
-
-%description avserver
-avserver is a streaming server for both audio and video. It supports
-several live feeds, streaming from files and time shifting on live
-feeds (you can seek to positions in the past on each live feed,
-provided you specify a big enough feed storage in avserver.conf).
-
-%description avserver -l pl.UTF-8
-avserver to serwer strumieni dla dźwięku i obrazu. Obsługuje kilka
-źródeł na żywo, przekazywanie strumieni z plików i przesuwanie w
-czasie dla źródeł na żywo (można przeskakiwać na położenia w
-przeszłości dla każdego źródła na żywo, pod warunkiem odpowiednio
-dużej przestrzeni na dane skonfigurowanej w avserver.conf).
-
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > libav-avconfig
@@ -314,9 +305,11 @@ EOF
--enable-gpl \
--enable-version3 \
%{?with_frei0r:--enable-frei0r} \
+ %{?with_bs2b:--enable-libbs2b} \
--enable-libcdio \
--enable-libdc1394 \
%{?with_fdk_aac:--enable-libfdk-aac} \
+ --enable-libfontconfig \
--enable-libfreetype \
--enable-libgsm \
%{?with_ilbc:--enable-libilbc} \
@@ -331,6 +324,7 @@ EOF
--enable-libschroedinger \
--enable-libspeex \
--enable-libtheora \
+ --enable-libtwolame \
--enable-libvo-aacenc \
--enable-libvo-amrwbenc \
--enable-libvorbis \
@@ -338,6 +332,7 @@ EOF
%{?with_wavpack:--enable-libwavpack} \
%{?with_webp:--enable-libwebp} \
%{?with_x264:--enable-libx264} \
+ %{?with_x265:--enable-libx265} \
--enable-libxavs \
--enable-libxvid \
--enable-pthreads \
@@ -366,9 +361,7 @@ EOF
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
- $RPM_BUILD_ROOT%{_includedir}/libav \
- $RPM_BUILD_ROOT/var/{cache,log}/avserver
+install -d $RPM_BUILD_ROOT%{_includedir}/libav
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -385,10 +378,6 @@ done
cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat
cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat
-install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/avserver
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/avserver
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/avserver.conf
-mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/avserver
install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}/avqt-faststart
# install as libav-avconfig to avoid with possible programs looking for
@@ -405,43 +394,23 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%pre avserver
-%groupadd -g 167 ffserver
-%useradd -g ffserver -u 167 ffserver
-
-%post avserver
-/sbin/chkconfig --add avserver
-%service avserver restart
-
-%preun avserver
-if [ "$1" = 0 ]; then
- %service avserver stop
- /sbin/chkconfig --del avserver
-fi
-
-%postun avserver
-if [ "$1" = 0 ]; then
- %userremove ffserver
- %groupremove ffserver
-fi
-
%files
%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.55
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.56
%attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.54
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.55
%attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.4
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.5
%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.55
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.56
%attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavresample.so.1
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.2
%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.53
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.54
%attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.3
%files devel
%defattr(644,root,root,755)
@@ -494,13 +463,3 @@ fi
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/avplay
%{?with_doc:%{_mandir}/man1/avplay.1*}
-
-%files avserver
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avserver.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/avserver
-%attr(755,root,root) %{_sbindir}/avserver
-%attr(754,root,root) /etc/rc.d/init.d/avserver
-%{?with_doc:%{_mandir}/man1/avserver.1*}
-%dir %attr(770,root,ffserver) /var/cache/avserver
-%dir %attr(770,root,ffserver) /var/log/avserver
diff --git a/avserver.conf b/avserver.conf
deleted file mode 100644
index 16584d9..0000000
--- a/avserver.conf
+++ /dev/null
@@ -1,349 +0,0 @@
-# Port on which the server is listening. You must select a different
-# port from your standard HTTP web server if it is running on the same
-# computer.
-Port 8090
-
-# Address on which the server is bound. Only useful if you have
-# several network interfaces.
-BindAddress 0.0.0.0
-
-# Number of simultaneous requests that can be handled. Since FFServer
-# is very fast, it is more likely that you will want to leave this high
-# and use MaxBandwidth, below.
-MaxClients 1000
-
-# This the maximum amount of kbit/sec that you are prepared to
-# consume when streaming to clients.
-MaxBandwidth 1000
-
-# Access log file (uses standard Apache log file format)
-# '-' is the standard output.
-CustomLog /var/log/avserver/access.log
-
-# Suppress that if you want to launch avserver as a daemon.
-#NoDaemon
-
-
-##################################################################
-# Definition of the live feeds. Each live feed contains one video
-# and/or audio sequence coming from an ffmpeg encoder or another
-# avserver. This sequence may be encoded simultaneously with several
-# codecs at several resolutions.
-
-<Feed feed1.ffm>
-
-# You must use 'ffmpeg' to send a live feed to avserver. In this
-# example, you can type:
-#
-# ffmpeg http://localhost:8090/feed1.ffm
-
-# avserver can also do time shifting. It means that it can stream any
-# previously recorded live stream. The request should contain:
-# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify
-# a path where the feed is stored on disk. You also specify the
-# maximum size of the feed, where zero means unlimited. Default:
-# File=/tmp/feed_name.ffm FileMaxSize=5M
-File /var/cache/avserver/feed1.ffm
-FileMaxSize 200K
-
-# You could specify
-# ReadOnlyFile /saved/specialvideo.ffm
-# This marks the file as readonly and it will not be deleted or updated.
-
-# Specify launch in order to start ffmpeg automatically.
-# First ffmpeg must be defined with an appropriate path if needed,
-# after that options can follow, but avoid adding the http:// field
-#Launch ffmpeg
-
-# Only allow connections from localhost to the feed.
-ACL allow 127.0.0.1
-
-</Feed>
-
-
-##################################################################
-# Now you can define each stream which will be generated from the
-# original audio and video stream. Each format has a filename (here
-# 'test1.mpg'). FFServer will send this stream when answering a
-# request containing this filename.
-
-<Stream test1.mpg>
-
-# coming from live feed 'feed1'
-Feed feed1.ffm
-
-# Format of the stream : you can choose among:
-# mpeg : MPEG-1 multiplexed video and audio
-# mpegvideo : only MPEG-1 video
-# mp2 : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec)
-# ogg : Ogg format (Vorbis audio codec)
-# rm : RealNetworks-compatible stream. Multiplexed audio and video.
-# ra : RealNetworks-compatible stream. Audio only.
-# mpjpeg : Multipart JPEG (works with Netscape without any plugin)
-# jpeg : Generate a single JPEG image.
-# asf : ASF compatible streaming (Windows Media Player format).
-# swf : Macromedia Flash compatible stream
-# avi : AVI format (MPEG-4 video, MPEG audio sound)
-# master : special ffmpeg stream used to duplicate a server
-Format mpeg
-
-# Bitrate for the audio stream. Codecs usually support only a few
-# different bitrates.
-AudioBitRate 32
-
-# Number of audio channels: 1 = mono, 2 = stereo
-AudioChannels 1
-
-# Sampling frequency for audio. When using low bitrates, you should
-# lower this frequency to 22050 or 11025. The supported frequencies
-# depend on the selected audio codec.
-AudioSampleRate 44100
-
-# Bitrate for the video stream
-VideoBitRate 64
-
-# Ratecontrol buffer size
-VideoBufferSize 40
-
-# Number of frames per second
-VideoFrameRate 3
-
-# Size of the video frame: WxH (default: 160x128)
-# The following abbreviations are defined: sqcif, qcif, cif, 4cif
-VideoSize 160x128
-
-# Transmit only intra frames (useful for low bitrates, but kills frame rate).
-#VideoIntraOnly
-
-# If non-intra only, an intra frame is transmitted every VideoGopSize
-# frames. Video synchronization can only begin at an intra frame.
-VideoGopSize 12
-
-# More MPEG-4 parameters
-# VideoHighQuality
-# Video4MotionVector
-
-# Choose your codecs:
-#AudioCodec mp2
-#VideoCodec mpeg1video
-
-# Suppress audio
-#NoAudio
-
-# Suppress video
-#NoVideo
-
-#VideoQMin 3
-#VideoQMax 31
-
-# Set this to the number of seconds backwards in time to start. Note that
-# most players will buffer 5-10 seconds of video, and also you need to allow
-# for a keyframe to appear in the data stream.
-#Preroll 15
-
-# ACL:
-
-# You can allow ranges of addresses (or single addresses)
-#ACL ALLOW <first address> <last address>
-
-# You can deny ranges of addresses (or single addresses)
-#ACL DENY <first address> <last address>
-
-# You can repeat the ACL allow/deny as often as you like. It is on a per
-# stream basis. The first match defines the action. If there are no matches,
-# then the default is the inverse of the last ACL statement.
-#
-# Thus 'ACL allow localhost' only allows access from localhost.
-# 'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
-# allow everybody else.
-
-</Stream>
-
-
-##################################################################
-# Example streams
-
-
-# Multipart JPEG
-
-#<Stream test.mjpg>
-#Feed feed1.ffm
-#Format mpjpeg
-#VideoFrameRate 2
-#VideoIntraOnly
-#NoAudio
-#Strict -1
-#</Stream>
-
-
-# Single JPEG
-
-#<Stream test.jpg>
-#Feed feed1.ffm
-#Format jpeg
-#VideoFrameRate 2
-#VideoIntraOnly
-##VideoSize 352x240
-#NoAudio
-#Strict -1
-#</Stream>
-
-
-# Flash
-
-#<Stream test.swf>
-#Feed feed1.ffm
-#Format swf
-#VideoFrameRate 2
-#VideoIntraOnly
-#NoAudio
-#</Stream>
-
-
-# ASF compatible
-
-<Stream test.asf>
-Feed feed1.ffm
-Format asf
-VideoFrameRate 15
-VideoSize 352x240
-VideoBitRate 256
-VideoBufferSize 40
-VideoGopSize 30
-AudioBitRate 64
-StartSendOnKey
-</Stream>
-
-
-# MP3 audio
-
-#<Stream test.mp3>
-#Feed feed1.ffm
-#Format mp2
-#AudioCodec mp3
-#AudioBitRate 64
-#AudioChannels 1
-#AudioSampleRate 44100
-#NoVideo
-#</Stream>
-
-
-# Ogg Vorbis audio
-
-#<Stream test.ogg>
-#Feed feed1.ffm
-#Title "Stream title"
-#AudioBitRate 64
-#AudioChannels 2
-#AudioSampleRate 44100
-#NoVideo
-#</Stream>
-
-
-# Real with audio only at 32 kbits
-
-#<Stream test.ra>
-#Feed feed1.ffm
-#Format rm
-#AudioBitRate 32
-#NoVideo
-#NoAudio
-#</Stream>
-
-
-# Real with audio and video at 64 kbits
-
-#<Stream test.rm>
-#Feed feed1.ffm
-#Format rm
-#AudioBitRate 32
-#VideoBitRate 128
-#VideoFrameRate 25
-#VideoGopSize 25
-#NoAudio
-#</Stream>
-
-
-##################################################################
-# A stream coming from a file: you only need to set the input
-# filename and optionally a new format. Supported conversions:
-# AVI -> ASF
-
-#<Stream file.rm>
-#File "/usr/local/httpd/htdocs/tlive.rm"
-#NoAudio
-#</Stream>
-
-#<Stream file.asf>
-#File "/usr/local/httpd/htdocs/test.asf"
-#NoAudio
-#Author "Me"
-#Copyright "Super MegaCorp"
-#Title "Test stream from disk"
-#Comment "Test comment"
-#</Stream>
-
-
-##################################################################
-# RTSP examples
-#
-# You can access this stream with the RTSP URL:
-# rtsp://localhost:5454/test1-rtsp.mpg
-#
-# A non-standard RTSP redirector is also created. Its URL is:
-# http://localhost:8090/test1-rtsp.rtsp
-
-#<Stream test1-rtsp.mpg>
-#Format rtp
-#File "/usr/local/httpd/htdocs/test1.mpg"
-#</Stream>
-
-
-##################################################################
-# SDP/multicast examples
-#
-# If you want to send your stream in multicast, you must set the
-# multicast address with MulticastAddress. The port and the TTL can
-# also be set.
-#
-# An SDP file is automatically generated by avserver by adding the
-# 'sdp' extension to the stream name (here
-# http://localhost:8090/test1-sdp.sdp). You should usually give this
-# file to your player to play the stream.
-#
-# The 'NoLoop' option can be used to avoid looping when the stream is
-# terminated.
-
-#<Stream test1-sdp.mpg>
-#Format rtp
-#File "/usr/local/httpd/htdocs/test1.mpg"
-#MulticastAddress 224.124.0.1
-#MulticastPort 5000
-#MulticastTTL 16
-#NoLoop
-#</Stream>
-
-
-##################################################################
-# Special streams
-
-# Server status
-
-<Stream stat.html>
-Format status
-
-# Only allow local people to get the status
-ACL allow localhost
-ACL allow 192.168.0.0 192.168.255.255
-
-#FaviconURL http://pond1.gladstonefamily.net:8080/favicon.ico
-</Stream>
-
-
-# Redirect index.html to the appropriate site
-
-<Redirect index.html>
-URL http://ffmpeg.sourceforge.net/index.php
-</Redirect>
-
-
diff --git a/avserver.init b/avserver.init
deleted file mode 100755
index 69e24b2..0000000
--- a/avserver.init
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# avserver FFserver video server
-#
-# chkconfig: 345 40 60
-#
-# description: FFserver video server
-#
-# $Id$
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Get network config
-. /etc/sysconfig/network
-
-# Get service config - may override defaults
-[ -f /etc/sysconfig/avserver ] && . /etc/sysconfig/avserver
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down avserver
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Check if the service is already running?
- if [ -f /var/lock/subsys/avserver ]; then
- msg_already_running avserver
- return
- fi
-
- msg_starting avserver
- daemon --user ffserver /usr/sbin/avserver
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/avserver
-}
-
-stop() {
- if [ ! -f /var/lock/subsys/avserver ]; then
- msg_not_running avserver
- return
- fi
-
- # Stop daemons.
- msg_stopping avserver
- killproc avserver
- rm -f /var/lock/subsys/avserver
-}
-
-condrestart() {
- if [ ! -f /var/lock/subsys/avserver ]; then
- msg_not_running avserver
- RETVAL=$1
- return
- fi
-
- stop
- start
-}
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status avserver
- RETVAL=$?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/avserver.sysconfig b/avserver.sysconfig
deleted file mode 100644
index 79688f8..0000000
--- a/avserver.sysconfig
+++ /dev/null
@@ -1 +0,0 @@
-# Customized settings for avserver
diff --git a/libav-avserver.patch b/libav-avserver.patch
deleted file mode 100644
index 47a78a2..0000000
--- a/libav-avserver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 fork !shared"
-+avserver_deps="avformat fork static"
- avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
-
- # 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 @@
-
- $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
-
-+avserver: FF_EXTRALIBS=-lavdevice -lavfilter libavformat/libavformat.a -lavresample -lavcodec -lswscale -lavutil $(EXTRALIBS)
-+
- $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
- $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
-
diff --git a/libav-opencv24.patch b/libav-opencv24.patch
index 349904f..5347df4 100644
--- a/libav-opencv24.patch
+++ b/libav-opencv24.patch
@@ -1,11 +1,11 @@
---- 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 @@
+--- libav-11/configure.orig 2014-09-17 17:19:14.132927699 +0200
++++ libav-11/configure 2014-09-17 17:21:06.126256333 +0200
+@@ -4150,7 +4150,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 libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC; } ||
+ { require_pkg_config libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; } }
enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libav.git/commitdiff/0e8da2d9b85344d2841953a1345d10dc58ef8435
More information about the pld-cvs-commit
mailing list