summaryrefslogtreecommitdiff
path: root/multimedia/xine-lib/patches
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2011-12-24 03:02:25 +0000
committersbd <sbd@pkgsrc.org>2011-12-24 03:02:25 +0000
commitfe5e27ada378f587a3b96b7f3d571837afbd64f6 (patch)
tree407fbe412fd04fefe2a766f09f527ddeb7ec9f65 /multimedia/xine-lib/patches
parent924ee567e20ecc4a83f4d0a1cca1214a96fa2000 (diff)
downloadpkgsrc-fe5e27ada378f587a3b96b7f3d571837afbd64f6.tar.gz
A simpler way to decide if -lXinerama is need is to use XINERAMA_LIBS which
gets its value from pkg-config. Also add 'automake' to USE_TOOLS and the pre-configure target.
Diffstat (limited to 'multimedia/xine-lib/patches')
-rw-r--r--multimedia/xine-lib/patches/patch-ap14
1 files changed, 2 insertions, 12 deletions
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
index 423e1c2f1f3..8826935ca91 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,23 +1,13 @@
-$NetBSD: patch-ap,v 1.10 2011/11/16 19:45:37 drochner Exp $
+$NetBSD: patch-ap,v 1.11 2011/12/24 03:02:25 sbd Exp $
--- src/dxr3/Makefile.am.orig 2011-10-04 21:42:53.000000000 +0000
+++ src/dxr3/Makefile.am
-@@ -17,6 +17,9 @@ endif
- if HAVE_LIBRTE
- link_rte = -lrte
- endif
-+if HAVE_XINERAMA
-+link_xinerama = -lXinerama
-+endif
-
- EXTRA_DIST = compat.c
-
@@ -45,7 +48,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
dxr3_scr.c \
video_out_dxr3.c
-xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
-+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
++xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm $(XINERAMA_LIBS)
xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
xineplug_vo_out_dxr3_la_LDFLAGS = $(xineplug_ldflags)