CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Jun 2019 14:41:10 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 18 14:41:10 UTC 2019

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile options.mk
        pkgsrc/multimedia/ffmpeg3: Makefile options.mk
        pkgsrc/multimedia/ffmpeg4: Makefile options.mk

Log Message:
ffmpeg*: Make x11 option imply xcb.

This way x11grab works without rebuilding.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg4/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.48 pkgsrc/multimedia/ffmpeg2/Makefile:1.49
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.48     Thu Jan  3 11:56:08 2019
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Tue Jun 18 14:41:09 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2019/01/03 11:56:08 bsiegert Exp $
+# $NetBSD: Makefile,v 1.49 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   7
+PKGREVISION=   8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.15 pkgsrc/multimedia/ffmpeg2/options.mk:1.16
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.15   Thu Jan  3 11:56:08 2019
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Tue Jun 18 14:41:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/01/03 11:56:08 bsiegert Exp $
+# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -9,10 +9,12 @@ PKG_OPTIONS_GROUP.ssl=                gnutls openssl
 
 PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype lame \
                        libvpx opencore-amr rtmp theora vorbis x11 x264 \
-                       x265 xcb xvid
+                       x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx \
                        theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
+
 PLIST_VARS+=           doc
 
 # Add VDPAU if it is available
@@ -196,7 +198,7 @@ CONFIGURE_ARGS+=    --disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --enable-libxcb
 CONFIGURE_ARGS+=       --enable-libxcb-shape
 CONFIGURE_ARGS+=       --enable-libxcb-shm

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.41 pkgsrc/multimedia/ffmpeg3/Makefile:1.42
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.41     Sat Apr 27 19:39:22 2019
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Tue Jun 18 14:41:09 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2019/04/27 19:39:22 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
+PKGREVISION=   1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.15 pkgsrc/multimedia/ffmpeg3/options.mk:1.16
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.15   Tue Oct  9 11:04:10 2018
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Tue Jun 18 14:41:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2018/10/09 11:04:10 leot Exp $
+# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -9,10 +9,12 @@ PKG_OPTIONS_GROUP.ssl=                gnutls openssl
 
 PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \
                        lame libvpx opencore-amr opus rpi rtmp \
-                       tesseract theora vorbis x11 x264 x265 xcb xvid
+                       tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
                        theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
+
 PLIST_VARS+=           doc
 
 # Add VDPAU if it is available
@@ -211,7 +213,7 @@ CONFIGURE_ARGS+=    --disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --enable-libxcb
 CONFIGURE_ARGS+=       --enable-libxcb-shape
 CONFIGURE_ARGS+=       --enable-libxcb-shm

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.12 pkgsrc/multimedia/ffmpeg4/Makefile:1.13
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.12     Mon Feb 11 09:24:22 2019
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Tue Jun 18 14:41:09 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2019/02/11 09:24:22 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
+PKGREVISION=   1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.9 pkgsrc/multimedia/ffmpeg4/options.mk:1.10
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.9    Sun Dec  2 17:11:16 2018
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Tue Jun 18 14:41:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/12/02 17:11:16 tsutsui Exp $
+# $NetBSD: options.mk,v 1.10 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -8,10 +8,12 @@ PKG_OPTIONS_GROUP.ssl=                gnutls openssl
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
                        gnutls lame libvpx opencore-amr opus pulseaudio rpi \
-                       rtmp tesseract theora vorbis x11 x264 x265 xcb xvid
+                       rtmp tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig libvpx \
                        openssl theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
+
 PLIST_VARS+=           doc
 
 # Add VDPAU if it is available
@@ -227,7 +229,7 @@ CONFIGURE_ARGS+=    --disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --enable-libxcb
 CONFIGURE_ARGS+=       --enable-libxcb-shape
 CONFIGURE_ARGS+=       --enable-libxcb-shm

Prev by Date: CVS commit: pkgsrc/textproc/py-Unidecode
Next by Date: CVS commit: pkgsrc/audio/py-audioread
Previous by Thread: CVS commit: pkgsrc/textproc/py-Unidecode
Next by Thread: CVS commit: pkgsrc/audio/py-audioread
Indexes:

Home | Main Index | Thread Index | Old Index