CVS commit: pkgsrc/multimedia/gst-plugins0.10-ffmpeg

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 23 16:45:57 UTC 2020

Modified Files:
        pkgsrc/multimedia/gst-plugins0.10-ffmpeg: Makefile distinfo
Added Files:
        pkgsrc/multimedia/gst-plugins0.10-ffmpeg/patches: patch-configure

Log Message:
gst-plugins0.10-ffmpeg: Switch to internal ffmpeg copy.

This is the last remaining user of ffmpeg0 and it makes sense to only
build the features it wants to have.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/gst-plugins0.10-ffmpeg/patches/patch-configure

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

Modified files:

Index: pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile
diff -u pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile:1.40 pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile:1.41
--- pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile:1.40      Sun Mar  8 16:50:40 2020
+++ pkgsrc/multimedia/gst-plugins0.10-ffmpeg/Makefile   Thu Apr 23 16:45:57 2020
@@ -1,28 +1,24 @@
-# $NetBSD: Makefile,v 1.40 2020/03/08 16:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2020/04/23 16:45:57 nia Exp $
 #
 
 DISTNAME=      gst-ffmpeg-0.10.13
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    multimedia
 MASTER_SITES=  https://gstreamer.freedesktop.org/src/gst-ffmpeg/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://gstreamer.freedesktop.org/src/gst-ffmpeg/
 COMMENT=       GStreamer ffmpeg plugin
+LICENSE=       gnu-gpl-v2
 
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-#OVERRIDE_DIRDEPTH=    3
 USE_TOOLS+=            pkg-config gmake perl
-PKGSRC_MAKE_ENV+=      PERL=${PERL5}
+PKGSRC_MAKE_ENV+=      PERL=${PERL5:Q}
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-# the upstream developers only want to support building against
-# the included ffmpeg version, since the ffmpeg API/ABI is unstable
-# and there are no releases
-.include "../../multimedia/ffmpeg010/buildlink3.mk"
-CONFIGURE_ARGS+= --with-system-ffmpeg
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo
diff -u pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo:1.11 pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo:1.12
--- pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo:1.11      Mon Oct 14 13:37:43 2019
+++ pkgsrc/multimedia/gst-plugins0.10-ffmpeg/distinfo   Thu Apr 23 16:45:57 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2019/10/14 13:37:43 mef Exp $
+$NetBSD: distinfo,v 1.12 2020/04/23 16:45:57 nia Exp $
 
 SHA1 (gst-ffmpeg-0.10.13.tar.gz) = 9a6a3b476e6a5b7d78f6431b90649f38654de579
 RMD160 (gst-ffmpeg-0.10.13.tar.gz) = cbc6560ac89e630f606f4639fa3d7ce51e4d71b0
 SHA512 (gst-ffmpeg-0.10.13.tar.gz) = 690466c14929753fa2f3b261fd808d40725298c37623a51bdcbaf0fa4928289b80c832a7031d1c6cf7bf37c2c6b87e85755ea7e8bc50c4dc8e8da6fc228e720e
 Size (gst-ffmpeg-0.10.13.tar.gz) = 5725107 bytes
+SHA1 (patch-configure) = 74a521cb6229415b9f13e7190601f552f4f49145
 SHA1 (patch-ext_libpostproc_gstpostproc.c) = 1828fd57c7604bd0dba82bfff4723c0de130e165
 SHA1 (patch-ext_libswscale_gstffmpgscale.c) = 8bae6dcb0be1f1589b2a829e045de93abcb5cc9d

Added files:

Index: pkgsrc/multimedia/gst-plugins0.10-ffmpeg/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/gst-plugins0.10-ffmpeg/patches/patch-configure:1.1
--- /dev/null   Thu Apr 23 16:45:57 2020
+++ pkgsrc/multimedia/gst-plugins0.10-ffmpeg/patches/patch-configure    Thu Apr 23 16:45:57 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/04/23 16:45:57 nia Exp $
+
+ffmpeg fails to build with mmx.
+
+--- configure.orig     2011-11-02 15:11:49.000000000 +0000
++++ configure
+@@ -16700,7 +16700,7 @@ fi
+         --disable-ffmpeg --disable-ffprobe --enable-static --enable-pic \
+       --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
+       --disable-network --disable-hwaccels --disable-filters --disable-doc\
+-      --enable-optimizations"
++      --disable-mmx --enable-optimizations"
+ 
+   if test "x$enable_lgpl" != "xyes"; then
+     embffmpeg_configure_args="$embffmpeg_configure_args --enable-postproc \