mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-11 11:01:18 +02:00
71 lines
3.1 KiB
Plaintext
71 lines
3.1 KiB
Plaintext
--- configure.orig 2017-07-29 17:49:29 UTC
|
|
+++ configure
|
|
@@ -1875,6 +1875,7 @@ HEADERS_LIST="
|
|
machine_ioctl_meteor_h
|
|
malloc_h
|
|
opencv2_core_core_c_h
|
|
+ openjpeg_2_2_openjpeg_h
|
|
openjpeg_2_1_openjpeg_h
|
|
openjpeg_2_0_openjpeg_h
|
|
openjpeg_1_5_openjpeg_h
|
|
@@ -3262,12 +3263,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"
|
|
|
|
@@ -5803,10 +5799,12 @@ enabled libopencore_amrwb && require lib
|
|
enabled libopencv && { check_header opencv2/core/core_c.h &&
|
|
{ use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
|
|
require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
|
|
- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
|
|
+ require_pkg_config opencv-core-core opencv/cxcore.h cvCreateImageHeader; }
|
|
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
|
|
enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
|
|
check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
|
|
+ { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
|
|
+ check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
|
|
{ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
|
|
{ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
|
|
{ check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
|
|
@@ -6295,6 +6293,9 @@ elif enabled llvm_gcc; then
|
|
elif enabled clang; then
|
|
check_cflags -mllvm -stack-alignment=16
|
|
check_cflags -mstack-alignment=16
|
|
+ if enabled x86_32; then
|
|
+ check_cflags -mstackrealign
|
|
+ fi
|
|
check_cflags -Qunused-arguments
|
|
check_cflags -Werror=implicit-function-declaration
|
|
check_cflags -Werror=missing-prototypes
|
|
@@ -6900,7 +6901,7 @@ exec_prefix=\${prefix}
|
|
libdir=$libdir
|
|
includedir=$incdir
|
|
|
|
-Name: $name
|
|
+Name: ${name}${build_suffix}
|
|
Description: $comment
|
|
Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
@@ -6914,10 +6915,10 @@ EOF
|
|
mkdir -p doc/examples/pc-uninstalled
|
|
includedir=${source_path}
|
|
[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
|
|
- cat <<EOF > doc/examples/pc-uninstalled/${name}-uninstalled.pc
|
|
+ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}-uninstalled.pc
|
|
prefix=
|
|
exec_prefix=
|
|
-libdir=\${pcfiledir}/../../../$name
|
|
+libdir=\${pcfiledir}/../../../${name}${build_suffix}.pc
|
|
includedir=${includedir}
|
|
|
|
Name: $name
|