diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 715a7bdfa..c455f3653 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=xine-lib
 pkgver=1.2.6
-pkgrel=9
+pkgrel=10
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
@@ -33,14 +33,18 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'gnome-vfs: for using the gnome-vfs 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)
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz xine-lib-ffmpeg3.patch xine-lib-xcb-1.12.patch)
 sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5'
-          'b4466616bb17142aef8aa1bb80fff67cd2d0d15d')
+          '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() {
diff --git a/extra/xine-lib/xine-lib-xcb-1.12.patch b/extra/xine-lib/xine-lib-xcb-1.12.patch
new file mode 100644
index 000000000..cc17643d9
--- /dev/null
+++ b/extra/xine-lib/xine-lib-xcb-1.12.patch
@@ -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)