API tools faq
paste
jyavenard

Untitled

jyavenard
May 24th, 2012
229
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 16.85 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/mythtv/configure b/mythtv/configure
  2. index 986ed88..ef664c4 100755
  3. --- a/mythtv/configure
  4. +++ b/mythtv/configure
  5. @@ -195,7 +195,6 @@ Configuration options:
  6. --disable-swscale disable libswscale build
  7. --enable-postproc enable GPLed postprocessing support [no]
  8. --disable-avfilter disable video filter support [no]
  9. - --disable-avresample disable libavresample build [no]
  10. --disable-pthreads disable pthreads [auto]
  11. --enable-w32threads use Win32 threads [no]
  12. --enable-x11grab enable X11 grabbing [no]
  13. @@ -269,7 +268,6 @@ Configuration options:
  14. External library support:
  15. --enable-avisynth enable reading of AVISynth script files [no]
  16. --enable-bzlib enable bzlib [autodetect]
  17. - --enable-fontconfig enable fontconfig
  18. --enable-frei0r enable frei0r video filtering
  19. --enable-gnutls enable gnutls [no]
  20. --enable-libaacplus enable AAC+ encoding via libaacplus [no]
  21. @@ -282,6 +280,7 @@ External library support:
  22. --enable-libcdio enable audio CD grabbing with libcdio
  23. --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
  24. and libraw1394 [no]
  25. + --enable-libdirac enable Dirac support via libdirac [no]
  26. --enable-libfaac enable FAAC support via libfaac [no]
  27. --enable-libfreetype enable libfreetype [no]
  28. --enable-libgsm enable GSM support via libgsm [no]
  29. @@ -300,7 +299,7 @@ External library support:
  30. --enable-libv4l2 enable libv4l2/v4l-utils [no]
  31. --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no]
  32. --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no]
  33. - --enable-libvorbis enable Vorbis en/decoding via libvorbis,
  34. + --enable-libvorbis enable Vorbis encoding via libvorbis,
  35. native implementation exists [no]
  36. --enable-libvpx enable VP8 support via libvpx [no]
  37. --enable-libx264 enable H.264 encoding via x264 [no]
  38. @@ -371,8 +370,6 @@ Developer options (useful when working on FFmpeg itself):
  39. --disable-optimizations disable compiler optimizations
  40. --enable-extra-warnings enable more compiler warnings
  41. --disable-stripping disable stripping of executables and shared libraries
  42. - --assert-level=level 0(default), 1 or 2, amount of assertion testing,
  43. - 2 causes a slowdown at runtime.
  44. --samples=PATH location of test samples for FATE
  45.  
  46. NOTE: Object files are built at the place where configure is launched.
  47. @@ -1232,7 +1229,6 @@ CONFIG_LIST="
  48. avdevice
  49. avfilter
  50. avformat
  51. - avresample
  52. avisynth
  53. bzlib
  54. crystalhd
  55. @@ -1242,7 +1238,6 @@ CONFIG_LIST="
  56. dxva2
  57. fastdiv
  58. fft
  59. - fontconfig
  60. frei0r
  61. gnutls
  62. gpl
  63. @@ -1254,6 +1249,7 @@ CONFIG_LIST="
  64. libcdio
  65. libcelt
  66. libdc1394
  67. + libdirac
  68. libfaac
  69. libfreetype
  70. libgsm
  71. @@ -1379,7 +1375,6 @@ HAVE_LIST="
  72. attribute_may_alias
  73. attribute_packed
  74. cbrtf
  75. - clock_gettime
  76. closesocket
  77. cmov
  78. dcbzl
  79. @@ -1435,11 +1430,9 @@ HAVE_LIST="
  80. memalign
  81. mkstemp
  82. mmap
  83. - netinet_sctp_h
  84. PeekNamedPipe
  85. poll_h
  86. posix_memalign
  87. - pthread_cancel
  88. round
  89. roundf
  90. sched_getaffinity
  91. @@ -1619,7 +1612,6 @@ CMDLINE_SET="
  92. ar
  93. arch
  94. as
  95. - assert_level
  96. build_suffix
  97. cc
  98. cpu
  99. @@ -1866,6 +1858,7 @@ h264_parser_select="golomb h264dsp h264pred"
  100. # external libraries
  101. libaacplus_encoder_deps="libaacplus"
  102. libcelt_decoder_deps="libcelt"
  103. +libdirac_decoder_deps="libdirac !libschroedinger"
  104. libfaac_encoder_deps="libfaac"
  105. libgsm_decoder_deps="libgsm"
  106. libgsm_encoder_deps="libgsm"
  107. @@ -1886,7 +1879,6 @@ libstagefright_h264_decoder_deps="libstagefright_h264"
  108. libtheora_encoder_deps="libtheora"
  109. libvo_aacenc_encoder_deps="libvo_aacenc"
  110. libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
  111. -libvorbis_decoder_deps="libvorbis"
  112. libvorbis_encoder_deps="libvorbis"
  113. libvpx_decoder_deps="libvpx"
  114. libvpx_encoder_deps="libvpx"
  115. @@ -1973,7 +1965,6 @@ mmst_protocol_deps="network"
  116. rtmp_protocol_deps="!librtmp_protocol"
  117. rtmp_protocol_select="tcp_protocol"
  118. rtp_protocol_select="udp_protocol"
  119. -sctp_protocol_deps="network netinet_sctp_h"
  120. tcp_protocol_deps="network"
  121. tls_protocol_deps_any="openssl gnutls"
  122. tls_protocol_select="tcp_protocol"
  123. @@ -1986,31 +1977,24 @@ aresample_filter_deps="swresample"
  124. ass_filter_deps="libass"
  125. blackframe_filter_deps="gpl"
  126. boxblur_filter_deps="gpl"
  127. -colormatrix_filter_deps="gpl"
  128. cropdetect_filter_deps="gpl"
  129. delogo_filter_deps="gpl"
  130. drawtext_filter_deps="libfreetype"
  131. frei0r_filter_deps="frei0r dlopen"
  132. -frei0r_filter_extralibs='$ldl'
  133. frei0r_src_filter_deps="frei0r dlopen"
  134. -frei0r_src_filter_extralibs='$ldl'
  135. hqdn3d_filter_deps="gpl"
  136. movie_filter_deps="avcodec avformat"
  137. mp_filter_deps="gpl avcodec swscale postproc"
  138. mptestsrc_filter_deps="gpl"
  139. negate_filter_deps="lut_filter"
  140. -resample_filter_deps="avresample"
  141. ocv_filter_deps="libopencv"
  142. pan_filter_deps="swresample"
  143. -removelogo_filter_deps="avcodec avformat swscale"
  144. scale_filter_deps="swscale"
  145. -super2xsai_filter_deps="gpl"
  146. tinterlace_filter_deps="gpl"
  147. yadif_filter_deps="gpl"
  148.  
  149. # libraries
  150. avdevice_deps="avcodec avformat"
  151. -avfilter_deps="swscale"
  152. avformat_deps="avcodec"
  153. postproc_deps="gpl"
  154.  
  155. @@ -2020,7 +2004,7 @@ ffplay_select="buffersink_filter rdft"
  156. ffprobe_deps="avcodec avformat"
  157. ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
  158. ffserver_extralibs='$ldl'
  159. -ffmpeg_deps="avcodec avfilter avformat swscale swresample format_filter"
  160. +ffmpeg_deps="avcodec avformat swscale swresample"
  161. ffmpeg_select="buffersink_filter"
  162.  
  163. doc_deps="texi2html"
  164. @@ -2142,8 +2126,6 @@ test_deps _muxer _demuxer \
  165. yuv4mpegpipe=yuv4mpeg \
  166.  
  167. ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder"
  168. -colormatrix1_test_deps="colormatrix_filter"
  169. -colormatrix2_test_deps="colormatrix_filter"
  170. flashsv2_test_deps="zlib"
  171. mpg_test_deps="mpeg1system_muxer mpegps_demuxer"
  172. mpng_test_deps="zlib"
  173. @@ -2241,7 +2223,6 @@ enable avcodec
  174. enable avdevice
  175. enable avfilter
  176. enable avformat
  177. -enable avresample
  178. enable avutil
  179. enable postproc
  180. enable stripping
  181. @@ -2852,24 +2833,6 @@ elif $cc -v 2>&1 | grep -q Open64; then
  182. speed_cflags='-O2'
  183. size_cflags='-Os'
  184. filter_cflags='filter_out -Wdisabled-optimization|-Wtype-limits|-fno-signed-zeros'
  185. -elif $cc -V 2>&1 | grep -q Portland; then
  186. - cc_type=pgi
  187. - cc_version='AV_STRINGIFY(__PGIC__.__PGIC_MINOR__.__PGIC_PATCHLEVEL__)'
  188. - cc_ident="PGI $($cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')"
  189. - opt_common='-alias=ansi -Mlre -Mpre'
  190. - speed_cflags="-O3 -Mautoinline -Munroll=c:4 $opt_common"
  191. - size_cflags="-O2 -Munroll=c:1 $opt_common"
  192. - noopt_cflags="-O1"
  193. - filter_cflags=pgi_flags
  194. - pgi_flags(){
  195. - for flag; do
  196. - case $flag in
  197. - -fomit-frame-pointer) echo -Mnoframe ;;
  198. - -g) echo -gopt ;;
  199. - *) echo $flag ;;
  200. - esac
  201. - done
  202. - }
  203. fi
  204.  
  205. test -n "$cc_type" && enable $cc_type ||
  206. @@ -3190,12 +3153,9 @@ elif enabled ppc; then
  207. 74*|ppc74*|powerpc74*)
  208. cpuflags="-mcpu=7400 -mpowerpc-gfxopt"
  209. ;;
  210. - g5|970|ppc970|powerpc970)
  211. + g5|970|ppc970|powerpc970|power4*)
  212. cpuflags="-mcpu=970 -mpowerpc-gfxopt -mpowerpc64"
  213. ;;
  214. - power[3-7]*)
  215. - cpuflags="-mcpu=$cpu -mpowerpc-gfxopt -mpowerpc64"
  216. - ;;
  217. cell)
  218. cpuflags="-mcpu=cell"
  219. enable ldbrx
  220. @@ -3405,14 +3365,14 @@ case $target_os in
  221. SHFLAGS='-shared -Wl,-h,$$(@F)'
  222. enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
  223. network_extralibs="-lsocket -lnsl"
  224. - add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
  225. + add_cppflags -D__EXTENSIONS__
  226. # When using suncc to build, the Solaris linker will mark
  227. # an executable with each instruction set encountered by
  228. # the Solaris assembler. As our libraries contain their own
  229. # guards for processor-specific code, instead suppress
  230. # generation of the HWCAPS ELF section on Solaris x86 only.
  231. enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile
  232. - add_cxxppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
  233. + add_cxxppflags -D__EXTENSIONS__
  234. nm_opts='-P -g'
  235. ;;
  236. netbsd)
  237. @@ -3424,6 +3384,7 @@ case $target_os in
  238. ;;
  239. openbsd)
  240. append CCONFIG "openbsd"
  241. + enable malloc_aligned
  242. # On OpenBSD 4.5. the compiler does not use PIC unless
  243. # explicitly using -fPIC. FFmpeg builds fine without PIC,
  244. # however the generated executable will not do anything
  245. @@ -3436,10 +3397,12 @@ case $target_os in
  246. oss_outdev_extralibs="-lossaudio"
  247. ;;
  248. dragonfly)
  249. + enable malloc_aligned
  250. disable symver
  251. ;;
  252. freebsd)
  253. append CCONFIG "freebsd"
  254. + enable malloc_aligned
  255. # Workaround compile errors from missing u_int/uint def
  256. CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
  257. disable ivtv
  258. @@ -3478,6 +3441,7 @@ EOF
  259. fi
  260.  
  261. ###### Standard ffmpeg configure stuff follows:
  262. + enable malloc_aligned
  263. gas="gas-preprocessor.pl $cc"
  264. enabled ppc && add_asflags -force_cpusubtype_ALL
  265.  
  266. @@ -3507,6 +3471,7 @@ EOF
  267. fi
  268. LIBTARGET=i386
  269. if enabled x86_64; then
  270. + enable malloc_aligned
  271. LIBTARGET=x64
  272. elif enabled arm; then
  273. LIBTARGET=arm-wince
  274. @@ -3911,7 +3876,6 @@ if enabled network; then
  275. check_type netinet/in.h "struct sockaddr_in6"
  276. check_type "sys/types.h sys/socket.h" "struct sockaddr_storage"
  277. check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
  278. - check_header netinet/sctp.h
  279. # Prefer arpa/inet.h over winsock2
  280. if check_header arpa/inet.h ; then
  281. check_func closesocket
  282. @@ -4025,7 +3989,6 @@ fi
  283. # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
  284. check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
  285.  
  286. -check_func clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; }
  287. check_func fcntl
  288. check_func fork
  289. check_func getaddrinfo $network_extralibs
  290. @@ -4085,7 +4048,7 @@ check_func_headers "sys/types.h sys/socket.h ifaddrs.h" getifaddrs
  291. check_func clock_gettime || \
  292. { check_func clock_gettime -lrt && add_extralibs -lrt; }
  293.  
  294. -if ! enabled_any memalign memalign_hack posix_memalign &&
  295. +if ! enabled_any memalign memalign_hack posix_memalign malloc_aligned &&
  296. enabled_any $need_memalign ; then
  297. die "Error, no aligned memory allocator but SSE enabled, disable it or use --enable-memalign-hack."
  298. fi
  299. @@ -4124,10 +4087,6 @@ for thread in $THREADS_LIST; do
  300. fi
  301. done
  302.  
  303. -if enabled pthreads; then
  304. - check_func pthread_cancel
  305. -fi
  306. -
  307. # Attempt to use libudev for mediamonitor
  308. enabled libudev && check_lib2 libudev.h udev_new -ludev || disable libudev
  309.  
  310. @@ -4151,10 +4110,12 @@ check_mathfunc truncf
  311.  
  312. # these are off by default, so fail if requested and not available
  313. enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
  314. -enabled fontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
  315. enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
  316. enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
  317. enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
  318. +enabled libdirac && require_pkg_config dirac \
  319. + "libdirac_decoder/dirac_parser.h" \
  320. + "dirac_decoder_init"
  321. enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
  322. enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
  323. enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
  324. @@ -4169,7 +4130,7 @@ enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schr
  325. enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
  326. enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
  327. media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
  328. - media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
  329. + media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder
  330. enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
  331. enabled libutvideo && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++
  332. enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
  333. @@ -4392,12 +4353,11 @@ check_cflags -Wno-switch
  334. check_cflags -Wpointer-arith
  335. check_cflags -Wredundant-decls
  336. check_cflags -Wno-pointer-sign
  337. +check_cflags -Wcast-qual
  338. check_cflags -Wwrite-strings
  339. check_cflags -Wtype-limits
  340. check_cflags -Wundef
  341. check_cflags -Wmissing-prototypes
  342. -check_cflags -Wno-pointer-to-int-cast
  343. -check_cflags -Wstrict-prototypes
  344. enabled extra_warnings && check_cflags -Winline
  345. # C++ Flags
  346. check_cxxflags -Wall
  347. @@ -4412,7 +4372,7 @@ check_cxxflags -D__STDC_LIMIT_MACROS
  348.  
  349. # add some linker flags
  350. check_ldflags -Wl,--warn-common
  351. -check_ldflags '-Wl,-rpath-link,\$(SRC_PATH_BARE)/external/FFmpeg/libpostproc:\$(SRC_PATH_BARE)/external/FFmpeg/libswresample:\$(SRC_PATH_BARE)/external/FFmpeg/libswscale:\$(SRC_PATH_BARE)/external/FFmpeg/libavfilter:\$(SRC_PATH_BARE)/external/FFmpeg/libavdevice:\$(SRC_PATH_BARE)/external/FFmpeg/libavformat:\$(SRC_PATH_BARE)/external/FFmpeg/libavcodec:\$(SRC_PATH_BARE)/external/FFmpeg/libavutil:\$(SRC_PATH_BARE)/external/FFmpeg/libavresample'
  352. +check_ldflags '-Wl,-rpath-link,\$(SRC_PATH_BARE)/external/FFmpeg/libpostproc:\$(SRC_PATH_BARE)/external/FFmpeg/libswresample:\$(SRC_PATH_BARE)/external/FFmpeg/libswscale:\$(SRC_PATH_BARE)/external/FFmpeg/libavfilter:\$(SRC_PATH_BARE)/external/FFmpeg/libavdevice:\$(SRC_PATH_BARE)/external/FFmpeg/libavformat:\$(SRC_PATH_BARE)/external/FFmpeg/libavcodec:\$(SRC_PATH_BARE)/external/FFmpeg/libavutil'
  353. test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  354.  
  355. enabled xmm_clobber_test && \
  356. @@ -4686,11 +4646,10 @@ if enabled icc; then
  357. # -wd: Disable following warnings
  358. # 144, 167, 556: -Wno-pointer-sign
  359. # 1292: attribute "foo" ignored
  360. - # 1419: external declaration in primary source file
  361. # 10006: ignoring unknown option -fno-signed-zeros
  362. # 10148: ignoring unknown option -Wno-parentheses
  363. # 10156: ignoring option '-W'; no argument required
  364. - check_cflags -wd144,167,556,1292,1419,10006,10148,10156
  365. + check_cflags -wd144,167,556,1292,10006,10148,10156
  366. # 11030: Warning unknown option --as-needed
  367. # 10156: ignoring option '-export'; no argument required
  368. check_ldflags -wd10156,11030
  369. @@ -4907,6 +4866,7 @@ echo "libass enabled ${libass-no}"
  370. echo "libcdio support ${libcdio-no}"
  371. echo "libcelt enabled ${libcelt-no}"
  372. echo "libdc1394 support ${libdc1394-no}"
  373. +echo "libdirac enabled ${libdirac-no}"
  374. echo "libfaac enabled ${libfaac-no}"
  375. echo "libgsm enabled ${libgsm-no}"
  376. echo "libmodplug enabled ${libmodplug-no}"
  377. @@ -5199,7 +5159,6 @@ get_version LIBAVDEVICE external/FFmpeg/libavdevice/avdevice.h
  378. get_version LIBAVFILTER external/FFmpeg/libavfilter/version.h
  379. get_version LIBAVFORMAT external/FFmpeg/libavformat/version.h
  380. get_version LIBAVUTIL external/FFmpeg/libavutil/avutil.h
  381. -get_version LIBAVRESAMPLE external/FFmpeg/libavresample/version.h
  382. get_version LIBPOSTPROC external/FFmpeg/libpostproc/postprocess.h
  383. get_version LIBSWRESAMPLE external/FFmpeg/libswresample/swresample.h
  384. get_version LIBSWSCALE external/FFmpeg/libswscale/swscale.h
  385. @@ -5246,19 +5205,12 @@ cat > $TMPH <<EOF
  386. #define SIZEOF_LONG $_sizeof_long
  387. EOF
  388.  
  389. -test -n "$assert_level" &&
  390. - echo "#define ASSERT_LEVEL $assert_level" >>$TMPH
  391. -
  392. test -n "$malloc_prefix" &&
  393. echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH
  394.  
  395. if enabled small || disabled optimizations; then
  396. echo "#undef av_always_inline" >> $TMPH
  397. - if enabled small; then
  398. - echo "#define av_always_inline inline" >> $TMPH
  399. - else
  400. - echo "#define av_always_inline av_unused" >> $TMPH
  401. - fi
  402. + echo "#define av_always_inline av_unused" >> $TMPH
  403. fi
  404.  
  405. if enabled mac_corevideo; then
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!