Sun Feb 24 22:24:35 2008 UTC ()
`xvid' also works on sparc64.  Rearrange the options to account for this.


(jdc)
diff -r1.26 -r1.27 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.26 -r1.27 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2008/02/13 00:55:55 1.26
+++ pkgsrc/multimedia/mplayer-share/options.mk 2008/02/24 22:24:34 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.26 2008/02/13 00:55:55 rillig Exp $ 1# $NetBSD: options.mk,v 1.27 2008/02/24 22:24:34 jdc 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
@@ -37,38 +37,42 @@ PKG_SUPPORTED_OPTIONS+= lame @@ -37,38 +37,42 @@ PKG_SUPPORTED_OPTIONS+= lame
37# OS-specific options. 37# OS-specific options.
38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
39PKG_SUPPORTED_OPTIONS+= cdparanoia 39PKG_SUPPORTED_OPTIONS+= cdparanoia
40.elif ${OPSYS} == "SunOS" 40.elif ${OPSYS} == "SunOS"
41PKG_SUPPORTED_OPTIONS+= mlib 41PKG_SUPPORTED_OPTIONS+= mlib
42.endif 42.endif
43.if ${OPSYS} == "Linux" 43.if ${OPSYS} == "Linux"
44PKG_SUPPORTED_OPTIONS+= vidix 44PKG_SUPPORTED_OPTIONS+= vidix
45.endif 45.endif
46 46
47# Platform-specific options. 47# Platform-specific options.
48.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ 48.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
49 ${MACHINE_ARCH} == "powerpc" 49 ${MACHINE_ARCH} == "powerpc"
50PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection xvid 50PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection
51.endif 51.endif
52.if ${MACHINE_ARCH} == "i386" 52.if ${MACHINE_ARCH} == "i386"
53PKG_SUPPORTED_OPTIONS+= mplayer-default-cflags mplayer-win32 53PKG_SUPPORTED_OPTIONS+= mplayer-default-cflags mplayer-win32
54.endif 54.endif
55.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ 55.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
56 ${MACHINE_ARCH} == "alpha" 56 ${MACHINE_ARCH} == "alpha"
57PKG_SUPPORTED_OPTIONS+= mplayer-real 57PKG_SUPPORTED_OPTIONS+= mplayer-real
58.endif 58.endif
59.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 59.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
60PKG_SUPPORTED_OPTIONS+= mplayer-ssse3 60PKG_SUPPORTED_OPTIONS+= mplayer-ssse3
61.endif 61.endif
 62.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
 63 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
 64PKG_SUPPORTED_OPTIONS+= xvid
 65.endif
62 66
63# ------------------------------------------------------------------------- 67# -------------------------------------------------------------------------
64# Define PKG_SUGGESTED_OPTIONS. 68# Define PKG_SUGGESTED_OPTIONS.
65# ------------------------------------------------------------------------- 69# -------------------------------------------------------------------------
66 70
67.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \ 71.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
68 lame mad mplayer-menu mplayer-real \ 72 lame mad mplayer-menu mplayer-real \
69 mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \ 73 mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
70 nas oss png sdl theora vorbis xvid 74 nas oss png sdl theora vorbis xvid
71. if !empty(PKG_SUPPORTED_OPTIONS:M${_o_}) 75. if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
72PKG_SUGGESTED_OPTIONS+= ${_o_} 76PKG_SUGGESTED_OPTIONS+= ${_o_}
73. endif 77. endif
74.endfor 78.endfor