aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mencoder/Makefile5
-rw-r--r--multimedia/mplayer/Makefile6
-rw-r--r--multimedia/mplayer/Makefile.options5
3 files changed, 6 insertions, 10 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 15685d73af03..36b69d9b6ab7 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
@@ -20,11 +21,11 @@ OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS X264 XVID
OPTIONS_DEFINE_i386= RTCPU
OPTIONS_DEFINE_amd64= RTCPU
-OPTIONS_DEFINE_ppc= RTCPU
+OPTIONS_DEFINE_powerpc= RTCPU
OPTIONS_DEFAULT_i386= RTCPU
OPTIONS_DEFAULT_amd64= RTCPU
-OPTIONS_DEFAULT_ppc= RTCPU
+OPTIONS_DEFAULT_powerpc=RTCPU
BLURAY_DESC?= BluRay support
LZO_DESC?= Enable external liblzo library
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index a9e6f3026f62..97f120aed6a8 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
@@ -23,11 +23,11 @@ OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \
OPTIONS_DEFINE_i386= RTCPU
OPTIONS_DEFINE_amd64= RTCPU
-OPTIONS_DEFINE_ppc= RTCPU
+OPTIONS_DEFINE_powerpc= RTCPU
OPTIONS_DEFAULT_i386= RTCPU VDPAU
OPTIONS_DEFAULT_amd64= RTCPU VDPAU
-OPTIONS_DEFAULT_ppc= RTCPU
+OPTIONS_DEFAULT_powerpc=RTCPU
BLURAY_DESC?= BluRay support
ENCA_DESC?= Charset conversion via enca
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 1aabba77fdc9..551983624826 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -89,11 +89,6 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aligned_alloc
.endif
-# Unsupported architectures for inline assembly
-.if ${ARCH} == "ppc"
-CONFIGURE_ARGS+= --disable-asm
-.endif
-
# Unsupported architectures
.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64