rebudild xine-libs against ncurses

This commit is contained in:
AlmAck 2017-01-22 22:47:56 +00:00
parent 1c567bbb6a
commit 00b111eb08
2 changed files with 37 additions and 3 deletions

View File

@ -1,6 +1,6 @@
pkgname=xine-lib
pkgver=1.2.6
pkgrel=3
pkgrel=4
pkgdesc="A multimedia playback engine"
arch=('x86_64')
url="http://www.xine-project.org"
@ -27,8 +27,17 @@ optdepends=('imagemagick: for using the imagemagick plugin'
'libbluray: for using the bluray plugin'
'libvdpau: for using the VDPAU plugin'
'smbclient: for using the samba plugin' )
source=("http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz")
sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5')
source=("http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz"
xine-lib-xcb-1.12.patch)
sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5'
'890c8f044c0080bfb7d4b163061dd42621fc4df1')
prepare() {
cd $pkgname-$pkgver
# Fix build with xcb 1.12 (Gentoo)
patch -p1 -i ../xine-lib-xcb-1.12.patch
autoreconf -vi
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"

View File

@ -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)