From 61e2b82c1783a1af75d3f4b92135cf7897c792fd Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Thu, 22 Sep 2016 16:48:32 +0200 Subject: [PATCH] xine-lib: unbreak w/ ffmpeg-3.x using BLFS patches --- srcpkgs/xine-lib/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 1c425edfad5..0b45df8e694 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,9 +1,7 @@ -broken="as always" - # Template file for 'xine-lib' pkgname=xine-lib version=1.2.6 -revision=7 +revision=8 build_style=gnu-configure configure_args=" --disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss" @@ -35,7 +33,18 @@ fi export cc_cv_attribute_visibility_protected=no pre_configure() { + # Hot fixes for building with ffmpeg-3.1.3 found at + # http://www.linuxfromscratch.org/blfs/view/svn/multimedia/xine-lib.html + sed -i src/combined/ffmpeg/ff_{audio,video}_decoder.c src/dxr3/ffmpeg_encoder.c \ + -e 's;avcodec_alloc_frame;av_frame_alloc;' \ + -e 's;avcodec_free_frame;av_frame_free;' + sed -i src/video_dec/image.c \ + -e 's;wand/magick_wand.h;ImageMagick-6/wand/MagickWand.h;' + sed -i m4/video_out.m4 \ + -e 's;\(xcb-shape >= 1.0\);xcb \1;' autoreconf -if + sed -i src/video_out/Makefile.in \ + -e '/xineplug_vo_out_xcbxv_la_LIBADD/s;$(XCB_LIBS);$(XCB_LIBS) $(XCBSHM_LIBS);' } libxine_package() {