diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-29 10:32:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-29 10:32:50 +0000 |
| commit | bd0afbd401a1a4f95b3cb0c6c996ecb12865aece (patch) | |
| tree | b2e9ef09a545ae4e916cd45689f470c51d7b8e85 | |
| parent | f185187a9e4b09b3e6470ecc48bf260ac193b166 (diff) | |
| download | pkgsrc-bd0afbd401a1a4f95b3cb0c6c996ecb12865aece.tar.gz | |
Modular Xorg support.
| -rw-r--r-- | multimedia/xine-lib/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 8f2469bc19b..d8999b4dc0b 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -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 @@ BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 .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 --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 9c763a17f06..86edf42cc75 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -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 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" .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' |