Sun Mar 16 11:56:49 2008 UTC ()
Add x264 option and default it to on (since it occurs no additional
dependencies). Bump PKGREVISION.


(wiz)
diff -r1.68 -r1.69 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.37 -r1.38 pkgsrc/multimedia/mencoder/Makefile
diff -r1.53 -r1.54 pkgsrc/multimedia/mplayer/Makefile
diff -r1.27 -r1.28 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.68 -r1.69 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2008/03/04 19:32:30 1.68
+++ pkgsrc/multimedia/gmplayer/Makefile 2008/03/16 11:56:48 1.69
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.68 2008/03/04 19:32:30 jlam Exp $ 1# $NetBSD: Makefile,v 1.69 2008/03/16 11:56:48 wiz Exp $
2 2
3# 3#
4# NOTE: if you are updating both mplayer and gmplayer, you must ensure 4# NOTE: if you are updating both mplayer and gmplayer, you must ensure
5# that *both* distinfo files contain the correct, up-to-date files and 5# that *both* distinfo files contain the correct, up-to-date files and
6# checksums. 6# checksums.
7# 7#
8# NOTE: patches are shared between mplayer and gmplayer! 8# NOTE: patches are shared between mplayer and gmplayer!
9# 9#
10 10
11PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} 11PKGNAME= gmplayer-${MPLAYER_PKG_VERSION}
12PKGREVISION= 3 12PKGREVISION= 4
13 13
14BROKEN_IN= pkgsrc-2006Q4 14BROKEN_IN= pkgsrc-2006Q4
15 15
16SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ 16SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
17 http://www2.mplayerhq.hu/MPlayer/skins/ \ 17 http://www2.mplayerhq.hu/MPlayer/skins/ \
18 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \ 18 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \
19 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ 19 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \
20 http://ftp5.mplayerhq.hu/MPlayer/skins/ \ 20 http://ftp5.mplayerhq.hu/MPlayer/skins/ \
21 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ \ 21 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ \
22 ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/mplayer/ \ 22 ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/mplayer/ \
23 ${MASTER_SITE_LOCAL:=mplayer/} 23 ${MASTER_SITE_LOCAL:=mplayer/}
24 24
25PKG_DESTDIR_SUPPORT= user-destdir 25PKG_DESTDIR_SUPPORT= user-destdir
cvs diff -r1.37 -r1.38 pkgsrc/multimedia/mencoder/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mencoder/Makefile 2008/02/05 17:00:36 1.37
+++ pkgsrc/multimedia/mencoder/Makefile 2008/03/16 11:56:49 1.38
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.37 2008/02/05 17:00:36 drochner Exp $ 1# $NetBSD: Makefile,v 1.38 2008/03/16 11:56:49 wiz Exp $
2 2
3PKGNAME= mencoder-${MPLAYER_PKG_VERSION} 3PKGNAME= mencoder-${MPLAYER_PKG_VERSION}
4 4
5PKGREVISION= 1 5PKGREVISION= 2
6 6
7COMMENT= Simple movie encoder for MPlayer-playable movies 7COMMENT= Simple movie encoder for MPlayer-playable movies
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../multimedia/mplayer-share/Makefile.common" 11.include "../../multimedia/mplayer-share/Makefile.common"
12 12
13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
14 14
15BUILD_TARGET= mencoder 15BUILD_TARGET= mencoder
16 16
17MANCOMPRESSED_IF_MANZ= 1 17MANCOMPRESSED_IF_MANZ= 1
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
cvs diff -r1.53 -r1.54 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2008/02/26 17:16:24 1.53
+++ pkgsrc/multimedia/mplayer/Makefile 2008/03/16 11:56:49 1.54
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.53 2008/02/26 17:16:24 joerg Exp $ 1# $NetBSD: Makefile,v 1.54 2008/03/16 11:56:49 wiz Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_PKG_VERSION} 3PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
4PKGREVISION= 2 4PKGREVISION= 3
5 5
6COMMENT= Software-only MPEG-1/2/4 video decoder 6COMMENT= Software-only MPEG-1/2/4 video decoder
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../multimedia/mplayer-share/Makefile.common" 10.include "../../multimedia/mplayer-share/Makefile.common"
11 11
12CONFIGURE_ARGS+= --disable-mencoder 12CONFIGURE_ARGS+= --disable-mencoder
13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
14 14
15# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not 15# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
16# ${X11_BASE}, so we need to also look for headers in this path. 16# ${X11_BASE}, so we need to also look for headers in this path.
17.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386" 17.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2008/02/24 22:24:34 1.27
+++ pkgsrc/multimedia/mplayer-share/options.mk 2008/03/16 11:56:49 1.28
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: options.mk,v 1.27 2008/02/24 22:24:34 jdc Exp $ 1# $NetBSD: options.mk,v 1.28 2008/03/16 11:56:49 wiz Exp $
2 2
3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) 3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
4 4
5# Note: This expression is the same as ${PKGBASE}, but the latter is 5# Note: This expression is the same as ${PKGBASE}, but the latter is
6# not defined yet, so we cannot use it here. 6# not defined yet, so we cannot use it here.
7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
8 8
9.include "../../mk/oss.buildlink3.mk" 9.include "../../mk/oss.buildlink3.mk"
10 10
11# ------------------------------------------------------------------------- 11# -------------------------------------------------------------------------
12# Define PKG_SUPPORTED_OPTIONS based on the current package and system. 12# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
13# ------------------------------------------------------------------------- 13# -------------------------------------------------------------------------
14 14
15# Options supported by both mplayer* or mencoder*. 15# Options supported by both mplayer* or mencoder*.
16 16
17PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis debug 17PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264 debug
18.if ${OSS_TYPE} != "none" 18.if ${OSS_TYPE} != "none"
19PKG_SUPPORTED_OPTIONS+= oss 19PKG_SUPPORTED_OPTIONS+= oss
20.endif 20.endif
21 21
22# Set options based on the specific package being built. 22# Set options based on the specific package being built.
23.if !empty(PKGNAME:M*mplayer*) 23.if !empty(PKGNAME:M*mplayer*)
24PKG_OPTIONS_OPTIONAL_GROUPS= faadgroup 24PKG_OPTIONS_OPTIONAL_GROUPS= faadgroup
25PKG_OPTIONS_GROUP.faadgroup= faad mplayer-internal-faad 25PKG_OPTIONS_GROUP.faadgroup= faad mplayer-internal-faad
26PKG_SUGGESTED_OPTIONS+= mplayer-internal-faad 26PKG_SUGGESTED_OPTIONS+= mplayer-internal-faad
27 27
28PKG_SUPPORTED_OPTIONS+= aalib esound ggi mplayer-menu nas sdl 28PKG_SUPPORTED_OPTIONS+= aalib esound ggi mplayer-menu nas sdl
29 29
30. if ${OPSYS} != "SunOS" 30. if ${OPSYS} != "SunOS"
@@ -61,27 +61,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-ssse3 @@ -61,27 +61,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-ssse3
61.endif 61.endif
62.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ 62.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
63 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" 63 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
64PKG_SUPPORTED_OPTIONS+= xvid 64PKG_SUPPORTED_OPTIONS+= xvid
65.endif 65.endif
66 66
67# ------------------------------------------------------------------------- 67# -------------------------------------------------------------------------
68# Define PKG_SUGGESTED_OPTIONS. 68# Define PKG_SUGGESTED_OPTIONS.
69# ------------------------------------------------------------------------- 69# -------------------------------------------------------------------------
70 70
71.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \ 71.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
72 lame mad mplayer-menu mplayer-real \ 72 lame mad mplayer-menu mplayer-real \
73 mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \ 73 mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
74 nas oss png sdl theora vorbis xvid 74 nas oss png sdl theora vorbis x264 xvid
75. if !empty(PKG_SUPPORTED_OPTIONS:M${_o_}) 75. if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
76PKG_SUGGESTED_OPTIONS+= ${_o_} 76PKG_SUGGESTED_OPTIONS+= ${_o_}
77. endif 77. endif
78.endfor 78.endfor
79.if ${OPSYS} == "Linux" 79.if ${OPSYS} == "Linux"
80PKG_SUGGESTED_OPTIONS+= vidix 80PKG_SUGGESTED_OPTIONS+= vidix
81.endif 81.endif
82 82
83# ------------------------------------------------------------------------- 83# -------------------------------------------------------------------------
84# Handle extra libraries (part 1) 84# Handle extra libraries (part 1)
85# ------------------------------------------------------------------------- 85# -------------------------------------------------------------------------
86EXTRA_LIBS= 86EXTRA_LIBS=
87 87
@@ -262,26 +262,32 @@ CONFIGURE_ARGS+= --disable-theora @@ -262,26 +262,32 @@ CONFIGURE_ARGS+= --disable-theora
262 262
263# disable vidix if not in options 263# disable vidix if not in options
264.if empty(PKG_OPTIONS:Mvidix) 264.if empty(PKG_OPTIONS:Mvidix)
265CONFIGURE_ARGS+= --disable-vidix-internal 265CONFIGURE_ARGS+= --disable-vidix-internal
266CONFIGURE_ARGS+= --disable-vidix-external 266CONFIGURE_ARGS+= --disable-vidix-external
267.endif 267.endif
268 268
269.if !empty(PKG_OPTIONS:Mvorbis) 269.if !empty(PKG_OPTIONS:Mvorbis)
270CONFIGURE_ARGS+= --enable-libvorbis 270CONFIGURE_ARGS+= --enable-libvorbis
271.else 271.else
272CONFIGURE_ARGS+= --disable-libvorbis 272CONFIGURE_ARGS+= --disable-libvorbis
273.endif 273.endif
274 274
 275.if !empty(PKG_OPTIONS:Mx264)
 276CONFIGURE_ARGS+= --enable-x264
 277.else
 278CONFIGURE_ARGS+= --disable-x264
 279.endif
 280
275.if !empty(PKG_OPTIONS:Mxvid) 281.if !empty(PKG_OPTIONS:Mxvid)
276CONFIGURE_ARGS+= --enable-xvid 282CONFIGURE_ARGS+= --enable-xvid
277EXTRA_LIBS+= -lxvidcore 283EXTRA_LIBS+= -lxvidcore
278. include "../../multimedia/xvidcore/buildlink3.mk" 284. include "../../multimedia/xvidcore/buildlink3.mk"
279.else 285.else
280CONFIGURE_ARGS+= --disable-xvid 286CONFIGURE_ARGS+= --disable-xvid
281.endif 287.endif
282 288
283.if !empty(PKG_OPTIONS:Mmplayer-ssse3) 289.if !empty(PKG_OPTIONS:Mmplayer-ssse3)
284# needs a recent assembler 290# needs a recent assembler
285.include "../../devel/binutils/buildlink3.mk" 291.include "../../devel/binutils/buildlink3.mk"
286.else 292.else
287CONFIGURE_ARGS+= --disable-ssse3 293CONFIGURE_ARGS+= --disable-ssse3