wok-next diff ffmpeg/receipt @ rev 20983

Small updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Sep 28 13:48:52 2018 +0300 (2018-09-28)
parents c4e53a39395a
children f48456621a9d
line diff
     1.1 --- a/ffmpeg/receipt	Fri Mar 02 12:12:14 2018 +0200
     1.2 +++ b/ffmpeg/receipt	Fri Sep 28 13:48:52 2018 +0300
     1.3 @@ -1,36 +1,31 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="ffmpeg"
     1.7 -VERSION="3.2.4"
     1.8 +VERSION="3.4.2"
     1.9  CATEGORY="multimedia"
    1.10  SHORT_DESC="Record, convert and stream audio and video"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12  LICENSE="GPL2 LGPL2.1"
    1.13  WEB_SITE="http://ffmpeg.org/"
    1.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/ffmpeg.html"
    1.15  
    1.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.17  WGET_URL="${WEB_SITE}releases/$TARBALL"
    1.18  
    1.19  BUILD_DEPENDS_arm="zlib-dev bzip2-dev yasm"
    1.20 -#BUILD_DEPENDS="libsdl-dev zlib-dev bzip2-dev coreutils-file-format \
    1.21 -#coreutils-file-special yasm"
    1.22  BUILD_DEPENDS="coreutils-file-format libass-dev fdk-aac-dev lame-dev opus-dev \
    1.23  libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev xorg-libX11-dev \
    1.24 -libsdl2-dev"
    1.25 -SPLIT="ffmpeg ffmpeg-dev ffserver ffplay"
    1.26 +libsdl2-dev yasm"
    1.27 +SPLIT="ffplay ffserver ffmpeg-dev ffmpeg"
    1.28  
    1.29 -# Rules to configure and make the package.
    1.30 -compile_rules()
    1.31 -{
    1.32 -	# http://www.linuxfromscratch.org/blfs/view/stable/multimedia/ffmpeg.html
    1.33 -
    1.34 -	# Handle cross compilation.
    1.35 +compile_rules() {
    1.36  	case "$ARCH" in
    1.37  		i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
    1.38  		arm*) ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
    1.39  			--cross-prefix=$HOST_SYSTEM-" ;;
    1.40  	esac
    1.41  
    1.42 +	sed -i 's|-lflite"|-lflite -lasound"|' configure
    1.43  	./configure \
    1.44  		--prefix=/usr \
    1.45  		--enable-gpl \
    1.46 @@ -49,40 +44,43 @@
    1.47  		--enable-libvpx \
    1.48  		--enable-libx264 \
    1.49  		--enable-libx265 \
    1.50 -		--enable-x11grab \
    1.51  		--docdir=/usr/share/doc/ffmpeg-$VERSION \
    1.52 +		\
    1.53  		--enable-runtime-cpudetect \
    1.54  		$ARCH_ARGS &&
    1.55 -
    1.56 -#		--enable-avresample \
    1.57 -#		--enable-pthreads \
    1.58 -#		--enable-small \
    1.59 -#		--enable-ffserver \
    1.60 -#		--disable-ffprobe \
    1.61 -#		--disable-encoder=h263 \
    1.62 -#		--disable-encoder=h263p \
    1.63 -#		--disable-encoder=mpeg2video \
    1.64 -#		--disable-encoder=msmpeg4v2 \
    1.65 -#		--disable-encoder=msmpeg4v3 \
    1.66 -#		--disable-symver \
    1.67 -#		--disable-doc \
    1.68 -
    1.69  	make &&
    1.70  	gcc tools/qt-faststart.c -o tools/qt-faststart &&
    1.71 -	make install &&
    1.72 -	install -v -m755 tools/qt-faststart $install/usr/bin &&
    1.73 -	docdir=$install/usr/share/doc/ffmpeg-$VERSION &&
    1.74 -	mkdir -p $docdir &&
    1.75 -	cp doc/*.txt $docdir
    1.76 +	make install || return 1
    1.77 +
    1.78 +	install -v -m755 tools/qt-faststart $install/usr/bin
    1.79 +	install -Dm644 $stuff/ffserver.conf $install/etc/ffserver.conf
    1.80 +
    1.81 +	cook_pick_docs doc/*.txt
    1.82  }
    1.83  
    1.84 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.85 -genpkg_rules()
    1.86 -{
    1.87 +genpkg_rules() {
    1.88  	case $PACKAGE in
    1.89 +		ffplay)
    1.90 +			copy ffplay
    1.91 +			CAT="multimedia|very simple and portable media player using the ffmpeg and the SDL library"
    1.92 +			TAGS="audio video player"
    1.93 +			DEPENDS="ffmpeg libsdl"
    1.94 +			;;
    1.95 +		ffserver)
    1.96 +			copy ffserver ffserver.conf
    1.97 +			CAT="multimedia|FFmpeg audio/video fast and small stream server"
    1.98 +			TAGS="audio video server"
    1.99 +			DEPENDS="ffmpeg"
   1.100 +			;;
   1.101 +		*-dev)
   1.102 +			copy @dev examples/
   1.103 +			DEPENDS="ffmpeg bzip2-dev fdk-aac-dev freetype-dev lame-dev \
   1.104 +			libass-dev libogg-dev libtheora-dev libvorbis-dev libvpx-dev \
   1.105 +			opus-dev x264-dev x265-dev xorg-libX11-dev xorg-libxcb-dev xz-dev \
   1.106 +			zlib-dev"
   1.107 +			;;
   1.108  		ffmpeg)
   1.109 -			copy @std
   1.110 -			rm -rf $fs/usr/share/$PACKAGE/examples/
   1.111 +			copy @std @rm
   1.112  			SUGGESTED="ffplay"
   1.113  			TAGS="audio video convert stream"
   1.114  			DEPENDS="bzlib fdk-aac freetype lame libass liblzma libtheora-enc \
   1.115 @@ -91,27 +89,5 @@
   1.116  				arm*) DEPENDS="alsa-lib bzip2 zlib" ;;
   1.117  			esac
   1.118  			;;
   1.119 -		ffplay)
   1.120 -			CAT="multimedia|Very simple and portable media player using the ffmpeg and the SDL library."
   1.121 -			TAGS="audio video player"
   1.122 -			DEPENDS="ffmpeg libsdl"
   1.123 -			mkdir -p $fs/usr/bin
   1.124 -			cp -a $install/usr/bin/ffplay $fs/usr/bin
   1.125 -			;;
   1.126 -		ffserver)
   1.127 -			CAT="multimedia|FFmpeg audio/video fast and small stream server."
   1.128 -			TAGS="audio video server"
   1.129 -			DEPENDS="ffmpeg"
   1.130 -			mkdir -p $fs/usr/bin $fs/etc
   1.131 -			cp ${stuff}/ffserver.conf $fs/etc
   1.132 -			cp -a $install/usr/bin/ffserver $fs/usr/bin
   1.133 -			;;
   1.134 -		*-dev)
   1.135 -			copy @dev examples/
   1.136 -			DEPENDS="ffmpeg bzip2-dev fdk-aac-dev freetype-dev lame-dev \
   1.137 -			libass-dev libogg-dev libtheora-dev libvorbis-dev libvpx-dev \
   1.138 -			opus-dev x264-dev x265-dev xorg-libX11-dev xorg-libxcb-dev xz-dev \
   1.139 -			zlib-dev"
   1.140 -			;;
   1.141  	esac
   1.142  }