# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1463665875 -7200
# Node ID 828d10d5e79701687e6e0a615fead3084d6f9aff
# Parent  7453cace358a1979caea73db73ee192e84168403
electricsheep, gejengel: ffmpeg > 2.4 support

diff -r 7453cace358a -r 828d10d5e797 audacity/receipt
--- a/audacity/receipt	Thu May 19 12:10:21 2016 +0200
+++ b/audacity/receipt	Thu May 19 15:51:15 2016 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-minsrc-$VERSION.tar.xz"
-WEB_SITE="http://audacity.sourceforge.net"
+WEB_SITE="http://www.audacityteam.org/"
 WGET_URL="$SF_MIRROR/project/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
 TAGS="sound audio recorder editor"
 
diff -r 7453cace358a -r 828d10d5e797 electricsheep/receipt
--- a/electricsheep/receipt	Thu May 19 12:10:21 2016 +0200
+++ b/electricsheep/receipt	Thu May 19 15:51:15 2016 +0200
@@ -16,7 +16,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i	-e 's/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/' \
 		-e 's/guess_format/av_guess_format/' \
 		-e 's/PKT_FLAG_KEY/AV_PKT_FLAG_KEY/' \
@@ -26,6 +25,9 @@
 		-e 's/av\(_write_header(output_ctx\)/avformat\1, NULL/' \
 		-e 's/av_alloc_format_context/avformat_alloc_context/' \
 		-e '/GNOME_SCREENSAVER/d' \
+		-e 's/av_new_stream(output_ctx, /avformat_new_stream(output_ctx, NULL); st->id = (/' \
+		-e 's/av_close_input_file(/avformat_close_input(\&/' \
+		-e 's/av_find_stream_info(ictx/avformat_find_stream_info(ictx,NULL/' \
 			electricsheep.c
 	mkdir -p $DESTDIR/usr/share/gconf/defaults
 	sed -i	-e '/update-gconf-defaults/d' \
@@ -47,4 +49,3 @@
 	rm -r $fs/usr/share/man
 	rm $fs/usr/share/electricsheep/electricsheep-wait.avi
 }
-
diff -r 7453cace358a -r 828d10d5e797 gejengel/receipt
--- a/gejengel/receipt	Thu May 19 12:10:21 2016 +0200
+++ b/gejengel/receipt	Thu May 19 15:51:15 2016 +0200
@@ -26,6 +26,8 @@
 		-e 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' \
 		-e 's/av_open_input_file\(.*\), NULL/avformat_open_input\1/' \
 		-e 's/avcodec_open(\([^)]*\)/avcodec_open2(\1, NULL/' \
+		-e 's/av_close_input_file(/avformat_close_input(\&/' \
+		-e 's/av_\(find_stream_info(m_pFormatContext\)/avformat_\1,NULL/' \
 			src/AudioDecoder/ffmpegdecoder.cpp
 	find . -name '*.h' -o -name '*.c*' | xargs sed -i 's|glibmm/i18n|glib/gi18n|'
 	./configure --enable-alsa --enable-ffmpeg --enable-flac \