wok rev 21570

updated ffmpeg, ffmpeg-dev and ffplay (2.8.10 -> 4.1.3)
author Hans-G?nter Theisgen
date Sat May 18 14:15:45 2019 +0100 (2019-05-18)
parents 87b6697bb350
children 5eafd9dd2344
files ffmpeg-dev/receipt ffmpeg/receipt ffplay/receipt
line diff
     1.1 --- a/ffmpeg-dev/receipt	Sat May 18 13:29:32 2019 +0200
     1.2 +++ b/ffmpeg-dev/receipt	Sat May 18 14:15:45 2019 +0100
     1.3 @@ -1,24 +1,26 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="ffmpeg-dev"
     1.7 -VERSION="2.8.10"
     1.8 +VERSION="4.1.3"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Record, convert and stream audio and video, development files."
    1.11 +SHORT_DESC="Record, convert and stream audio and video - development files."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="GPL2 LGPL2.1"
    1.14 -WEB_SITE="http://ffmpeg.org/"
    1.15 -WANTED="ffmpeg"
    1.16 -HOST_ARCH="i486 arm"
    1.17 +WEB_SITE="https://ffmpeg.org/"
    1.18  
    1.19  DEPENDS="ffmpeg pkg-config"
    1.20 +WANTED="ffmpeg"
    1.21 +
    1.22 +HOST_ARCH="i486 arm"
    1.23  
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26  {
    1.27 -	mkdir -p $fs/usr/lib $fs/usr/share/ffmpeg
    1.28 -	cp -a $install/usr/include $fs/usr
    1.29 -	#cp -a $install/usr/lib/*.a $fs/usr/lib
    1.30 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.31 +	mkdir -p $fs/usr/lib
    1.32 +	mkdir -p $fs/usr/share/ffmpeg
    1.33 +
    1.34 +	cp -a $install/usr/include		$fs/usr
    1.35 +	#cp -a $install/usr/lib/*.a		$fs/usr/lib
    1.36 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.37  	cp -a $install/usr/share/ffmpeg/examples $fs/usr/share/ffmpeg
    1.38  }
    1.39 -
     2.1 --- a/ffmpeg/receipt	Sat May 18 13:29:32 2019 +0200
     2.2 +++ b/ffmpeg/receipt	Sat May 18 14:15:45 2019 +0100
     2.3 @@ -1,30 +1,33 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="ffmpeg"
     2.7 -VERSION="2.8.10"
     2.8 +VERSION="4.1.3"
     2.9  CATEGORY="multimedia"
    2.10 +TAGS="audio video convert stream"
    2.11  SHORT_DESC="Record, convert and stream audio and video."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="GPL2 LGPL2.1"
    2.14 -WEB_SITE="http://ffmpeg.org/"
    2.15 +WEB_SITE="https://ffmpeg.org/"
    2.16 +
    2.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.18  WGET_URL="${WEB_SITE}releases/$TARBALL"
    2.19 +
    2.20 +SUGGESTED="ffplay"
    2.21 +DEPENDS="alsa-lib bzip2 gnutls harfbuzz lame libsdl2 libtasn1 libvorbis \
    2.22 +	libvpx nettle opus pcre rtmpdump x264 x265 xorg-libXau \
    2.23 +	xorg-libXdmcp zlib"
    2.24 +BUILD_DEPENDS="bzip2-dev coreutils-file-format coreutils-file-special \
    2.25 +	gnutls-dev harfbuzz-dev lame-dev libgnutls libsdl2-dev \
    2.26 +	libvorbis-dev libvpx-dev nettle-dev opus-dev pcre-dev \
    2.27 +	rtmpdump-dev x264-dev x265-dev xorg-libXau-dev xorg-libXdmcp-dev \
    2.28 +	yasm zlib-dev"
    2.29 +
    2.30  HOST_ARCH="i486 arm"
    2.31  
    2.32 -SUGGESTED="ffplay"
    2.33 -TAGS="audio video convert stream"
    2.34 -
    2.35 -DEPENDS="alsa-lib libsdl bzip2 zlib libvorbis x264 x265 gnutls libvpx opus \
    2.36 -lame rtmpdump harfbuzz xorg-libXau xorg-libXdmcp pcre libtasn1 nettle"
    2.37 -BUILD_DEPENDS="libsdl-dev zlib-dev bzip2-dev coreutils-file-format \
    2.38 -libvorbis-dev x264-dev x265-dev gnutls-dev libvpx-dev opus-dev lame-dev \
    2.39 -rtmpdump-dev harfbuzz-dev xorg-libXau-dev xorg-libXdmcp-dev pcre-dev \
    2.40 -nettle-dev coreutils-file-special yasm libgnutls"
    2.41 -
    2.42  case "$SLITAZ_ARCH" in
    2.43 -	arm*) DEPENDS="alsa-lib libsdl bzip2 zlib libvorbis x264 x265 gnutls \
    2.44 -		libvpx opus lame rtmpdump harfbuzz xorg-libXau xorg-libXdmcp \
    2.45 -		pcre libtasn1 nettle" ;;
    2.46 +	arm*) DEPENDS="alsa-lib bzip2 gnutls harfbuzz lame libsdl2 libvorbis \
    2.47 +		libtasn1 libvpx nettle opus pcre rtmpdump x264 x265 \
    2.48 +		xorg-libXau xorg-libXdmcp zlib" ;;
    2.49  esac
    2.50  
    2.51  # Handle cross compilation. Host coreutils-file-* are used
    2.52 @@ -32,7 +35,7 @@
    2.53  	i?86) 
    2.54  		ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
    2.55  	arm*) 
    2.56 -		BUILD_DEPENDS="zlib-dev bzip2-dev yasm" 
    2.57 +		BUILD_DEPENDS="bzip2-dev yasm zlib-dev" 
    2.58  		ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
    2.59  		--cross-prefix=$HOST_SYSTEM-" ;;
    2.60  esac
    2.61 @@ -40,23 +43,24 @@
    2.62  # Rules to configure and make the package.
    2.63  compile_rules()
    2.64  {
    2.65 -	./configure \
    2.66 -		--prefix=/usr \
    2.67 -		--enable-gpl \
    2.68 -		--enable-nonfree \
    2.69 -		--enable-shared \
    2.70 -		--disable-static \
    2.71 -		--disable-doc \
    2.72 -		--enable-libfreetype \
    2.73 -		--enable-libmp3lame \
    2.74 -		--enable-libopus \
    2.75 -		--enable-libvorbis \
    2.76 -		--enable-libvpx \
    2.77 -		--enable-libx264 \
    2.78 -		--enable-libx265 \
    2.79 -		--enable-gnutls \
    2.80 +	./configure			\
    2.81 +		--prefix=/usr		\
    2.82 +		--enable-gpl		\
    2.83 +		--enable-nonfree	\
    2.84 +		--enable-shared		\
    2.85 +		--disable-static	\
    2.86 +		--disable-doc		\
    2.87 +		--enable-libfreetype	\
    2.88 +		--enable-libmp3lame	\
    2.89 +		--enable-libopus	\
    2.90 +		--enable-libvorbis	\
    2.91 +		--enable-libvpx		\
    2.92 +		--enable-libx264	\
    2.93 +		--enable-libx265	\
    2.94 +		--enable-gnutls		\
    2.95  		${ARCH_ARGS} &&
    2.96 -	make && make install
    2.97 +	make &&
    2.98 +	make install
    2.99  }
   2.100  
   2.101  # Rules to gen a SliTaz package suitable for Tazpkg.
   2.102 @@ -66,8 +70,10 @@
   2.103  		$fs/usr/bin \
   2.104  		$fs/usr/lib \
   2.105  		$fs/usr/share
   2.106 -	cp -a $install/usr/lib/*so* $fs/usr/lib
   2.107 -	cp -a $install/usr/bin/ffmpeg $fs/usr/bin
   2.108 -	cp -a $install/usr/share/$PACKAGE $fs/usr/share
   2.109 +
   2.110 +	cp -a $install/usr/lib/*so*		$fs/usr/lib
   2.111 +	cp -a $install/usr/bin/ffmpeg		$fs/usr/bin
   2.112 +	cp -a $install/usr/share/$PACKAGE	$fs/usr/share
   2.113 +
   2.114  	rm -rf $fs/usr/share/$PACKAGE/examples
   2.115  }
     3.1 --- a/ffplay/receipt	Sat May 18 13:29:32 2019 +0200
     3.2 +++ b/ffplay/receipt	Sat May 18 14:15:45 2019 +0100
     3.3 @@ -1,18 +1,19 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="ffplay"
     3.7 -VERSION="2.8.10"
     3.8 +VERSION="4.1.3"
     3.9  CATEGORY="multimedia"
    3.10 +TAGS="audio video player"
    3.11  SHORT_DESC="Very simple and portable media player using the ffmpeg and the SDL library."
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="GPL2 LGPL2.1"
    3.14 -WEB_SITE="http://ffmpeg.org/"
    3.15 +WEB_SITE="https://ffmpeg.org/"
    3.16 +
    3.17 +DEPENDS="ffmpeg libsdl2"
    3.18  WANTED="ffmpeg"
    3.19 -TAGS="audio video player"
    3.20 +
    3.21  #HOST_ARCH="i486 arm"
    3.22  
    3.23 -DEPENDS="ffmpeg libsdl"
    3.24 -
    3.25  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.26  genpkg_rules()
    3.27  {