--- Makefile.am.orig 2007-03-04 14:58:01 +0300 +++ Makefile.am 2007-03-04 14:58:07 +0300 @@ -2,7 +2,7 @@ # $Id: Makefile.am,v 1.95 2006/03/23 18:34:33 pingus77 Exp $ ############################################################################## -SUBDIRS = @FFMPEGFOLDER@ alevt src font man +SUBDIRS = alevt src font man CLEANFILES = debian/*~ slackware/*~ gentoo/*~ patch/*~ *~ .*~ *.log \#* .\#* --- configure.in.orig 2007-03-04 14:49:23 +0300 +++ configure.in 2007-03-04 14:53:46 +0300 @@ -1471,251 +1471,10 @@ dnl ---------xdtv flag-------------------------------------------- AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is inside XdTV now!) AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is inside XdTV now!) - FFMPEGFOLDER="libavutil libpostproc libavcodec libavformat" - FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libavcodec/libavcodec.a" - FFMPEGINC="-I../libavutil -I../libpostproc -I../libavformat -I../libavcodec" + FFMPEGLINK="-lavformat -lpostproc -lavcodec" + FFMPEGINC="-I/usr/include/ffmpeg -I/usr/include/libpostproc" AC_SUBST(FFMPEGLINK) AC_SUBST(FFMPEGINC) - AC_SUBST(FFMPEGFOLDER) - - dnl ---------ffmpeg flag------------------------------------------- - AC_DEFINE(CONFIG_AC3_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(TUNECPU,generic,FFMPEG is inside XdTV now!) - AC_DEFINE(HAVE_LOCALTIME_R,1,FFMPEG is inside XdTV now!) - saved_LIBS="$LIBS" - LIBS="$saved_LIBS -lm" - AC_CHECK_FUNC(lrintf, AC_DEFINE(HAVE_LRINTF,1,lrintf function),) - LIBS="$saved_LIBS" - AC_DEFINE(HAVE_VHOOK,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_ENCODERS,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_DECODERS,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MUXERS,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_DEMUXERS,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_PP,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_HAVE_DLFCN,1,FFMPEG is inside XdTV now!) - AC_DEFINE(HAVE_MALLOC_H,1,FFMPEG is inside XdTV now!) - AC_CHECK_FUNC(memalign, AC_DEFINE(HAVE_MEMALIGN,1,memalign function),) - AC_DEFINE(SIMPLE_IDCT,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_GPL,1,FFMPEG is inside XdTV now!) - AC_DEFINE(restrict,__restrict__,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MP2_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MPEG1VIDEO_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MPEG2VIDEO_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_H261_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_H263_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_H263P_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_FLV_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_RV10_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_RV20_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MPEG4_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MSMPEG4V2_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MSMPEG4V3_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_WMV1_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_WMV2_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MJPEG_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_LJPEG_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_HUFFYUV_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_FFVHUFF_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_ASV1_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_ASV2_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_FFV1_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_SNOW_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_DVVIDEO_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MPEG2VIDEO_DECODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MPEGVIDEO_DECODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MP2_DECODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_PROTOCOLS,1,FFMPEG is inside XdTV now!) - - if test x"$enable_ffmpeg_amrnb" == xyes; then - enable_ffmpeg_amrnb_fixed="no" - fi - if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then - enable_ffmpeg_amrnb="no" - fi - - if test x"$enable_ffmpeg_amrnb" == xyes; then - - dnl ---------xdtv flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!) - - dnl ---------ffmpeg flags------- - AC_DEFINE(AMR,1,FFMPEG AMR activation!) - echo "AMR=yes" >> config.mak.in - - AC_DEFINE(AMR_NB,1,AMR_NB activation!) - echo "AMR_NB=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb) - AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed) - - echo "" - echo "*** AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104" - echo "*** REL-5 V5.1.0 from " - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip" - echo "*** and extracted the source to libavcodec/amr_float" - echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h" - echo "" - fi - - if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then - - dnl ---------xdtv flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!) - - dnl ---------ffmpeg flags------- - AC_DEFINE(AMR,1,FFMPEG AMR activation!) - echo "AMR=yes" >> config.mak.in - - AC_DEFINE(AMR_NB_FIXED,1,AMR_NB_FIXED activation!) - echo "AMR_NB_FIXED=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb) - AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed) - - echo "" - echo "*** AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 " - echo "*** REL-5 version 5.1.0 from " - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-5??.zip" - echo "*** and extracted src to libavcodec/amr" - echo "*** You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile." - echo "*** i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO" - echo "" - fi - - if test x"$enable_ffmpeg_amrwb" == xyes; then - - dnl ---------xdtv flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_WB,1,FFMPEG AMR_WB activation!) - - dnl ---------ffmpeg flags------- - AC_DEFINE(AMR,1,FFMPEG AMR activation!) - echo "AMR=yes" >> config.mak.in - - AC_DEFINE(AMR_WB,1,AMR_NB activation!) - echo "AMR_WB=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_WB_ENCODER,1,AMR_WB_ENCODER activation!) - echo "CONFIG_AMR_WB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_WB_FLOAT: $enable_ffmpeg_amrwb) - - echo "" - echo "*** AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204" - echo "*** V5.1.0 from " - echo "*** http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip" - echo "*** and extracted the source to libavcodec/amrwb_float" - echo "" - echo "*** Make sure you have also downloaded TS26.104" - echo "*** REL-5 V5.1.0 from " - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip" - echo "*** and extracted the source to libavcodec/amr_float" - echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h" - echo "" - fi - - if test "$LIBLAME" != ""; then - - dnl ---------xdtv flags-------------- - AC_DEFINE(HAVE_FFMPEG_MP3,1,FFMPEG lame library) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_MP3LAME_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_MP3LAME,1,FFMPEG is inside XdTV now!) - echo "CONFIG_MP3LAME=yes" >> config.mak.in - echo "CONFIG_MP3LAME_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG LAME: yes) - fi - - if test "$LIBXVID" != ""; then - - dnl ---------xdtv flags-------------- - AC_DEFINE(HAVE_FFMPEG_XVID,1, FFMPEG XviD librairies) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_XVID_ENCODER,1,FFMPEG is inside XdTV now!) - AC_DEFINE(CONFIG_XVID,1,FFMPEG is inside XdTV now!) - echo "CONFIG_XVID=yes" >> config.mak.in - echo "CONFIG_XVID_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG XVID: yes) - fi - - if test "$LIBFAAC" != ""; then - - dnl ---------xdtv flags-------------- - AC_DEFINE(HAVE_FFMPEG_AAC,1, FFMPEG AAC librairies) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_FAAC_ENCODER,1,FFMPEG AAC is inside XdTV now!) - AC_DEFINE(CONFIG_FAAC,1,FFMPEG AAC is inside XdTV now!) - echo "CONFIG_FAAC=yes" >> config.mak.in - echo "CONFIG_FAAC_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG FAAC: yes) - fi - - if test "$LIBX264" != ""; then - - dnl ---------xdtv flags-------------- - AC_DEFINE(HAVE_FFMPEG_X264,1, FFMPEG X264 librairies) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_X264_ENCODER,1,FFMPEG X264 is inside XdTV now!) - AC_DEFINE(CONFIG_X264,1,FFMPEG X264 is inside XdTV now!) - echo "CONFIG_X264=yes" >> config.mak.in - echo "CONFIG_X264_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG X264: yes) - fi - - dnl ---------ffmpeg optimization-------------- - if test x"$have_mmx" == xyes; then - echo "TARGET_MMX=yes" >> config.mak.in - AC_DEFINE(__CPU__,586,FFMPEG is inside XdTV now!) - AC_MSG_RESULT(*** FFMPEG with MMX: yes) - fi - - if test x"$_sse" == xyes; then - AC_DEFINE(HAVE_BUILTIN_VECTOR,1,FFMPEG is inside XdTV now!) - echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak.in - AC_MSG_RESULT(*** FFMPEG with SSE: yes) - fi - - AC_TRY_COMPILE([#include ],,mm3dnow=yes,mm3dnow=no) - if test x"$mm3dnow" == xyes -a x"$_3dnow" == xyes -a x"$_3dnowex" == xyes; then - echo "TARGET_BUILTIN_3DNOW=yes" >> config.mak.in - AC_DEFINE(HAVE_MM3DNOW,1,FFMPEG is inside XdTV now!) - AC_MSG_RESULT(*** FFMPEG with 3Dnow!: yes) - fi - - dnl ---------ffmpeg arch-------------- - if test x"$host_arch" == xi386; then - AC_DEFINE(ARCH_X86,1,FFMPEG is inside XdTV now!) - echo "TARGET_ARCH_X86=yes" >> config.mak.in - fi - - if test x"$host_arch" == xx86_64; then - AC_DEFINE(ARCH_X86_64,1,FFMPEG is inside XdTV now!) - echo "TARGET_ARCH_X86_64=yes" >> config.mak.in - fi - - if test x"$host_arch" == xalpha; then - AC_DEFINE(ARCH_ALPHA,1,FFMPEG is inside XdTV now!) - echo "TARGET_ARCH_ALPHA=yes" >> config.mak.in - fi - - if test x"$host_arch" == xsparc; then - AC_DEFINE(ARCH_SPARC,1,FFMPEG is inside XdTV now!) - echo "TARGET_ARCH_SPARC=yes" >> config.mak.in - fi - else AC_MSG_WARN(*** FFmpeg support disabled) fi