[pkgsrc/trunk]: pkgsrc/multimedia Add x264 option and default it to on (since...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cf970c25a22
branches:  trunk
changeset: 539904:8cf970c25a22
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 16 11:56:48 2008 +0000

description:
Add x264 option and default it to on (since it occurs no additional
dependencies). Bump PKGREVISION.

diffstat:

 multimedia/gmplayer/Makefile        |   4 ++--
 multimedia/mencoder/Makefile        |   4 ++--
 multimedia/mplayer-share/options.mk |  12 +++++++++---
 multimedia/mplayer/Makefile         |   4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r 51e939a5105f -r 8cf970c25a22 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Sun Mar 16 09:28:20 2008 +0000
+++ b/multimedia/gmplayer/Makefile      Sun Mar 16 11:56:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2008/03/04 19:32:30 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2008/03/16 11:56:48 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 
 BROKEN_IN=             pkgsrc-2006Q4
 
diff -r 51e939a5105f -r 8cf970c25a22 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Sun Mar 16 09:28:20 2008 +0000
+++ b/multimedia/mencoder/Makefile      Sun Mar 16 11:56:48 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2008/02/05 17:00:36 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/16 11:56:49 wiz Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
diff -r 51e939a5105f -r 8cf970c25a22 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Sun Mar 16 09:28:20 2008 +0000
+++ b/multimedia/mplayer-share/options.mk       Sun Mar 16 11:56:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2008/02/24 22:24:34 jdc Exp $
+# $NetBSD: options.mk,v 1.28 2008/03/16 11:56:49 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -14,7 +14,7 @@
 
 # Options supported by both mplayer* or mencoder*.
 
-PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis debug
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264 debug
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=        oss
 .endif
@@ -71,7 +71,7 @@
 .for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
            lame mad mplayer-menu mplayer-real \
            mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
-           nas oss png sdl theora vorbis xvid
+           nas oss png sdl theora vorbis x264 xvid
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=        ${_o_}
 .  endif
@@ -272,6 +272,12 @@
 CONFIGURE_ARGS+=       --disable-libvorbis
 .endif
 
+.if !empty(PKG_OPTIONS:Mx264)
+CONFIGURE_ARGS+=       --enable-x264
+.else
+CONFIGURE_ARGS+=       --disable-x264
+.endif
+
 .if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=       --enable-xvid
 EXTRA_LIBS+=           -lxvidcore
diff -r 51e939a5105f -r 8cf970c25a22 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Sun Mar 16 09:28:20 2008 +0000
+++ b/multimedia/mplayer/Makefile       Sun Mar 16 11:56:48 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2008/02/26 17:16:24 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2008/03/16 11:56:49 wiz Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder