Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3934ef6372da598a7b9a0346b72cfcb728e0a421

commit 3934ef6372da598a7b9a0346b72cfcb728e0a421
Author: DeX77 <[email protected]>
Date:   Wed Aug 17 17:00:23 2016 +0200

xine-lib-1.2.6-10-x86_64

* fix rebuilt with new libxcb

diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild
index 8ac513f..8bfce1a 100644
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@ -18,12 +18,18 @@ makedepends=('optipng>=0.7.5' 'xmlto' 'x11-protos' 
'mesa>=11.1.0-3')
options=('scriptlet')
groups=('xlib')
archs=('i686' 'x86_64')
-sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5')
+source=("${source[@]}" \
+       xine-lib-xcb-1.12.patch )
+sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5' \
+          '890c8f044c0080bfb7d4b163061dd42621fc4df1')

build()
{
export CFLAGS="$CFLAGS -UHAVE_MMX"
-       Fbuild \
+       Fpatchall
+
+       Fautogen
+       Fmake \
--disable-optimizations \
--enable-ipv6 \
--enable-mmap \
@@ -66,6 +72,7 @@ build()
--with-theora \
--with-vorbis \
--with-wavpack
+       Fmakeinstall
}

# optimization OK
diff --git a/source/xlib/xine-lib/xine-lib-xcb-1.12.patch 
b/source/xlib/xine-lib/xine-lib-xcb-1.12.patch
new file mode 100644
index 0000000..cc17643
--- /dev/null
+++ b/source/xlib/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)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to