533947cd11
(no ports depend on ffmpeg24 and ffmpeg25 is the more likely candidate for the eventual replacement of multimedia/ffmpeg)
47 lines
1.1 KiB
Text
47 lines
1.1 KiB
Text
--- configure.orig 2014-09-14 18:07:47.000000000 +0200
|
|
+++ configure 2014-09-16 11:16:49.487414405 +0200
|
|
@@ -2680,12 +2680,7 @@
|
|
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"
|
|
|
|
@@ -5470,7 +5465,7 @@
|
|
SRC_PATH:=\$(SRC_PATH:.%=..%)
|
|
endif
|
|
CC_IDENT=$cc_ident
|
|
-ARCH=$arch
|
|
+FFMPEG_ARCH=$arch
|
|
INTRINSICS=$intrinsics
|
|
CC=$cc
|
|
CXX=$cxx
|
|
@@ -5681,7 +5676,7 @@
|
|
libdir=$libdir
|
|
includedir=$incdir
|
|
|
|
-Name: $name
|
|
+Name: ${name}${build_suffix}
|
|
Description: $comment
|
|
Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
@@ -5695,10 +5690,10 @@
|
|
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
|