Received: by mail.netbsd.org (Postfix, from userid 605) id EF00484E70; Fri, 30 Sep 2022 07:38:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C4F784E54 for ; Fri, 30 Sep 2022 07:38:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id vUWLYD5_JCSJ for ; Fri, 30 Sep 2022 07:38:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5528184CE3 for ; Fri, 30 Sep 2022 07:38:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4E72CFA90; Fri, 30 Sep 2022 07:38:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166452350822450" MIME-Version: 1.0 Date: Fri, 30 Sep 2022 07:38:28 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia/ffmpeg2 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20220930073828.4E72CFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166452350822450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Sep 30 07:38:28 UTC 2022 Modified Files: pkgsrc/multimedia/ffmpeg2: Makefile Makefile.common buildlink3.mk options.mk Log Message: ffmpeg2: switch to x264 stable; bump revision To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 pkgsrc/multimedia/ffmpeg2/Makefile cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/ffmpeg2/Makefile.common cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/ffmpeg2/buildlink3.mk cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/ffmpeg2/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166452350822450 Content-Disposition: inline Content-Length: 4341 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/ffmpeg2/Makefile diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.83 pkgsrc/multimedia/ffmpeg2/Makefile:1.84 --- pkgsrc/multimedia/ffmpeg2/Makefile:1.83 Sun Sep 11 12:52:00 2022 +++ pkgsrc/multimedia/ffmpeg2/Makefile Fri Sep 30 07:38:28 2022 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2022/09/11 12:52:00 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2022/09/30 07:38:28 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 3 +PKGREVISION= 4 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Decoding, encoding and streaming software (v2.x) Index: pkgsrc/multimedia/ffmpeg2/Makefile.common diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.64 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.65 --- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.64 Tue May 24 09:50:45 2022 +++ pkgsrc/multimedia/ffmpeg2/Makefile.common Fri Sep 30 07:38:28 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.64 2022/05/24 09:50:45 nia Exp $ +# $NetBSD: Makefile.common,v 1.65 2022/09/30 07:38:28 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile @@ -20,7 +20,6 @@ CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --disable-optimizations CONFIGURE_ARGS+= --disable-stripping CONFIGURE_ARGS+= --enable-gpl -CONFIGURE_ARGS+= --enable-libbluray CONFIGURE_ARGS+= --enable-pthreads CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} @@ -87,7 +86,6 @@ pre-configure: .include "../../archivers/xz/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../multimedia/libbluray/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/multimedia/ffmpeg2/buildlink3.mk diff -u pkgsrc/multimedia/ffmpeg2/buildlink3.mk:1.15 pkgsrc/multimedia/ffmpeg2/buildlink3.mk:1.16 --- pkgsrc/multimedia/ffmpeg2/buildlink3.mk:1.15 Tue Jun 28 11:34:54 2022 +++ pkgsrc/multimedia/ffmpeg2/buildlink3.mk Fri Sep 30 07:38:28 2022 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2022/06/28 11:34:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2022/09/30 07:38:28 adam Exp $ BUILDLINK_TREE+= ffmpeg2 @@ -14,31 +14,31 @@ pkgbase := ffmpeg2 .include "../../mk/bsd.fast.prefs.mk" -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype} . include "../../graphics/freetype2/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig} . include "../../fonts/fontconfig/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mtheora) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mtheora} . include "../../multimedia/libtheora/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mxvid) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mxvid} . include "../../multimedia/xvidcore/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mx264) -. include "../../multimedia/x264-devel/buildlink3.mk" +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mx264} +. include "../../multimedia/x264/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfaac) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mfaac} . include "../../audio/faac/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mlibvpx) +.if ${PKG_BUILD_OPTIONS.ffmpeg2:Mlibvpx} . include "../../multimedia/libvpx/buildlink3.mk" .endif Index: pkgsrc/multimedia/ffmpeg2/options.mk diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.20 pkgsrc/multimedia/ffmpeg2/options.mk:1.21 --- pkgsrc/multimedia/ffmpeg2/options.mk:1.20 Tue Aug 11 12:13:32 2020 +++ pkgsrc/multimedia/ffmpeg2/options.mk Fri Sep 30 07:38:28 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.20 2020/08/11 12:13:32 nia Exp $ +# $NetBSD: options.mk,v 1.21 2022/09/30 07:38:28 adam Exp $ # Global and legacy options @@ -180,10 +180,9 @@ CONFIGURE_ARGS+= --enable-libxvid # x264 support .if !empty(PKG_OPTIONS:Mx264) -# ABI change between 20090326 and 20100201 -BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 +BUILDLINK_API_DEPENDS.x264+= x264>=20220601 CONFIGURE_ARGS+= --enable-libx264 -.include "../../multimedia/x264-devel/buildlink3.mk" +.include "../../multimedia/x264/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-libx264 .endif --_----------=_166452350822450--