Received: by mail.netbsd.org (Postfix, from userid 605) id 83D8384DF6; Sat, 10 Nov 2018 20:50:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9670984D71 for ; Sat, 10 Nov 2018 20:50:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ffUMfy1UWAy2 for ; Sat, 10 Nov 2018 20:50:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C854F84CDA for ; Sat, 10 Nov 2018 20:50:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B9825FB1F; Sat, 10 Nov 2018 20:50:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1541883028178690" MIME-Version: 1.0 Date: Sat, 10 Nov 2018 20:50:28 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/multimedia/transcode To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20181110205028.B9825FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1541883028178690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Nov 10 20:50:28 UTC 2018 Modified Files: pkgsrc/multimedia/transcode: Makefile options.mk Log Message: transcode: add missing xvidcore include Support is explicitly enabled by --enable-xvid in the Makefile, so this needs to be here. While here, remove some configure arguments that are no longer supported by the configure script. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 pkgsrc/multimedia/transcode/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/transcode/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1541883028178690 Content-Disposition: inline Content-Length: 2190 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/transcode/Makefile diff -u pkgsrc/multimedia/transcode/Makefile:1.111 pkgsrc/multimedia/transcode/Makefile:1.112 --- pkgsrc/multimedia/transcode/Makefile:1.111 Tue Apr 17 22:29:44 2018 +++ pkgsrc/multimedia/transcode/Makefile Sat Nov 10 20:50:28 2018 @@ -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" Index: pkgsrc/multimedia/transcode/options.mk diff -u pkgsrc/multimedia/transcode/options.mk:1.9 pkgsrc/multimedia/transcode/options.mk:1.10 --- pkgsrc/multimedia/transcode/options.mk:1.9 Sat Nov 21 17:14:26 2015 +++ pkgsrc/multimedia/transcode/options.mk Sat Nov 10 20:50:28 2018 @@ -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 --_----------=_1541883028178690--