94 lines
4.6 KiB
Plaintext
94 lines
4.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.29 2012/04/28 08:41:32 ajacoutot Exp $
|
|
--- configure.orig Sat Apr 21 23:53:38 2012
|
|
+++ configure Sun Apr 22 00:50:49 2012
|
|
@@ -1092,7 +1092,6 @@ HAVE_LIST="
|
|
lzo1x_999_compress
|
|
machine_ioctl_bt848_h
|
|
machine_ioctl_meteor_h
|
|
- malloc_h
|
|
MapViewOfFile
|
|
memalign
|
|
mkstemp
|
|
@@ -2425,6 +2424,7 @@ case $target_os in
|
|
enable pic
|
|
disable symver
|
|
SHFLAGS='-shared'
|
|
+ SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
|
|
oss_indev_extralibs="-lossaudio"
|
|
oss_outdev_extralibs="-lossaudio"
|
|
;;
|
|
@@ -2601,7 +2601,7 @@ die_license_disabled version3 libvo_amrwbenc
|
|
|
|
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
|
|
|
|
-disabled optimizations || check_cflags -fomit-frame-pointer
|
|
+enabled x86_32 && check_cflags -fomit-frame-pointer
|
|
|
|
enable_pic() {
|
|
enable pic
|
|
@@ -2797,8 +2797,6 @@ if enabled asm; then
|
|
$nogas "GNU assembler not found, install gas-preprocessor"
|
|
fi
|
|
|
|
-check_ldflags -Wl,--as-needed
|
|
-
|
|
if check_func dlopen; then
|
|
ldl=
|
|
elif check_func dlopen -ldl; then
|
|
@@ -2931,7 +2929,7 @@ enabled libdirac && require_pkg_config dirac
|
|
"dirac_decoder_init dirac_encoder_init"
|
|
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
|
|
enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
|
|
-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
|
|
+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
|
|
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
|
|
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
|
|
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
|
|
@@ -3057,7 +3055,6 @@ enabled extra_warnings && check_cflags -Winline
|
|
|
|
# add some linker flags
|
|
check_ldflags -Wl,--warn-common
|
|
-check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
|
|
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
|
|
|
|
echo "X{};" > $TMPV
|
|
@@ -3075,10 +3072,6 @@ fi
|
|
|
|
if enabled small; then
|
|
add_cflags $size_cflags
|
|
-elif enabled optimizations; then
|
|
- add_cflags $speed_cflags
|
|
-else
|
|
- add_cflags $noopt_cflags
|
|
fi
|
|
check_cflags -fno-math-errno
|
|
check_cflags -fno-signed-zeros
|
|
@@ -3519,8 +3512,7 @@ Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
Requires.private: $(enabled shared && echo $requires)
|
|
Conflicts:
|
|
-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
|
|
-Libs.private: $(enabled shared && echo $libs)
|
|
+Libs: -L\${libdir} -l${shortname} $libs
|
|
Cflags: -I\${includedir}
|
|
EOF
|
|
cat <<EOF > $name/$name-uninstalled.pc
|
|
@@ -3539,10 +3531,10 @@ Cflags: -I\${includedir}
|
|
EOF
|
|
}
|
|
|
|
-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 libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
|
|
-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"
|
|
-pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
|
|
-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
|
|
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS"
|
|
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "libavutil"
|
|
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "libavcodec libavutil"
|
|
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "libavformat libavcodec libavutil"
|
|
+pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "libavformat libavcodec libavutil libswscale"
|
|
+pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "libavutil"
|
|
+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "libavutil"
|