forked from Lainports/freebsd-ports
50eadf7862
Adjust program and library suffixes and pkg-config files Reported by: Juergen Lock and Jimmy Olgeny [1]
95 lines
4.7 KiB
Text
95 lines
4.7 KiB
Text
--- configure.orig 2012-06-07 23:01:19.000000000 +0200
|
|
+++ configure 2012-08-12 09:42:57.454507301 +0200
|
|
@@ -1860,7 +1860,7 @@
|
|
nogas=":"
|
|
|
|
# machine
|
|
-arch_default=$(uname -m)
|
|
+arch_default=$(uname -p)
|
|
cpu="generic"
|
|
|
|
# OS
|
|
@@ -3286,10 +3286,10 @@
|
|
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
|
|
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
|
|
|
|
-check_header linux/fb.h
|
|
-check_header linux/videodev.h
|
|
-check_header linux/videodev2.h
|
|
-check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
|
|
+#check_header linux/fb.h
|
|
+#check_header linux/videodev.h
|
|
+#check_header linux/videodev2.h
|
|
+#check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
|
|
|
|
check_header sys/videoio.h
|
|
|
|
@@ -3659,7 +3659,7 @@
|
|
SRC_PATH:=\$(SRC_PATH:.%=..%)
|
|
endif
|
|
CC_IDENT=$cc_ident
|
|
-ARCH=$arch
|
|
+FFMPEG_ARCH=$arch
|
|
CC=$cc
|
|
CXX=$cxx
|
|
AS=$as
|
|
@@ -3839,13 +3839,13 @@
|
|
requires=$5
|
|
enabled ${name#lib} || return 0
|
|
mkdir -p $name
|
|
-cat <<EOF > $name/$name.pc
|
|
+cat <<EOF > $name/${name}${build_suffix}.pc
|
|
prefix=$prefix
|
|
exec_prefix=\${prefix}
|
|
libdir=$libdir
|
|
includedir=$incdir
|
|
|
|
-Name: $name
|
|
+Name: ${name}${build_suffix}
|
|
Description: $comment
|
|
Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
@@ -3855,7 +3855,7 @@
|
|
Libs.private: $(enabled shared && echo $libs)
|
|
Cflags: -I\${includedir}
|
|
EOF
|
|
-cat <<EOF > $name/$name-uninstalled.pc
|
|
+cat <<EOF > $name/${name}${build_suffix}-uninstalled.pc
|
|
prefix=
|
|
exec_prefix=
|
|
libdir=\${pcfiledir}
|
|
@@ -3872,22 +3872,22 @@
|
|
}
|
|
|
|
libavfilter_pc_deps=""
|
|
-enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
|
|
-enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
|
|
-enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
|
|
-enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
|
|
-enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
|
|
+enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
|
|
+enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
|
|
+enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
|
|
+enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
|
|
+enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
|
|
libavfilter_pc_deps=${libavfilter_pc_deps%, }
|
|
|
|
-libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
|
|
-enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
|
|
+libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
|
|
+enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
|
|
|
|
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
|
|
-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
|
|
-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
|
|
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
|
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
|
|
pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
|
|
pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
|
|
-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
|
|
+pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
|
pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
|
|
-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
|
|
-pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
|
|
+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
|
+pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|