Received: by mail.netbsd.org (Postfix, from userid 605) id 1938084D96; Thu, 3 Jan 2019 11:56:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5519B84D57 for ; Thu, 3 Jan 2019 11:56:10 +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 Rc97UvKKxPVd for ; Thu, 3 Jan 2019 11:56:09 +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 491B584D56 for ; Thu, 3 Jan 2019 11:56:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 38081FB16; Thu, 3 Jan 2019 11:56:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1546516569147620" MIME-Version: 1.0 Date: Thu, 3 Jan 2019 11:56:09 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/multimedia/ffmpeg2 To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190103115609.38081FB16@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. --_----------=_1546516569147620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Thu Jan 3 11:56:09 UTC 2019 Modified Files: pkgsrc/multimedia/ffmpeg2: Makefile distinfo options.mk pkgsrc/multimedia/ffmpeg2/patches: patch-configure Added Files: pkgsrc/multimedia/ffmpeg2/patches: patch-libavcodec_x86_ac3dsp__init.c Removed Files: pkgsrc/multimedia/ffmpeg2/patches: patch-libavcodec_x86_ac3dsp_init.c Log Message: ffmpeg2: fix configuring with OpenSSL 1.1. The build still fails, thus remove openssl from the list of suggested options. Rename a patch. Bump revision. PR pkg/53829. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/ffmpeg2/Makefile cvs rdiff -u -r1.56 -r1.57 pkgsrc/multimedia/ffmpeg2/distinfo cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/ffmpeg2/options.mk cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg2/patches/patch-configure cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c cvs rdiff -u -r1.2 -r0 \ pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1546516569147620 Content-Disposition: inline Content-Length: 11315 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.47 pkgsrc/multimedia/ffmpeg2/Makefile:1.48 --- pkgsrc/multimedia/ffmpeg2/Makefile:1.47 Fri Nov 23 08:06:31 2018 +++ pkgsrc/multimedia/ffmpeg2/Makefile Thu Jan 3 11:56:08 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2018/11/23 08:06:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2019/01/03 11:56:08 bsiegert Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 6 +PKGREVISION= 7 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) Index: pkgsrc/multimedia/ffmpeg2/distinfo diff -u pkgsrc/multimedia/ffmpeg2/distinfo:1.56 pkgsrc/multimedia/ffmpeg2/distinfo:1.57 --- pkgsrc/multimedia/ffmpeg2/distinfo:1.56 Sun Feb 25 20:35:44 2018 +++ pkgsrc/multimedia/ffmpeg2/distinfo Thu Jan 3 11:56:08 2019 @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.56 2018/02/25 20:35:44 adam Exp $ +$NetBSD: distinfo,v 1.57 2019/01/03 11:56:08 bsiegert Exp $ SHA1 (ffmpeg-2.8.14.tar.xz) = 43162d7304e5d1df5a6991ae677c8e445d71cb36 RMD160 (ffmpeg-2.8.14.tar.xz) = 6bafc3233679651e495988a33e9dd2f093419f9a SHA512 (ffmpeg-2.8.14.tar.xz) = 395ad0f17fc560c8d975d640ae4cdcb3b47322b3045f3873e9de7a137b6a2cca9bf1e10a1817187b338771c11787557b18b5778fc7ab37a095afacbece538a40 Size (ffmpeg-2.8.14.tar.xz) = 7222108 bytes SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56 -SHA1 (patch-configure) = 330e73d68491b7b27b88df9055a7bdbb913b37e3 +SHA1 (patch-configure) = bdc91d620c077f82739a901255241799cd7dc477 SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750 -SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a +SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = f8951b7a1b036addbc0e6a657418e08fcde9fb44 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2 SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548 SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239 Index: pkgsrc/multimedia/ffmpeg2/options.mk diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.14 pkgsrc/multimedia/ffmpeg2/options.mk:1.15 --- pkgsrc/multimedia/ffmpeg2/options.mk:1.14 Tue Oct 9 11:04:10 2018 +++ pkgsrc/multimedia/ffmpeg2/options.mk Thu Jan 3 11:56:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2018/10/09 11:04:10 leot Exp $ +# $NetBSD: options.mk,v 1.15 2019/01/03 11:56:08 bsiegert Exp $ # Global and legacy options @@ -10,7 +10,7 @@ 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 -PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ +PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx \ theora vorbis x11 x264 xvid PLIST_VARS+= doc Index: pkgsrc/multimedia/ffmpeg2/patches/patch-configure diff -u pkgsrc/multimedia/ffmpeg2/patches/patch-configure:1.10 pkgsrc/multimedia/ffmpeg2/patches/patch-configure:1.11 --- pkgsrc/multimedia/ffmpeg2/patches/patch-configure:1.10 Wed Aug 3 12:06:47 2016 +++ pkgsrc/multimedia/ffmpeg2/patches/patch-configure Thu Jan 3 11:56:09 2019 @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.10 2016/08/03 12:06:47 maya Exp $ +$NetBSD: patch-configure,v 1.11 2019/01/03 11:56:09 bsiegert Exp $ ---- configure.orig 2016-04-29 12:08:16.000000000 +0000 +--- configure.orig 2018-02-19 00:50:31.000000000 +0000 +++ configure -@@ -3867,7 +3867,7 @@ case "$arch" in +@@ -3868,7 +3868,7 @@ case "$arch" in sh4|sh) arch="sh4" ;; @@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.10 2016/08/ arch="sparc" ;; tilegx|tile-gx) -@@ -4300,6 +4300,11 @@ case $target_os in +@@ -4301,6 +4301,11 @@ case $target_os in ;; netbsd) disable symver @@ -23,7 +23,7 @@ $NetBSD: patch-configure,v 1.10 2016/08/ oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -4718,10 +4723,13 @@ check_cc < $TMPV if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' -@@ -5601,6 +5610,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") +@@ -5603,6 +5613,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") void ff_foo(void) {} EOF fi @@ -56,7 +66,7 @@ $NetBSD: patch-configure,v 1.10 2016/08/ if [ -z "$optflags" ]; then if enabled small; then -@@ -6233,7 +6243,7 @@ Version: $version +@@ -6236,7 +6247,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: Added files: Index: pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c diff -u /dev/null pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c:1.1 --- /dev/null Thu Jan 3 11:56:09 2019 +++ pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c Thu Jan 3 11:56:09 2019 @@ -0,0 +1,76 @@ +$NetBSD: patch-libavcodec_x86_ac3dsp__init.c,v 1.1 2019/01/03 11:56:09 bsiegert Exp $ + +--- libavcodec/x86/ac3dsp_init.c.orig 2018-02-19 00:50:25.000000000 +0000 ++++ libavcodec/x86/ac3dsp_init.c +@@ -83,11 +83,11 @@ void ff_apply_window_int16_ssse3_atom(in + "shufps $0, %%xmm6, %%xmm6 \n" \ + "shufps $0, %%xmm7, %%xmm7 \n" \ + "1: \n" \ +- "movaps (%0, %2), %%xmm0 \n" \ +- "movaps (%0, %3), %%xmm1 \n" \ +- "movaps (%0, %4), %%xmm2 \n" \ +- "movaps (%0, %5), %%xmm3 \n" \ +- "movaps (%0, %6), %%xmm4 \n" \ ++ "movups (%0, %2), %%xmm0 \n" \ ++ "movups (%0, %3), %%xmm1 \n" \ ++ "movups (%0, %4), %%xmm2 \n" \ ++ "movups (%0, %5), %%xmm3 \n" \ ++ "movups (%0, %6), %%xmm4 \n" \ + "mulps %%xmm5, %%xmm0 \n" \ + "mulps %%xmm6, %%xmm1 \n" \ + "mulps %%xmm5, %%xmm2 \n" \ +@@ -98,8 +98,8 @@ void ff_apply_window_int16_ssse3_atom(in + "addps %%xmm3, %%xmm0 \n" \ + "addps %%xmm4, %%xmm2 \n" \ + mono("addps %%xmm2, %%xmm0 \n") \ +- "movaps %%xmm0, (%0, %2) \n" \ +- stereo("movaps %%xmm2, (%0, %3) \n") \ ++ "movups %%xmm0, (%0, %2) \n" \ ++ stereo("movups %%xmm2, (%0, %3) \n") \ + "add $16, %0 \n" \ + "jl 1b \n" \ + : "+&r"(i) \ +@@ -119,24 +119,26 @@ void ff_apply_window_int16_ssse3_atom(in + "mov %5, %2 \n" \ + "1: \n" \ + "mov -%c7(%6, %2, %c8), %3 \n" \ +- "movaps (%3, %0), %%xmm0 \n" \ ++ "movups (%3, %0), %%xmm0 \n" \ + stereo("movaps %%xmm0, %%xmm1 \n") \ + "mulps %%xmm4, %%xmm0 \n" \ + stereo("mulps %%xmm5, %%xmm1 \n") \ + "2: \n" \ + "mov (%6, %2, %c8), %1 \n" \ +- "movaps (%1, %0), %%xmm2 \n" \ ++ "movups (%1, %0), %%xmm2 \n" \ + stereo("movaps %%xmm2, %%xmm3 \n") \ +- "mulps (%4, %2, 8), %%xmm2 \n" \ +- stereo("mulps 16(%4, %2, 8), %%xmm3 \n") \ ++ "movups (%4, %2, 8), %%xmm4 \n" \ ++ "mulps %%xmm4, %%xmm2 \n" \ ++ stereo("movups 16(%4, %2, 8), %%xmm4 \n") \ ++ stereo("mulps %%xmm4, %%xmm3 \n") \ + "addps %%xmm2, %%xmm0 \n" \ + stereo("addps %%xmm3, %%xmm1 \n") \ + "add $4, %2 \n" \ + "jl 2b \n" \ + "mov %5, %2 \n" \ + stereo("mov (%6, %2, %c8), %1 \n") \ +- "movaps %%xmm0, (%3, %0) \n" \ +- stereo("movaps %%xmm1, (%1, %0) \n") \ ++ "movups %%xmm0, (%3, %0) \n" \ ++ stereo("movups %%xmm1, (%1, %0) \n") \ + "add $16, %0 \n" \ + "jl 1b \n" \ + : "+&r"(i), "=&r"(j), "=&r"(k), "=&r"(m) \ +@@ -179,8 +181,8 @@ static void ac3_downmix_sse(float **samp + "movss 4(%2, %0), %%xmm5 \n" + "shufps $0, %%xmm4, %%xmm4 \n" + "shufps $0, %%xmm5, %%xmm5 \n" +- "movaps %%xmm4, (%1, %0, 4) \n" +- "movaps %%xmm5, 16(%1, %0, 4) \n" ++ "movups %%xmm4, (%1, %0, 4) \n" ++ "movups %%xmm5, 16(%1, %0, 4) \n" + "jg 1b \n" + : "+&r"(j) + : "r"(matrix_simd), "r"(matrix) --_----------=_1546516569147620--