diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index bd3625388..38d803cf2 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -5,8 +5,8 @@ # - disabled vdpau pkgname=xine-lib -pkgver=1.2.6 -pkgrel=13 +pkgver=1.2.8 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -32,19 +32,8 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libbluray: for using the bluray plugin' \ 'smbclient: for using the samba plugin' \ 'gdk-pixbuf2: for using the gdk-pixbuf plugin') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz xine-lib-ffmpeg3.patch xine-lib-xcb-1.12.patch) -sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5' - 'b4466616bb17142aef8aa1bb80fff67cd2d0d15d' - '890c8f044c0080bfb7d4b163061dd42621fc4df1') - -prepare() { - cd $pkgname-$pkgver -# Fix build with ffmpeg 3.0 (Gentoo) - patch -p1 -i ../xine-lib-ffmpeg3.patch -# Fix build with xcb 1.12 (Gentoo) - patch -p1 -i ../xine-lib-xcb-1.12.patch - autoreconf -vi -} +source=(https://xine-lib.alioth.debian.org/releases/xine-lib-$pkgver.tar.xz) +sha1sums=('f20115ddfced42d51feb159393607b17e6f2bdc1') build() { cd ${pkgname}-${pkgver} diff --git a/extra/xine-lib/xine-lib-ffmpeg3.patch b/extra/xine-lib/xine-lib-ffmpeg3.patch deleted file mode 100644 index f0cbc4748..000000000 --- a/extra/xine-lib/xine-lib-ffmpeg3.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c -=================================================================== ---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c -+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c -@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec - int got_frame; - float gain = this->class->gain; - if (!this->av_frame) -- this->av_frame = avcodec_alloc_frame (); -+ this->av_frame = av_frame_alloc (); - - consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); - if ((consumed >= 0) && got_frame) { -@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode - /* try to reset the wma decoder */ - if( this->decoder_ok ) { - #if AVAUDIO > 3 -- avcodec_free_frame (&this->av_frame); -+ av_frame_free (&this->av_frame); - #endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); -@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco - - if( this->context && this->decoder_ok ) { - #if AVAUDIO > 3 -- avcodec_free_frame (&this->av_frame); -+ av_frame_free (&this->av_frame); - #endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); -Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c -=================================================================== ---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c -+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c -@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl - this->stream = stream; - this->class = (ff_video_class_t *) class_gen; - -- this->av_frame = avcodec_alloc_frame(); -+ this->av_frame = av_frame_alloc(); - this->context = avcodec_alloc_context(); - this->context->opaque = this; - #if AVPALETTE == 1 ---- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 -+++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 -@@ -161,7 +161,7 @@ - "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); - return 0; - } -- this->picture = avcodec_alloc_frame(); -+ this->picture = av_frame_alloc(); - if (!this->picture) { - xprintf(drv->class->xine, XINE_VERBOSITY_LOG, - "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); diff --git a/extra/xine-lib/xine-lib-xcb-1.12.patch b/extra/xine-lib/xine-lib-xcb-1.12.patch deleted file mode 100644 index cc17643d9..000000000 --- a/extra/xine-lib/xine-lib-xcb-1.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.xine-project.org/show_bug.cgi?id=572 -https://bugs.gentoo.org/584640 - ---- xine-lib-1.2.6/m4/video_out.m4 -+++ xine-lib-1.2.6/m4/video_out.m4 -@@ -305,7 +305,7 @@ - dnl xcb - XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins]) - if test x"$with_xcb" != x"no"; then -- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no]) -+ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no]) - if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then - AC_MSG_ERROR([XCB support requested, but XCB not found]) - elif test x"$have_xcb" = x"yes"; then ---- xine-lib-1.2.6/src/video_out/Makefile.am -+++ xine-lib-1.2.6/src/video_out/Makefile.am -@@ -147,7 +147,7 @@ - xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS) - - xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD) --xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) -+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS) - xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS) - - xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)