[ liba52/.libs/liba52.a ],
[ include ])
-PKG_3RD([audiofile],[auto],
+PKG_3RD([djbfft],[yes],
+ [djbfft-0.76],
+ [ djbfft.a ],
+ [ . ])
+
+PKG_3RD([audiofile],[no],
[audiofile-0.3.6],
[ libaudiofile/.libs/libaudiofile.a \
libaudiofile/modules/.libs/libmodules.a \
libaudiofile/alac/.libs/libalac.a ],
[ libaudiofile ])
-PKG_3RD([encore],[yes],
+PKG_3RD([encore],[no],
[encore-5.0],
[ \$(OBJDIR)/libencore.a ],
[ . ])
-PKG_3RD([esound],[auto],
+PKG_3RD([esound],[no],
[esound-0.2.41],
[ .libs/libesd.a \
.libs/libesddsp.a ],
PKG_3RD([faac],[auto],
[faac-1.28],
- [ libfaac/.libs/libfaac.a \
- common/mp4v2/libmp4v2.a ],
+ [ libfaac/.libs/libfaac.a ],
[ include ])
PKG_3RD([faad2],[auto],
[ libAACdec/include libAACenc/include libSYS/include ])
PKG_3RD([ffmpeg],[yes],
- [ffmpeg-3.0],
+ [ffmpeg-3.1.2],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ . ])
PKG_3RD([x265],[yes],
- [x265_1.9],
+ [x265_2.0],
[ libx265.a ],
[ . source ])
AC_DEFUN([CHECK_WANT], [
RESULT=yes
AC_ARG_WITH(m4_tolower([$1]),
- AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$2] (auto)),
- [WANT_$1=$withval],[WANT_$1=auto])
+ AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)),
+ [WANT_$1=$withval],[WANT_$1=$2])
# WANT_$1
if test "x$WANT_$1" != "xno" ; then
- m4_quote($3)
-fi
-if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
- echo "=== want $1 Failed."
- WANT_$1=no
-else
- WANT_$1=yes
+ m4_quote($4)
+ if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
+ echo "=== want $1 Failed."
+ WANT_$1=no
+ else
+ WANT_$1=yes
+ fi
fi
CFG_WANTS+=" $1"
AC_SUBST([WANT_$1])
])
-CHECK_WANT([GL], [use opengl], [
+CHECK_WANT([GL], [auto], [use opengl], [
CHECK_LIB([GL], [GL], [glUseProgram])
CHECK_LIB([GL], [GLU], [gluOrtho2D])
CHECK_HEADERS([GL], [opengl headers], [GL/gl.h GL/glext.h GL/glu.h GL/glx.h])])
-CHECK_WANT([OSS], [use OSS audio], [
+CHECK_WANT([OSS], [auto], [use OSS audio], [
CHECK_HEADERS([OSS], [oss headers], [sys/soundcard.h])])
-CHECK_WANT([XFT], [use libXft], [
+CHECK_WANT([XFT], [auto], [use libXft], [
CHECK_LIB([XFT], [Xft], [XftInit])
CHECK_HEADERS([XFT], [Xft/freetype headers], [X11/Xlib.h X11/Xft/Xft.h])])
-CHECK_WANT([ALSA], [use libasound/alsa], [
+CHECK_WANT([ALSA], [auto], [use libasound/alsa], [
CHECK_LIB([ALSA], [asound], [snd_pcm_open])
CHECK_HEADERS([ALSA], [asound headers], [alsa/asoundlib.h])])
-CHECK_WANT([FIREWIRE], [use firewire], [
+CHECK_WANT([FIREWIRE], [auto], [use firewire], [
CHECK_LIB([libavc1394], [avc1394], [avc1394_init_target])
CHECK_HEADERS([libavc1394], [libavc1394 headers], [libavc1394/avc1394.h])
CHECK_LIB([libavc1394], [rom1394], [rom1394_get_bus_id])
CHECK_LIB([libraw1394], [raw1394], [raw1394_iso_recv_init])
CHECK_HEADERS([libraw1394], [libraw1394 headers], [libraw1394/raw1394.h])])
-CHECK_WANT([DV], [use dv], [
+CHECK_WANT([DV], [auto], [use dv], [
CHECK_LIB([libdv], [dv], [dv_init])
CHECK_HEADERS([libdv], [libdv headers], [libdv/dv.h])])
-CHECK_WANT([DVB], [use dvb], [
+CHECK_WANT([DVB], [auto], [use dvb], [
CHECK_HEADERS([DVB], [dvb device headers], [linux/dvb/dmx.h linux/dvb/frontend.h])])
-CHECK_WANT([VIDEO4LINUX2], [use v4l2], [
+CHECK_WANT([VIDEO4LINUX2], [auto], [use v4l2], [
CHECK_HEADERS([VIDEO4LINUX2], [v4l2 system headers], [linux/kernel.h linux/types.h linux/videodev2.h])])
-CHECK_WANT([XXF86VM], [use xf86vmode], [
+CHECK_WANT([XXF86VM], [auto], [use xf86vmode], [
CHECK_HEADERS([XXF86VM], [XF86VM headers], [X11/Xlib.h X11/extensions/xf86vmode.h])])
-CHECK_WANT([ESOUND], [use esd], [
+CHECK_WANT([ESOUND], [no], [use esd], [
CHECK_LIB([esound], [esd], [esd_open_sound])
CHECK_HEADERS([esound], [esound headers], [esd.h])
CHECK_LIB([audiofile], [audiofile], [afOpenFile])
CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
-CHECK_WANT([DL], [system has libdl], [
+CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
-CHECK_WANT([NUMA], [system has libnuma], [
+CHECK_WANT([NUMA], [auto], [system has libnuma], [
CHECK_LIB([NUMA], [numa], [numa_alloc])])
])
AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])])
+# order matters
+for dep in \
+ ffmpeg/faac ffmpeg/faad2 ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
+ ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/fdk \
+ libiec61883/libraw1394 libavc1394/librom1394 \
+ openexr/ilmbase ilmbase/libogg \
+ libtheora/libogg libtheora/libvorbis ; do
+ lib=`dirname $dep`
+ eval pkg_lib="\$PKG_$lib"; eval have_lib="\$HAVE_$lib";
+ if test "x$pkg_lib" != "xno" ; then
+ needs=`basename $dep`
+ eval "PKG_$needs=yes"
+ fi
+done
+
AC_DEFUN([PKG_PROVIDE],[
if test "x$BUILD_$1" = "x" ; then
if test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then
])
PKG_PROVIDE([a52dec])
+PKG_PROVIDE([djbfft])
PKG_PROVIDE([encore])
PKG_PROVIDE([audiofile],[$WANT_ESOUND])
PKG_PROVIDE([esound],[$WANT_ESOUND])
for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done
echo ""
-echo "CFLAGS ?= ${CFLAGS:--g -O2}"
+echo "ifndef CFLAGS_"
+echo "ifdef CFLAGS"
+echo "CFLAGS_ := \$(CFLAGS)"
+echo "else"
+echo "CFLAGS_ := ${CFLAGS:--g -O2}"
+echo "endif"
+echo "endif"
+
+echo "CFLAGS := \$(CFLAGS_)"
echo "CFLAGS += '-DCIN=\"\$(WANT_CIN)\"'"
echo "CFLAGS += '-DCINLIB_DIR=\"$WANT_CINLIB_DIR\"'"
echo "CFLAGS += '-DCINDAT_DIR=\"$WANT_CINDAT_DIR\"'"
for flg in $CFG_CFLAGS; do echo "CFLAGS += $flg"; done
echo ""
for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
-echo "unexport CFLAGS CXXFLAGS"
echo ""
if test $WANT_X264_HIDEPTH = "yes" ; then
echo "libraries += \$(thirdparty_libraries)"
echo "libraries += \$(system_libs)"
echo "libraries += \$(EXTRA_LIBS)"
-echo "export thirdparty_libraries libraries"
echo ""
+echo "export thirdparty_libraries libraries"
+echo "export CFLAGS_ CXXFLAGS_ LDFLAGS_"
+echo "unexport CFLAGS CXXFLAGS LDFLAGS"
projects / goodguy / history.git / blobdiff