summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/transcode/Makefile5
-rw-r--r--multimedia/transcode/options.mk3
2 files changed, 3 insertions, 5 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 20e4b565741..b60e7e6c6a2 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2018/04/17 22:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2018/11/10 20:50:28 wiz Exp $
DISTNAME= transcode-1.1.7
PKGREVISION= 29
@@ -16,7 +16,6 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= awk:run gmake pkg-config
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-xio
CONFIGURE_ARGS+= --enable-freetype2
CONFIGURE_ARGS+= --enable-libmpeg2
CONFIGURE_ARGS+= --enable-libmpeg2convert
@@ -25,7 +24,6 @@ CONFIGURE_ARGS+= --enable-ogg
CONFIGURE_ARGS+= --enable-theora
CONFIGURE_ARGS+= --enable-vorbis
CONFIGURE_ARGS+= --enable-xvid
-CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg}
CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q}
PTHREAD_AUTO_VARS= yes
@@ -59,6 +57,7 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/xvidcore/buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk
index 757bf08c797..4b28615fed4 100644
--- a/multimedia/transcode/options.mk
+++ b/multimedia/transcode/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2015/11/21 17:14:26 adam Exp $
+# $NetBSD: options.mk,v 1.10 2018/11/10 20:50:28 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.transcode
PKG_SUPPORTED_OPTIONS= a52 dv faac imagemagick mjpegtools lzo libxml2 x264
@@ -11,7 +11,6 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
.if !empty(PKG_OPTIONS:Ma52)
. include "../../audio/liba52/buildlink3.mk"
CONFIGURE_ARGS+= --enable-a52
-CONFIGURE_ARGS+= --enable-a52-default-decoder
PLIST.a52= yes
.else
CONFIGURE_ARGS+= --disable-a52