[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Modular Xorg support.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e04a7316287
branches:  trunk
changeset: 524648:1e04a7316287
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 29 10:32:50 2007 +0000

description:
Modular Xorg support.

diffstat:

 multimedia/xine-lib/Makefile        |  5 +++--
 multimedia/xine-lib/Makefile.common |  7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r d51385abff9d -r 1e04a7316287 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Mon Jan 29 10:31:48 2007 +0000
+++ b/multimedia/xine-lib/Makefile      Mon Jan 29 10:32:50 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2007/01/17 23:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/01/29 10:32:50 joerg Exp $
 
 .include "Makefile.common"
-PKGREVISION=           3
+PKGREVISION=           4
 
 COMMENT=               Multimedia player library
 
@@ -38,6 +38,7 @@
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../sysutils/vcdimager-devel/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d51385abff9d -r 1e04a7316287 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Mon Jan 29 10:31:48 2007 +0000
+++ b/multimedia/xine-lib/Makefile.common       Mon Jan 29 10:32:50 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2006/12/08 18:47:41 drochner Exp $
+# $NetBSD: Makefile.common,v 1.38 2007/01/29 10:32:50 joerg Exp $
 #
 
 DISTNAME=              xine-lib-${XINE_LIB_VER}
@@ -32,7 +32,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !exists(${X11BASE}/lib/libXv.so)
+.if ${X11_TYPE} != "native"
+.include "../../x11/libXv/buildlink3.mk"
+PLIST_SUBST+=          HAVE_XV=
+.elif !exists(${X11BASE}/lib/libXv.so)
 PLIST_SUBST+=          HAVE_XV="@comment "
 .else
 CONFIGURE_ARGS+=       --with-xv-path='${X11BASE}/lib'