d5240098e3
update needed for newer x264 and for gcc4. this causes yet more fallout as some libav* functions other ports were using have been fully deprecated. commits coming rsn ... mostly from new MAINTAINER
124 lines
5.6 KiB
Plaintext
124 lines
5.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.23 2010/05/26 21:38:52 jakemsr Exp $
|
|
--- configure.orig Tue May 11 19:21:00 2010
|
|
+++ configure Sun May 16 13:19:13 2010
|
|
@@ -1064,7 +1064,6 @@ HAVE_LIST="
|
|
lzo1x_999_compress
|
|
machine_ioctl_bt848_h
|
|
machine_ioctl_meteor_h
|
|
- malloc_h
|
|
memalign
|
|
mkstemp
|
|
pld
|
|
@@ -1076,6 +1075,7 @@ HAVE_LIST="
|
|
setmode
|
|
socklen_t
|
|
soundcard_h
|
|
+ sndio_h
|
|
poll_h
|
|
setrlimit
|
|
strerror_r
|
|
@@ -1396,6 +1396,10 @@ jack_indev_extralibs="-ljack"
|
|
libdc1394_indev_deps="libdc1394"
|
|
oss_indev_deps_any="soundcard_h sys_soundcard_h"
|
|
oss_outdev_deps_any="soundcard_h sys_soundcard_h"
|
|
+sndio_indev_deps="sndio_h"
|
|
+sndio_indev_extralibs="-lsndio"
|
|
+sndio_outdev_deps="sndio_h"
|
|
+sndio_outdev_extralibs="-lsndio"
|
|
v4l_indev_deps="linux_videodev_h"
|
|
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
|
|
vfwcap_indev_deps="capCreateCaptureWindow"
|
|
@@ -1465,6 +1469,10 @@ cpu="generic"
|
|
target_os_default=$(tolower $(uname -s))
|
|
host_os=$target_os_default
|
|
|
|
+if test "$target_os_default" = "openbsd"; then
|
|
+ arch_default=$(arch -s)
|
|
+fi
|
|
+
|
|
# configurable options
|
|
enable avcodec
|
|
enable avdevice
|
|
@@ -1489,7 +1497,7 @@ enable swscale
|
|
enable swscale_alpha
|
|
|
|
# build settings
|
|
-SHFLAGS='-shared -Wl,-soname,$$(@F)'
|
|
+SHFLAGS='-shared'
|
|
FFSERVERLDFLAGS=-Wl,-E
|
|
LIBPREF="lib"
|
|
LIBSUF=".a"
|
|
@@ -1499,7 +1507,7 @@ SLIBPREF="lib"
|
|
SLIBSUF=".so"
|
|
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
|
|
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
|
|
-SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
|
|
+SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
|
|
LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
|
|
|
|
CC_O='-o $@'
|
|
@@ -2605,7 +2613,7 @@ enabled libdirac && add_cflags $(pkg-config --cflags
|
|
require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
|
|
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
|
|
enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad
|
|
-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
|
|
+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
|
|
enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame -lm
|
|
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 -lm
|
|
@@ -2687,11 +2695,14 @@ check_header dev/ic/bt8xx.h
|
|
|
|
check_header sys/soundcard.h
|
|
check_header soundcard.h
|
|
+check_header sndio.h
|
|
|
|
enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
|
|
|
|
enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack
|
|
|
|
+enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
|
|
+
|
|
enabled x11grab &&
|
|
check_header X11/Xlib.h &&
|
|
check_header X11/extensions/XShm.h &&
|
|
@@ -2726,9 +2737,6 @@ enabled extra_warnings && check_cflags -Winline
|
|
|
|
# add some linker flags
|
|
check_ldflags -Wl,--warn-common
|
|
-check_ldflags -Wl,--as-needed
|
|
-check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
|
|
-check_ldflags -Wl,-Bsymbolic
|
|
|
|
echo "X{};" > $TMPV
|
|
test_ldflags -Wl,--version-script,$TMPV &&
|
|
@@ -3123,8 +3131,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
|
|
@@ -3143,12 +3150,12 @@ Cflags: -I\${includedir}
|
|
EOF
|
|
}
|
|
|
|
-pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
|
|
-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 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" "libavcodec libavformat libavutil"
|
|
enabled avfilter &&
|
|
- pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
|
|
+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "libavcodec libavutil libswscale"
|
|
enabled postproc &&
|
|
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
|
|
-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
|
|
+ pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "libavutil"
|
|
+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "libavutil"
|