summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz>2016-05-23 16:21:27 +0000
committerwiz <wiz>2016-05-23 16:21:27 +0000
commitfe7e8d4eb078ecc247c7eb82e4c0ab4ff57e5d59 (patch)
treee47a3b8ab9ff16dc0ccac636ac4e049e54188b9f /multimedia
parent3f6395e2bb381f245feddac42c1f77ce457f958f (diff)
downloadpkgsrc-fe7e8d4eb078ecc247c7eb82e4c0ab4ff57e5d59.tar.gz
Fix build with libxcb-1.12.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/distinfo4
-rw-r--r--multimedia/xine-lib/patches/patch-src_video__out_Makefile.am11
2 files changed, 12 insertions, 3 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index e4f0bb1d914..66a5898aabd 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.103 2016/02/24 16:18:41 jperkin Exp $
+$NetBSD: distinfo,v 1.104 2016/05/23 16:21:27 wiz Exp $
SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
@@ -23,6 +23,6 @@ SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
-SHA1 (patch-src_video__out_Makefile.am) = c1d38c420efccdc68c0bd90f670b3075ad988188
+SHA1 (patch-src_video__out_Makefile.am) = 2ed9f980440bf20cbc52848113abd9160d43bf92
SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7
diff --git a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
index 36c504331d0..ddea3e68f76 100644
--- a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
+++ b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
@@ -1,9 +1,18 @@
-$NetBSD: patch-src_video__out_Makefile.am,v 1.1 2016/02/24 16:18:41 jperkin Exp $
+$NetBSD: patch-src_video__out_Makefile.am,v 1.2 2016/05/23 16:21:27 wiz Exp $
Libtool is unable to infer ObjC by itself.
--- src/video_out/Makefile.am.orig 2014-06-09 16:08:42.000000000 +0000
+++ src/video_out/Makefile.am
+@@ -147,7 +147,7 @@ xineplug_vo_out_xcbshm_la_LIBADD = $(YUV
+ 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)
@@ -241,3 +241,4 @@ xineplug_vo_out_raw_la_CFLAGS = $(AM_CFL
xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)