mirror of https://git.ffmpeg.org/ffmpeg.git
build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix
Tested-on: Fedora Core 14, 16, and 17. Tested-on: Ubuntu by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
985e93a865
commit
6289a8296a
|
@ -4340,6 +4340,7 @@ ifndef FFMPEG_CONFIG_MAK
|
||||||
FFMPEG_CONFIG_MAK=1
|
FFMPEG_CONFIG_MAK=1
|
||||||
FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
|
FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
|
||||||
prefix=$prefix
|
prefix=$prefix
|
||||||
|
build_suffix=${build_suffix}
|
||||||
LIBDIR=\$(DESTDIR)$libdir
|
LIBDIR=\$(DESTDIR)$libdir
|
||||||
SHLIBDIR=\$(DESTDIR)$shlibdir
|
SHLIBDIR=\$(DESTDIR)$shlibdir
|
||||||
INCDIR=\$(DESTDIR)$incdir
|
INCDIR=\$(DESTDIR)$incdir
|
||||||
|
@ -4525,7 +4526,7 @@ pkgconfig_generate(){
|
||||||
requires=$5
|
requires=$5
|
||||||
enabled ${name#lib} || return 0
|
enabled ${name#lib} || return 0
|
||||||
mkdir -p $name
|
mkdir -p $name
|
||||||
cat <<EOF > $name/$name.pc
|
cat <<EOF > $name/$name${build_suffix}.pc
|
||||||
prefix=$prefix
|
prefix=$prefix
|
||||||
exec_prefix=\${prefix}
|
exec_prefix=\${prefix}
|
||||||
libdir=$libdir
|
libdir=$libdir
|
||||||
|
@ -4561,27 +4562,27 @@ Cflags: -I\${includedir}
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
libavfilter_pc_deps="libavutil = $LIBAVUTIL_VERSION"
|
libavfilter_pc_deps="libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
||||||
enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
|
enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
|
||||||
enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
|
enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
|
||||||
enabled libavfilter_deps_avresample && prepend libavfilter_pc_deps "libavresample = $LIBAVRESAMPLE_VERSION,"
|
enabled libavfilter_deps_avresample && prepend libavfilter_pc_deps "libavresample${build_suffix} = $LIBAVRESAMPLE_VERSION,"
|
||||||
enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
|
enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
|
||||||
enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
|
enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
|
||||||
enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
|
enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
|
||||||
libavfilter_pc_deps=${libavfilter_pc_deps%, }
|
libavfilter_pc_deps=${libavfilter_pc_deps%, }
|
||||||
|
|
||||||
libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
|
libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
|
||||||
enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
|
enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
|
||||||
|
|
||||||
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
|
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
|
||||||
pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_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 = $LIBAVCODEC_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 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 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" "libavutil = $LIBAVUTIL_VERSION"
|
pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
||||||
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_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 resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
|
pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
|
||||||
|
|
||||||
fix_ffmpeg_remote(){
|
fix_ffmpeg_remote(){
|
||||||
git_remote_from=$1
|
git_remote_from=$1
|
||||||
|
|
|
@ -85,7 +85,7 @@ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
|
||||||
$(Q)mkdir -p "$(INCINSTDIR)"
|
$(Q)mkdir -p "$(INCINSTDIR)"
|
||||||
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
|
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
|
||||||
|
|
||||||
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
|
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)${build_suffix}.pc
|
||||||
$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
|
$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
|
||||||
$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
|
$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ uninstall-libs::
|
||||||
|
|
||||||
uninstall-headers::
|
uninstall-headers::
|
||||||
$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
|
$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
|
||||||
$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
|
$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME)${build_suffix}.pc"
|
||||||
-rmdir "$(INCINSTDIR)"
|
-rmdir "$(INCINSTDIR)"
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue