pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2 ffmpeg2: fix configuring with OpenS...
details: https://anonhg.NetBSD.org/pkgsrc/rev/54fe84c9db86
branches: trunk
changeset: 327531:54fe84c9db86
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Thu Jan 03 11:56:08 2019 +0000
description:
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.
diffstat:
multimedia/ffmpeg2/Makefile | 4 +-
multimedia/ffmpeg2/distinfo | 6 +-
multimedia/ffmpeg2/options.mk | 4 +-
multimedia/ffmpeg2/patches/patch-configure | 26 ++-
multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c | 76 +++++++++
multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c | 78 ----------
6 files changed, 101 insertions(+), 93 deletions(-)
diffs (283 lines):
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/Makefile
--- a/multimedia/ffmpeg2/Makefile Thu Jan 03 10:57:29 2019 +0000
+++ b/multimedia/ffmpeg2/Makefile Thu Jan 03 11:56:08 2019 +0000
@@ -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@localhost
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software (v2.x)
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/distinfo
--- a/multimedia/ffmpeg2/distinfo Thu Jan 03 10:57:29 2019 +0000
+++ b/multimedia/ffmpeg2/distinfo Thu Jan 03 11:56:08 2019 +0000
@@ -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
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk Thu Jan 03 10:57:29 2019 +0000
+++ b/multimedia/ffmpeg2/options.mk Thu Jan 03 11:56:08 2019 +0000
@@ -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_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
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/patches/patch-configure
--- a/multimedia/ffmpeg2/patches/patch-configure Thu Jan 03 10:57:29 2019 +0000
+++ b/multimedia/ffmpeg2/patches/patch-configure Thu Jan 03 11:56:08 2019 +0000
@@ -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 @@
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 @@
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4718,10 +4723,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4719,10 +4724,13 @@ check_cc <<EOF && enable attribute_may_a
union { int x; } __attribute__((may_alias)) x;
EOF
@@ -40,7 +40,17 @@
if ! enabled ppc64 || enabled bigendian; then
disable vsx
-@@ -5589,6 +5597,7 @@ enabled xmm_clobber_test &&
+@@ -5353,7 +5361,8 @@ enabled opengl && { check_lib
+ check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
+ die "ERROR: opengl not found."
+ }
+-enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
++enabled openssl && { check_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl ||
++ check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+ check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+ check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+ die "ERROR: openssl not found"; }
+@@ -5591,6 +5600,7 @@ enabled xmm_clobber_test &&
-Wl,--wrap,sws_scale ||
disable xmm_clobber_test
@@ -48,7 +58,7 @@
echo "X{};" > $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 @@
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:
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp__init.c Thu Jan 03 11:56:08 2019 +0000
@@ -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)
diff -r c9dea60fdace -r 54fe84c9db86 multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
--- a/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c Thu Jan 03 10:57:29 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-$NetBSD: patch-libavcodec_x86_ac3dsp_init.c,v 1.2 2015/06/11 17:02:35 adam Exp $
-
-Fix from PR pkg/48680
-
---- libavcodec/x86/ac3dsp_init.c.orig 2014-06-02 23:18:54.000000000 +0200
-+++ libavcodec/x86/ac3dsp_init.c 2014-06-14 21:27:55.000000000 +0200
-@@ -84,11 +84,11 @@
- "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" \
-@@ -99,8 +99,8 @@
- "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) \
-@@ -120,24 +120,26 @@
- "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) \
-@@ -180,8 +182,8 @@
- "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)
Home |
Main Index |
Thread Index |
Old Index