summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorshattered <shattered@pkgsrc.org>2010-12-17 19:05:35 +0000
committershattered <shattered@pkgsrc.org>2010-12-17 19:05:35 +0000
commit83f2acf98cc9aa394da6b6ddbfd9e5e53055ac25 (patch)
tree40e96aec54b8413edd0a99e3e45582c123728565 /multimedia
parentb0715e38ed47066f73f263fb4ae2949d7b0f5bda (diff)
downloadpkgsrc-83f2acf98cc9aa394da6b6ddbfd9e5e53055ac25.tar.gz
PR/37694: add optional support for libcaca. Tested on 4.0/i386.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer-share/options.mk9
-rw-r--r--multimedia/mplayer/Makefile4
2 files changed, 9 insertions, 4 deletions
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 58be40b2d66..d50d41f2445 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.41 2010/09/16 18:56:12 wiz Exp $
+# $NetBSD: options.mk,v 1.42 2010/12/17 19:05:35 shattered Exp $
.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
@@ -27,7 +27,7 @@ PKG_SUGGESTED_OPTIONS+= mplayer-internal-faad
# Set options based on the specific package being built.
.if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+= aalib esound ggi mplayer-menu nas pulseaudio sdl
+PKG_SUPPORTED_OPTIONS+= aalib caca esound ggi mplayer-menu nas pulseaudio sdl
.if ${VDPAU_AVAILABLE} == "yes"
PKG_SUPPORTED_OPTIONS+= vdpau
@@ -115,6 +115,11 @@ EXTRA_LIBS+= -lartsc
CONFIGURE_ARGS+= --disable-arts
.endif
+.if !empty(PKG_OPTIONS:Mcaca)
+CONFIGURE_ARGS+= --enable-caca
+. include "../../graphics/libcaca/buildlink3.mk"
+.endif
+
.if !empty(PKG_OPTIONS:Mcdparanoia)
CONFIGURE_ARGS+= --enable-cdparanoia
. include "../../audio/cdparanoia/buildlink3.mk"
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index cfb65ac6680..2dd0c151b5a 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/11/23 12:31:29 tron Exp $
+# $NetBSD: Makefile,v 1.74 2010/12/17 19:05:35 shattered Exp $
PKGNAME= mplayer-${MPLAYER_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Fast, cross-platform movie player