ports/multimedia/ffmpeg/files/patch-configure
Thomas Zander 5b633a3df0 Unbreak build on 12-BETA after OpenSSL 1.1.1 import into base
PR:		232707
Submitted by:	fluffy
MFH:		2018Q4
2018-10-28 16:28:15 +00:00

36 lines
1.4 KiB
Text

--- configure.orig 2018-04-20 10:02:55 UTC
+++ configure
@@ -3516,12 +3516,7 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# machine
-if test "$target_os_default" = aix; then
- arch_default=$(uname -p)
- strip_default="strip -X32_64"
-else
- arch_default=$(uname -m)
-fi
+arch_default=$(uname -p)
cpu="generic"
intrinsics="none"
@@ -6122,6 +6117,7 @@
die "ERROR: OpenMAX IL headers not found"; } && enable omx
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@ -6234,8 +6229,10 @@ else
EOF
fi
-enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
+if enabled alsa; then
+ check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
+fi
enabled libjack &&
require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range