diff options
| author | dholland <dholland@pkgsrc.org> | 2008-07-29 05:58:41 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2008-07-29 05:58:41 +0000 |
| commit | 3c41e0a22919fe4c4bf84395cb6b5617f62e76dc (patch) | |
| tree | 9191c421393bb9866ce026ff1c372ac8a69f79f4 /multimedia | |
| parent | 9d60d2c5f108eadde217a5d932b19d08909770a8 (diff) | |
| download | pkgsrc-3c41e0a22919fe4c4bf84395cb6b5617f62e76dc.tar.gz | |
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 (limited to 'multimedia')
| -rw-r--r-- | multimedia/xine-lib/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 22 |
2 files changed, 14 insertions, 15 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 4cdea51ed4b..6ef256aec0c 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -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 @@ CONFIGURE_ARGS+= --disable-opengl .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 --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index cad0f8bc430..83492d3c2ac 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -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 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" .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 |