[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Rearrange how libXv and libXvMC ar...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20a3a8b86454
branches:  trunk
changeset: 545234:20a3a8b86454
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Tue Jul 29 05:58:41 2008 +0000

description:
Rearrange how libXv and libXvMC are probed in order to work properly on
systems with libXvMC.so but no libXvMCW.so.
Also add missing dependence on libX11. Thus, PKGREVISION++.

diffstat:

 multimedia/xine-lib/Makefile        |   7 +++----
 multimedia/xine-lib/Makefile.common |  22 +++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diffs (70 lines):

diff -r fd73b0b99b75 -r 20a3a8b86454 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Tue Jul 29 05:18:08 2008 +0000
+++ b/multimedia/xine-lib/Makefile      Tue Jul 29 05:58:41 2008 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2008/07/21 00:11:34 dholland Exp $
+# $NetBSD: Makefile,v 1.63 2008/07/29 05:58:41 dholland Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=           1
+PKGREVISION=           2
 
 COMMENT=               Multimedia player library
 
@@ -46,8 +46,7 @@
 .include "../../sysutils/vcdimager-devel/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fd73b0b99b75 -r 20a3a8b86454 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Tue Jul 29 05:18:08 2008 +0000
+++ b/multimedia/xine-lib/Makefile.common       Tue Jul 29 05:58:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2008/07/21 00:11:34 dholland Exp $
+# $NetBSD: Makefile.common,v 1.55 2008/07/29 05:58:41 dholland Exp $
 #
 
 # used by audio/xine-arts/Makefile
@@ -38,24 +38,24 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=           xv
+PLIST_VARS+=           xv xvmc
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+
 .if ${X11_TYPE} == "modular"
-.  include "../../x11/libXv/buildlink3.mk"
-.endif
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/libXv.so)
+PLIST.xv=              yes
+PLIST.xvmc=            yes
+.else
+.if exists(${X11BASE}/lib/libXv.so)
 CONFIGURE_ARGS+=       --with-xv-path='${X11BASE}/lib'
 PLIST.xv=              yes
 .endif
-
-PLIST_VARS+=           xvmc
-.if ${X11_TYPE} == "modular"
-.  include "../../x11/libXvMC/buildlink3.mk"
-.endif
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/libXvMC.so)
+.if exists(${X11BASE}/lib/libXvMCW.so)
 CONFIGURE_ARGS+=       --with-xvmc-path='${X11BASE}/lib'
 CONFIGURE_ARGS+=       --with-xxmc-path='${X11BASE}/lib'
 PLIST.xvmc=            yes
 .endif
+.endif # X11_TYPE
 
 pre-configure:
        cd ${WRKSRC} && autoconf