View | Details | Raw Unified | Return to bug 11017
Collapse All | Expand All

(-)Makefile.am.orig (-1 / +1 lines)
Lines 2-8 Link Here
2
# $Id: Makefile.am,v 1.95 2006/03/23 18:34:33 pingus77 Exp $
2
# $Id: Makefile.am,v 1.95 2006/03/23 18:34:33 pingus77 Exp $
3
##############################################################################
3
##############################################################################
4
4
5
SUBDIRS = @FFMPEGFOLDER@ alevt src font man
5
SUBDIRS = alevt src font man
6
6
7
CLEANFILES = debian/*~ slackware/*~ gentoo/*~ patch/*~ *~ .*~ *.log \#* .\#*
7
CLEANFILES = debian/*~ slackware/*~ gentoo/*~ patch/*~ *~ .*~ *.log \#* .\#*
8
8
(-)configure.in.orig (-243 / +2 lines)
Lines 1471-1721 Link Here
1471
    dnl ---------xdtv flag--------------------------------------------
1471
    dnl ---------xdtv flag--------------------------------------------
1472
    AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is inside XdTV now!)
1472
    AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is inside XdTV now!)
1473
    AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is inside XdTV now!)
1473
    AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is inside XdTV now!)
1474
    FFMPEGFOLDER="libavutil libpostproc libavcodec libavformat"
1474
    FFMPEGLINK="-lavformat -lpostproc -lavcodec"
1475
    FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libavcodec/libavcodec.a"
1475
    FFMPEGINC="-I/usr/include/ffmpeg -I/usr/include/libpostproc"
1476
    FFMPEGINC="-I../libavutil -I../libpostproc -I../libavformat -I../libavcodec"
1477
    AC_SUBST(FFMPEGLINK)
1476
    AC_SUBST(FFMPEGLINK)
1478
    AC_SUBST(FFMPEGINC)
1477
    AC_SUBST(FFMPEGINC)
1479
    AC_SUBST(FFMPEGFOLDER)
1480
1481
    dnl ---------ffmpeg flag-------------------------------------------
1482
    AC_DEFINE(CONFIG_AC3_ENCODER,1,FFMPEG is inside XdTV now!)
1483
    AC_DEFINE(TUNECPU,generic,FFMPEG is inside XdTV now!)
1484
    AC_DEFINE(HAVE_LOCALTIME_R,1,FFMPEG is inside XdTV now!)
1485
    saved_LIBS="$LIBS"
1486
    LIBS="$saved_LIBS -lm"
1487
    AC_CHECK_FUNC(lrintf, AC_DEFINE(HAVE_LRINTF,1,lrintf function),)
1488
    LIBS="$saved_LIBS"
1489
    AC_DEFINE(HAVE_VHOOK,1,FFMPEG is inside XdTV now!)
1490
    AC_DEFINE(CONFIG_ENCODERS,1,FFMPEG is inside XdTV now!)
1491
    AC_DEFINE(CONFIG_DECODERS,1,FFMPEG is inside XdTV now!)
1492
    AC_DEFINE(CONFIG_MUXERS,1,FFMPEG is inside XdTV now!)
1493
    AC_DEFINE(CONFIG_DEMUXERS,1,FFMPEG is inside XdTV now!)
1494
    AC_DEFINE(CONFIG_PP,1,FFMPEG is inside XdTV now!)
1495
    AC_DEFINE(CONFIG_HAVE_DLFCN,1,FFMPEG is inside XdTV now!)
1496
    AC_DEFINE(HAVE_MALLOC_H,1,FFMPEG is inside XdTV now!)
1497
    AC_CHECK_FUNC(memalign, AC_DEFINE(HAVE_MEMALIGN,1,memalign function),)
1498
    AC_DEFINE(SIMPLE_IDCT,1,FFMPEG is inside XdTV now!)
1499
    AC_DEFINE(CONFIG_GPL,1,FFMPEG is inside XdTV now!)
1500
    AC_DEFINE(restrict,__restrict__,FFMPEG is inside XdTV now!)
1501
    AC_DEFINE(CONFIG_MP2_ENCODER,1,FFMPEG is inside XdTV now!)
1502
    AC_DEFINE(CONFIG_MPEG1VIDEO_ENCODER,1,FFMPEG is inside XdTV now!)
1503
    AC_DEFINE(CONFIG_MPEG2VIDEO_ENCODER,1,FFMPEG is inside XdTV now!)
1504
    AC_DEFINE(CONFIG_H261_ENCODER,1,FFMPEG is inside XdTV now!)
1505
    AC_DEFINE(CONFIG_H263_ENCODER,1,FFMPEG is inside XdTV now!)
1506
    AC_DEFINE(CONFIG_H263P_ENCODER,1,FFMPEG is inside XdTV now!)
1507
    AC_DEFINE(CONFIG_FLV_ENCODER,1,FFMPEG is inside XdTV now!)
1508
    AC_DEFINE(CONFIG_RV10_ENCODER,1,FFMPEG is inside XdTV now!)
1509
    AC_DEFINE(CONFIG_RV20_ENCODER,1,FFMPEG is inside XdTV now!)
1510
    AC_DEFINE(CONFIG_MPEG4_ENCODER,1,FFMPEG is inside XdTV now!)
1511
    AC_DEFINE(CONFIG_MSMPEG4V2_ENCODER,1,FFMPEG is inside XdTV now!)
1512
    AC_DEFINE(CONFIG_MSMPEG4V3_ENCODER,1,FFMPEG is inside XdTV now!)
1513
    AC_DEFINE(CONFIG_WMV1_ENCODER,1,FFMPEG is inside XdTV now!)
1514
    AC_DEFINE(CONFIG_WMV2_ENCODER,1,FFMPEG is inside XdTV now!)
1515
    AC_DEFINE(CONFIG_MJPEG_ENCODER,1,FFMPEG is inside XdTV now!)
1516
    AC_DEFINE(CONFIG_LJPEG_ENCODER,1,FFMPEG is inside XdTV now!)
1517
    AC_DEFINE(CONFIG_HUFFYUV_ENCODER,1,FFMPEG is inside XdTV now!)
1518
    AC_DEFINE(CONFIG_FFVHUFF_ENCODER,1,FFMPEG is inside XdTV now!)
1519
    AC_DEFINE(CONFIG_ASV1_ENCODER,1,FFMPEG is inside XdTV now!)
1520
    AC_DEFINE(CONFIG_ASV2_ENCODER,1,FFMPEG is inside XdTV now!)
1521
    AC_DEFINE(CONFIG_FFV1_ENCODER,1,FFMPEG is inside XdTV now!)
1522
    AC_DEFINE(CONFIG_SNOW_ENCODER,1,FFMPEG is inside XdTV now!)
1523
    AC_DEFINE(CONFIG_DVVIDEO_ENCODER,1,FFMPEG is inside XdTV now!)
1524
    AC_DEFINE(CONFIG_MPEG2VIDEO_DECODER,1,FFMPEG is inside XdTV now!)
1525
    AC_DEFINE(CONFIG_MPEGVIDEO_DECODER,1,FFMPEG is inside XdTV now!)
1526
    AC_DEFINE(CONFIG_MP2_DECODER,1,FFMPEG is inside XdTV now!)
1527
    AC_DEFINE(CONFIG_PROTOCOLS,1,FFMPEG is inside XdTV now!)
1528
1529
    if test x"$enable_ffmpeg_amrnb" == xyes; then
1530
      enable_ffmpeg_amrnb_fixed="no"
1531
    fi
1532
    if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then
1533
      enable_ffmpeg_amrnb="no"
1534
    fi
1535
1536
    if test x"$enable_ffmpeg_amrnb" == xyes; then
1537
1538
      dnl ---------xdtv flag-------
1539
      AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!)
1540
1541
      dnl ---------ffmpeg flags-------
1542
      AC_DEFINE(AMR,1,FFMPEG AMR activation!)
1543
      echo "AMR=yes" >> config.mak.in
1544
1545
      AC_DEFINE(AMR_NB,1,AMR_NB activation!)
1546
      echo "AMR_NB=yes" >> config.mak.in
1547
1548
      AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!)
1549
      echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in
1550
1551
      AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb)
1552
      AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed)
1553
1554
      echo ""
1555
      echo "*** AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
1556
      echo "*** REL-5 V5.1.0 from "
1557
      echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip"
1558
      echo "*** and extracted the source to libavcodec/amr_float"
1559
      echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h"
1560
      echo ""
1561
    fi
1562
1563
    if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then
1564
1565
      dnl ---------xdtv flag-------
1566
      AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!)
1567
1568
      dnl ---------ffmpeg flags-------
1569
      AC_DEFINE(AMR,1,FFMPEG AMR activation!)
1570
      echo "AMR=yes" >> config.mak.in
1571
1572
      AC_DEFINE(AMR_NB_FIXED,1,AMR_NB_FIXED activation!)
1573
      echo "AMR_NB_FIXED=yes" >> config.mak.in
1574
1575
      AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!)
1576
      echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in
1577
1578
      AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb)
1579
      AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed)
1580
1581
      echo ""
1582
      echo "*** AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
1583
      echo "*** REL-5 version 5.1.0 from "
1584
      echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-5??.zip"
1585
      echo "*** and extracted src to libavcodec/amr"
1586
      echo "*** You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile."
1587
      echo "*** i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO"
1588
      echo ""
1589
    fi
1590
1591
    if test x"$enable_ffmpeg_amrwb" == xyes; then
1592
1593
      dnl ---------xdtv flag-------
1594
      AC_DEFINE(HAVE_FFMPEG_AMR_WB,1,FFMPEG AMR_WB activation!)
1595
1596
      dnl ---------ffmpeg flags-------
1597
      AC_DEFINE(AMR,1,FFMPEG AMR activation!)
1598
      echo "AMR=yes" >> config.mak.in
1599
1600
      AC_DEFINE(AMR_WB,1,AMR_NB activation!)
1601
      echo "AMR_WB=yes" >> config.mak.in
1602
1603
      AC_DEFINE(CONFIG_AMR_WB_ENCODER,1,AMR_WB_ENCODER activation!)
1604
      echo "CONFIG_AMR_WB_ENCODER=yes" >> config.mak.in
1605
1606
      AC_MSG_RESULT(*** FFMPEG AMR_WB_FLOAT: $enable_ffmpeg_amrwb)
1607
1608
      echo ""
1609
      echo "*** AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
1610
      echo "*** V5.1.0 from "
1611
      echo "*** http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip"
1612
      echo "*** and extracted the source to libavcodec/amrwb_float"
1613
      echo ""
1614
      echo "*** Make sure you have also downloaded TS26.104"
1615
      echo "*** REL-5 V5.1.0 from "
1616
      echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip"
1617
      echo "*** and extracted the source to libavcodec/amr_float"
1618
      echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h"
1619
      echo ""
1620
    fi
1621
1622
    if test "$LIBLAME" != ""; then
1623
1624
      dnl ---------xdtv flags--------------
1625
      AC_DEFINE(HAVE_FFMPEG_MP3,1,FFMPEG lame library)
1626
1627
      dnl ---------ffmpeg flags--------------
1628
      AC_DEFINE(CONFIG_MP3LAME_ENCODER,1,FFMPEG is inside XdTV now!)
1629
      AC_DEFINE(CONFIG_MP3LAME,1,FFMPEG is inside XdTV now!)
1630
      echo "CONFIG_MP3LAME=yes" >> config.mak.in
1631
      echo "CONFIG_MP3LAME_ENCODER=yes" >> config.mak.in
1632
1633
      AC_MSG_RESULT(*** FFMPEG LAME: yes)
1634
    fi
1635
1636
    if test "$LIBXVID" != ""; then
1637
1638
      dnl ---------xdtv flags--------------
1639
      AC_DEFINE(HAVE_FFMPEG_XVID,1, FFMPEG XviD librairies)
1640
1641
      dnl ---------ffmpeg flags--------------
1642
      AC_DEFINE(CONFIG_XVID_ENCODER,1,FFMPEG is inside XdTV now!)
1643
      AC_DEFINE(CONFIG_XVID,1,FFMPEG is inside XdTV now!)
1644
      echo "CONFIG_XVID=yes" >> config.mak.in
1645
      echo "CONFIG_XVID_ENCODER=yes" >> config.mak.in
1646
1647
      AC_MSG_RESULT(*** FFMPEG XVID: yes)
1648
    fi
1649
1650
      if test "$LIBFAAC" != ""; then
1651
1652
      dnl ---------xdtv flags--------------
1653
      AC_DEFINE(HAVE_FFMPEG_AAC,1, FFMPEG AAC librairies)
1654
1655
      dnl ---------ffmpeg flags--------------
1656
      AC_DEFINE(CONFIG_FAAC_ENCODER,1,FFMPEG AAC is inside XdTV now!)
1657
      AC_DEFINE(CONFIG_FAAC,1,FFMPEG AAC is inside XdTV now!)
1658
      echo "CONFIG_FAAC=yes" >> config.mak.in
1659
      echo "CONFIG_FAAC_ENCODER=yes" >> config.mak.in
1660
1661
      AC_MSG_RESULT(*** FFMPEG FAAC: yes)
1662
    fi
1663
1664
    if test "$LIBX264" != ""; then
1665
1666
      dnl ---------xdtv flags--------------
1667
      AC_DEFINE(HAVE_FFMPEG_X264,1, FFMPEG X264 librairies)
1668
1669
      dnl ---------ffmpeg flags--------------
1670
      AC_DEFINE(CONFIG_X264_ENCODER,1,FFMPEG X264 is inside XdTV now!)
1671
      AC_DEFINE(CONFIG_X264,1,FFMPEG X264 is inside XdTV now!)
1672
      echo "CONFIG_X264=yes" >> config.mak.in
1673
      echo "CONFIG_X264_ENCODER=yes" >> config.mak.in
1674
1675
      AC_MSG_RESULT(*** FFMPEG X264: yes)
1676
    fi
1677
1678
    dnl ---------ffmpeg optimization--------------
1679
    if test x"$have_mmx" == xyes; then
1680
      echo "TARGET_MMX=yes" >> config.mak.in
1681
      AC_DEFINE(__CPU__,586,FFMPEG is inside XdTV now!)
1682
      AC_MSG_RESULT(*** FFMPEG with MMX: yes)
1683
    fi
1684
1685
    if test x"$_sse" == xyes; then
1686
      AC_DEFINE(HAVE_BUILTIN_VECTOR,1,FFMPEG is inside XdTV now!)
1687
      echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak.in
1688
      AC_MSG_RESULT(*** FFMPEG with SSE: yes)
1689
    fi
1690
1691
    AC_TRY_COMPILE([#include <mm3dnow.h>],,mm3dnow=yes,mm3dnow=no)
1692
    if test x"$mm3dnow" == xyes -a x"$_3dnow" == xyes -a x"$_3dnowex" == xyes; then
1693
      echo "TARGET_BUILTIN_3DNOW=yes" >> config.mak.in
1694
      AC_DEFINE(HAVE_MM3DNOW,1,FFMPEG is inside XdTV now!)
1695
      AC_MSG_RESULT(*** FFMPEG with 3Dnow!: yes)
1696
    fi
1697
1698
    dnl ---------ffmpeg arch--------------
1699
    if test x"$host_arch" == xi386; then
1700
      AC_DEFINE(ARCH_X86,1,FFMPEG is inside XdTV now!)
1701
      echo "TARGET_ARCH_X86=yes" >> config.mak.in
1702
    fi
1703
1704
    if test x"$host_arch" == xx86_64; then
1705
      AC_DEFINE(ARCH_X86_64,1,FFMPEG is inside XdTV now!)
1706
      echo "TARGET_ARCH_X86_64=yes" >> config.mak.in
1707
    fi
1708
1709
    if test x"$host_arch" == xalpha; then
1710
      AC_DEFINE(ARCH_ALPHA,1,FFMPEG is inside XdTV now!)
1711
      echo "TARGET_ARCH_ALPHA=yes" >> config.mak.in
1712
    fi
1713
1714
    if test x"$host_arch" == xsparc; then
1715
      AC_DEFINE(ARCH_SPARC,1,FFMPEG is inside XdTV now!)
1716
      echo "TARGET_ARCH_SPARC=yes" >> config.mak.in
1717
    fi
1718
1719
else
1478
else
1720
    AC_MSG_WARN(*** FFmpeg support disabled)
1479
    AC_MSG_WARN(*** FFmpeg support disabled)
1721
fi
1480
fi

Return to bug 11017