Sun Feb 20 14:29:14 2011 UTC ()
Check for libXvMC (not +W) for enabling libxvmc support.
Fixes PR 44588 by Robert Elz.


(wiz)
diff -r1.65 -r1.66 pkgsrc/multimedia/xine-lib/Makefile.common
cvs diff -r1.65 -r1.66 pkgsrc/multimedia/xine-lib/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile.common 2010/07/28 09:24:14 1.65
+++ pkgsrc/multimedia/xine-lib/Makefile.common 2011/02/20 14:29:14 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.65 2010/07/28 09:24:14 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.66 2011/02/20 14:29:14 wiz Exp $
2# 2#
3 3
4# used by audio/xine-arts/Makefile 4# used by audio/xine-arts/Makefile
5# used by audio/xine-esound/Makefile 5# used by audio/xine-esound/Makefile
6# used by audio/xine-pulse/Makefile 6# used by audio/xine-pulse/Makefile
7 7
8DISTNAME= xine-lib-1.1.19 8DISTNAME= xine-lib-1.1.19
9XINE_PKGNAME= xine-lib-1.1.19 9XINE_PKGNAME= xine-lib-1.1.19
10PKGNAME?= ${XINE_PKGNAME} 10PKGNAME?= ${XINE_PKGNAME}
11CATEGORIES?= multimedia 11CATEGORIES?= multimedia
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
@@ -39,27 +39,27 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" @@ -39,27 +39,27 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p"
39 39
40PLIST_VARS+= xv xvmc 40PLIST_VARS+= xv xvmc
41.include "../../x11/libXv/buildlink3.mk" 41.include "../../x11/libXv/buildlink3.mk"
42.include "../../x11/libXvMC/buildlink3.mk" 42.include "../../x11/libXvMC/buildlink3.mk"
43 43
44.if ${X11_TYPE} == "modular" 44.if ${X11_TYPE} == "modular"
45PLIST.xv= yes 45PLIST.xv= yes
46PLIST.xvmc= yes 46PLIST.xvmc= yes
47.else 47.else
48.if exists(${X11BASE}/lib/libXv.so) 48.if exists(${X11BASE}/lib/libXv.so)
49CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib' 49CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib'
50PLIST.xv= yes 50PLIST.xv= yes
51.endif 51.endif
52.if exists(${X11BASE}/lib/libXvMCW.so) 52.if exists(${X11BASE}/lib/libXvMC.so)
53CONFIGURE_ARGS+= --with-xvmc-path='${X11BASE}/lib' 53CONFIGURE_ARGS+= --with-xvmc-path='${X11BASE}/lib'
54CONFIGURE_ARGS+= --with-xxmc-path='${X11BASE}/lib' 54CONFIGURE_ARGS+= --with-xxmc-path='${X11BASE}/lib'
55PLIST.xvmc= yes 55PLIST.xvmc= yes
56.endif 56.endif
57.endif # X11_TYPE 57.endif # X11_TYPE
58 58
59.include "../../mk/bsd.prefs.mk" 59.include "../../mk/bsd.prefs.mk"
60.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-4].*) 60.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-4].*)
61# --no-undefined causes errors if shlibs are not linked against libc 61# --no-undefined causes errors if shlibs are not linked against libc
62BUILDLINK_TRANSFORM+= "rm:-Wl,--no-undefined" 62BUILDLINK_TRANSFORM+= "rm:-Wl,--no-undefined"
63.endif 63.endif
64 64
65pre-configure: 65pre-configure: