[arch-commits] Commit in xine-lib/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Sat Jan 21 00:57:05 UTC 2017
Date: Saturday, January 21, 2017 @ 00:57:04
Author: arojas
Revision: 287054
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xine-lib/repos/extra-i686/PKGBUILD
(from rev 287053, xine-lib/trunk/PKGBUILD)
xine-lib/repos/extra-i686/xine-lib-ffmpeg3.patch
(from rev 287053, xine-lib/trunk/xine-lib-ffmpeg3.patch)
xine-lib/repos/extra-i686/xine-lib-xcb-1.12.patch
(from rev 287053, xine-lib/trunk/xine-lib-xcb-1.12.patch)
xine-lib/repos/extra-x86_64/PKGBUILD
(from rev 287053, xine-lib/trunk/PKGBUILD)
xine-lib/repos/extra-x86_64/xine-lib-ffmpeg3.patch
(from rev 287053, xine-lib/trunk/xine-lib-ffmpeg3.patch)
xine-lib/repos/extra-x86_64/xine-lib-xcb-1.12.patch
(from rev 287053, xine-lib/trunk/xine-lib-xcb-1.12.patch)
Deleted:
xine-lib/repos/extra-i686/PKGBUILD
xine-lib/repos/extra-i686/xine-lib-ffmpeg3.patch
xine-lib/repos/extra-i686/xine-lib-xcb-1.12.patch
xine-lib/repos/extra-x86_64/PKGBUILD
xine-lib/repos/extra-x86_64/xine-lib-ffmpeg3.patch
xine-lib/repos/extra-x86_64/xine-lib-xcb-1.12.patch
--------------------------------------+
/PKGBUILD | 116 +++++++++++++++++++++++++++++++++
/xine-lib-ffmpeg3.patch | 110 +++++++++++++++++++++++++++++++
/xine-lib-xcb-1.12.patch | 50 ++++++++++++++
extra-i686/PKGBUILD | 59 ----------------
extra-i686/xine-lib-ffmpeg3.patch | 55 ---------------
extra-i686/xine-lib-xcb-1.12.patch | 25 -------
extra-x86_64/PKGBUILD | 59 ----------------
extra-x86_64/xine-lib-ffmpeg3.patch | 55 ---------------
extra-x86_64/xine-lib-xcb-1.12.patch | 25 -------
9 files changed, 276 insertions(+), 278 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-i686/PKGBUILD 2017-01-21 00:57:04 UTC (rev 287054)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.6
-pkgrel=11
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
- 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libdvdnav'
- 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu' 'gdk-pixbuf2')
-optdepends=('imagemagick: for using the imagemagick plugin' \
- 'jack: for using the jack plugin' \
- 'vcdimager: for using the vcd plugin' \
- 'glu: for using the opengl plugin' \
- 'wavpack: for using the wavpack plugin' \
- 'faad2: for using the faad plugin' \
- 'libmng: for using the mng plugin' \
- 'aalib: for using the aalib plugin' \
- 'libmodplug: for using the modplug plugin' \
- 'libdca: for using the dca plugin' \
- 'a52dec: for using the a52 plugin' \
- 'libmad: for using the mp3 plugin' \
- 'libdvdnav: for using the dvd plugin' \
- 'libmpcdec: for using the musepack plugin' \
- 'libcaca: for using the caca plugin' \
- 'libbluray: for using the bluray plugin' \
- 'gnome-vfs: for using the gnome-vfs plugin' \
- 'libvdpau: for using the VDPAU 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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \
- --disable-optimizations
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: xine-lib/repos/extra-i686/PKGBUILD (from rev 287053, xine-lib/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xine-lib
+pkgver=1.2.6
+pkgrel=12
+pkgdesc="A multimedia playback engine"
+arch=('i686' 'x86_64')
+url="http://www.xine-project.org"
+license=('LGPL' 'GPL')
+depends=('libxvmc' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+ 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libdvdnav'
+ 'libmpcdec' 'libcaca' 'libbluray' 'libvdpau' 'glu' 'gdk-pixbuf2')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+ 'jack: for using the jack plugin' \
+ 'vcdimager: for using the vcd plugin' \
+ 'glu: for using the opengl plugin' \
+ 'wavpack: for using the wavpack plugin' \
+ 'faad2: for using the faad plugin' \
+ 'libmng: for using the mng plugin' \
+ 'aalib: for using the aalib plugin' \
+ 'libmodplug: for using the modplug plugin' \
+ 'libdca: for using the dca plugin' \
+ 'a52dec: for using the a52 plugin' \
+ 'libmad: for using the mp3 plugin' \
+ 'libdvdnav: for using the dvd plugin' \
+ 'libmpcdec: for using the musepack plugin' \
+ 'libcaca: for using the caca plugin' \
+ 'libbluray: for using the bluray plugin' \
+ 'libvdpau: for using the VDPAU 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
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \
+ --disable-optimizations
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/xine-lib-ffmpeg3.patch
===================================================================
--- extra-i686/xine-lib-ffmpeg3.patch 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-i686/xine-lib-ffmpeg3.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -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");
Copied: xine-lib/repos/extra-i686/xine-lib-ffmpeg3.patch (from rev 287053, xine-lib/trunk/xine-lib-ffmpeg3.patch)
===================================================================
--- extra-i686/xine-lib-ffmpeg3.patch (rev 0)
+++ extra-i686/xine-lib-ffmpeg3.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,55 @@
+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");
Deleted: extra-i686/xine-lib-xcb-1.12.patch
===================================================================
--- extra-i686/xine-lib-xcb-1.12.patch 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-i686/xine-lib-xcb-1.12.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -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)
Copied: xine-lib/repos/extra-i686/xine-lib-xcb-1.12.patch (from rev 287053, xine-lib/trunk/xine-lib-xcb-1.12.patch)
===================================================================
--- extra-i686/xine-lib-xcb-1.12.patch (rev 0)
+++ extra-i686/xine-lib-xcb-1.12.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,25 @@
+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)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-x86_64/PKGBUILD 2017-01-21 00:57:04 UTC (rev 287054)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.6
-pkgrel=11
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
- 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libdvdnav'
- 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu' 'gdk-pixbuf2')
-optdepends=('imagemagick: for using the imagemagick plugin' \
- 'jack: for using the jack plugin' \
- 'vcdimager: for using the vcd plugin' \
- 'glu: for using the opengl plugin' \
- 'wavpack: for using the wavpack plugin' \
- 'faad2: for using the faad plugin' \
- 'libmng: for using the mng plugin' \
- 'aalib: for using the aalib plugin' \
- 'libmodplug: for using the modplug plugin' \
- 'libdca: for using the dca plugin' \
- 'a52dec: for using the a52 plugin' \
- 'libmad: for using the mp3 plugin' \
- 'libdvdnav: for using the dvd plugin' \
- 'libmpcdec: for using the musepack plugin' \
- 'libcaca: for using the caca plugin' \
- 'libbluray: for using the bluray plugin' \
- 'gnome-vfs: for using the gnome-vfs plugin' \
- 'libvdpau: for using the VDPAU 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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \
- --disable-optimizations
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: xine-lib/repos/extra-x86_64/PKGBUILD (from rev 287053, xine-lib/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xine-lib
+pkgver=1.2.6
+pkgrel=12
+pkgdesc="A multimedia playback engine"
+arch=('i686' 'x86_64')
+url="http://www.xine-project.org"
+license=('LGPL' 'GPL')
+depends=('libxvmc' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+ 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libdvdnav'
+ 'libmpcdec' 'libcaca' 'libbluray' 'libvdpau' 'glu' 'gdk-pixbuf2')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+ 'jack: for using the jack plugin' \
+ 'vcdimager: for using the vcd plugin' \
+ 'glu: for using the opengl plugin' \
+ 'wavpack: for using the wavpack plugin' \
+ 'faad2: for using the faad plugin' \
+ 'libmng: for using the mng plugin' \
+ 'aalib: for using the aalib plugin' \
+ 'libmodplug: for using the modplug plugin' \
+ 'libdca: for using the dca plugin' \
+ 'a52dec: for using the a52 plugin' \
+ 'libmad: for using the mp3 plugin' \
+ 'libdvdnav: for using the dvd plugin' \
+ 'libmpcdec: for using the musepack plugin' \
+ 'libcaca: for using the caca plugin' \
+ 'libbluray: for using the bluray plugin' \
+ 'libvdpau: for using the VDPAU 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
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \
+ --disable-optimizations
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/xine-lib-ffmpeg3.patch
===================================================================
--- extra-x86_64/xine-lib-ffmpeg3.patch 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-x86_64/xine-lib-ffmpeg3.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -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");
Copied: xine-lib/repos/extra-x86_64/xine-lib-ffmpeg3.patch (from rev 287053, xine-lib/trunk/xine-lib-ffmpeg3.patch)
===================================================================
--- extra-x86_64/xine-lib-ffmpeg3.patch (rev 0)
+++ extra-x86_64/xine-lib-ffmpeg3.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,55 @@
+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");
Deleted: extra-x86_64/xine-lib-xcb-1.12.patch
===================================================================
--- extra-x86_64/xine-lib-xcb-1.12.patch 2017-01-21 00:56:33 UTC (rev 287053)
+++ extra-x86_64/xine-lib-xcb-1.12.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -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)
Copied: xine-lib/repos/extra-x86_64/xine-lib-xcb-1.12.patch (from rev 287053, xine-lib/trunk/xine-lib-xcb-1.12.patch)
===================================================================
--- extra-x86_64/xine-lib-xcb-1.12.patch (rev 0)
+++ extra-x86_64/xine-lib-xcb-1.12.patch 2017-01-21 00:57:04 UTC (rev 287054)
@@ -0,0 +1,25 @@
+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)
More information about the arch-commits
mailing list