57 lines
1.7 KiB
Text
57 lines
1.7 KiB
Text
--- configure.orig
|
|
+++ configure
|
|
@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
|
|
nogas=":"
|
|
|
|
# machine
|
|
-arch_default=$(uname -m)
|
|
+arch_default=$(uname -p)
|
|
cpu="generic"
|
|
|
|
# OS
|
|
@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
|
|
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
|
|
rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
|
|
|
|
-check_header linux/fb.h
|
|
-check_header linux/videodev.h
|
|
-check_header linux/videodev2.h
|
|
-check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
|
|
+#check_header linux/fb.h
|
|
+#check_header linux/videodev.h
|
|
+#check_header linux/videodev2.h
|
|
+#check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
|
|
|
|
check_header sys/videoio.h
|
|
|
|
@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
|
|
SRC_PATH:=\$(SRC_PATH:.%=..%)
|
|
endif
|
|
CC_IDENT=$cc_ident
|
|
-ARCH=$arch
|
|
+FFMPEG_ARCH=$arch
|
|
CC=$cc
|
|
CXX=$cxx
|
|
AS=$as
|
|
@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
|
|
libdir=$libdir
|
|
includedir=$incdir
|
|
|
|
-Name: $name
|
|
+Name: ${name}${build_suffix}
|
|
Description: $comment
|
|
Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
@@ -4569,10 +4569,10 @@ EOF
|
|
mkdir -p doc/examples/pc-uninstalled
|
|
includedir=${source_path}
|
|
[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
|
|
- cat <<EOF > doc/examples/pc-uninstalled/$name.pc
|
|
+ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
|
|
prefix=
|
|
exec_prefix=
|
|
-libdir=\${pcfiledir}/../../../$name
|
|
+libdir=\${pcfiledir}/../../../${name}${build_suffix}
|
|
includedir=${includedir}
|
|
|
|
Name: $name
|