summaryrefslogtreecommitdiff
path: root/configure
Commit message (Collapse)AuthorAge
* Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-09
|\ | | | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-09
| | | | | | | | Simplifies host/target libc detection splitting.
* | Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | * commit '61b203ffe6c71789acb14f51483d63fe9e516842': configure: detect Solaris libc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: detect Solaris libcSean McGovern2013-12-09
| | | | | | | | | | | | Add preprocessor flags for API availability as necessary. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avformat: AviSynth demuxer rewrited s2013-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directly loads AviSynth through LoadLibrary instead of relying on Video for Windows, and supports using AvxSynth (via dlopen) to open scripts on Linux and OS X. Error messages from AviSynth/AvxSynth are now reported through av_log and exit, rather than the traditional behavior of generating an error video that the user would need to watch to diagnose. The main rewrite was authored by d s <avxsynth.testing@gmail.com> from the AvxSynth team, with additional contributions by Oka Motofumi <chikuzen.mo@gmail.com> Stephen Hutchinson <qyot27@gmail.com> Diego Biurrun <diego@biurrun.de> Anton Khirnov <anton@khirnov.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | * qatar/master: configure: Move adding of compat objects out of libc detection Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Move adding of compat objects out of libc detectionDiego Biurrun2013-12-08
| |
* | common.mak: Less ugly version of the previous windres fixJames Almer2013-12-09
| | | | | | | | | | | | | | Using subst here is a really ugly hack Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Move MinGW64 specific check to the correct placeJames Almer2013-12-09
| | | | | | | | | | | | | | It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-08
|\| | | | | | | | | | | | | * qatar/master: configure: Separate MinGW32 and MinGW64 libc handling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Separate MinGW32 and MinGW64 libc handlingDiego Biurrun2013-12-08
| |
* | configure: Special case libfreetype testAlexander Strasser2013-12-08
| | | | | | | | | | | | | | | | | | | | | | Include the freetype header, in-directly through a macro, like it is done in the drawtext filter. Do not break if the header is moved. Unfortunately the drawtext filter included the file where the include macros are defined in a wrong way. This is not needed and breaks the build. Remove that #include line too. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | doc: add script to compute texi files dependenciesStefano Sabatini2013-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the inline awk script with a Perl script which tracks the dependencies recursively. This allows to correctly track dependencies for files including files with a second level include (for example: ffmpeg-devices.texi -> devices.texi -> outdevs.texi). This also adds a dependency on perl for computing the dependencies, which should not be a problem since perl is already required all the way for building documentation. This is a variant of commit 628ceac6526724d35cb390cc1f88344f4ea22eb4 which was reverted due to out-of-tree build failure.
* | Add Windows resource file support for shared librariesJames Almer2013-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-04
|\| | | | | | | | | | | | | | | | | | | * qatar/master: configure: Detect msvcrt libc with a CPP check instead of a link check Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Detect msvcrt libc with a CPP check instead of a link checkDiego Biurrun2013-12-04
| | | | | | | | Simplifies host/target libc detection splitting.
* | Merge commit '5ec467328122b80fac94c2d5e3e7540d50381868'Michael Niedermayer2013-12-04
|\| | | | | | | | | | | | | * commit '5ec467328122b80fac94c2d5e3e7540d50381868': configure: Add detected C library and host compiler to informative output Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add detected C library and host compiler to informative outputDiego Biurrun2013-12-04
| |
* | configure: put pthread_create() check backMichael Niedermayer2013-12-02
| | | | | | | | | | | | Unbreaks freebsd, broken since f058f384a0d76bfd125f4738dceab7c890186432 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit 'f058f384a0d76bfd125f4738dceab7c890186432': configure: Do not use pthread_create to check for pthread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Do not use pthread_create to check for pthreadLuca Barbato2013-11-30
| | | | | | | | | | | | | | Certain instrumentation addons leads to a false positive in configure and link failures at the end of the build phase. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | configure: remove code that disables striping in the absence of some flagsMichael Niedermayer2013-11-28
| | | | | | | | | | | | This prevents breaking (non asm) striping in that case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build sys: rename STRIPFLAGS to ASMSTRIPFLAGSMichael Niedermayer2013-11-28
| | | | | | | | | | | | | | This more closely matches the actual use, also we use plain strip without these flags for striping Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587'Michael Niedermayer2013-11-28
|\| | | | | | | | | | | | | * commit '0673ede985a6560e7efb86dab1c58fb7f95ce587': configure: add strip flags checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add strip flags checksVittorio Giovara2013-11-28
| | | | | | | | | | | | This will check if -wN '..@*' is available and fall back on -x if not; when none are available, do not run strip at all to prevent removing functions that might be actually needed.
* | build: integrate remaining examples.Clément Bœsch2013-11-28
| |
* | Revert "configure: add #include "version.h" to config.h"Michael Niedermayer2013-11-28
| | | | | | | | | | | | | | | | | | | | This reverts commit ca21116b3f53a9bdd74364bfab9cde70a044b165. Revert suggested by Jamal: "Bad secondary effect i just noticed: Every time version.h is changed (git pull for example), anything that includes config.h will be recompiled. And that means pretty much every single file in the tree. "
* | configure: add #include "version.h" to config.hTimothy Gu2013-11-27
| | | | | | | | | | | | | | Avoid clash with version.h of the libraries. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/transcode_aac: switch to swresampleMichael Niedermayer2013-11-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-27
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Add an audio transcoding example. Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add an audio transcoding example.Andreas Unterweger2013-11-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: Check for pod2man instead of perl for manual page generation Conflicts: configure doc/Makefile The code that this changes is mostly not part of ffmpeg thus only a few whitespaces end up being merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Check for pod2man instead of perl for manual page generationDiego Biurrun2013-11-26
| | | | | | | | Some systems provide Perl without pod2man.
| * configure: Restore doc option to disable building the documentationDiego Biurrun2013-11-26
| | | | | | | | Also add appropriate dependency declarations for perl and texi2html.
* | configure: define CONFIG_THIS_YEAR at the configure levelStefano Sabatini2013-11-26
| | | | | | | | The macro value can be shared between configure script and cmdutils.c.
* | Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'Michael Niedermayer2013-11-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c': build: Integrate multilibrary examples into the build system Conflicts: configure doc/Makefile doc/examples/muxing.c doc/examples/output.c libavformat/Makefile libavformat/output-example.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Integrate multilibrary examples into the build systemDiego Biurrun2013-11-25
| | | | | | | | This includes moving libavformat/output-example to doc/examples/output.
* | Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"James Almer2013-11-25
| | | | | | | | | | | | | | | | This partially reverts commit c0237d19a0269ff44e909434f1b2b645fad2d281 Some scripts make use of --disable-doc Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | * qatar/master: build: Import makedef script from c99-to-c89 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Import makedef script from c99-to-c89Derek Buitenhuis2013-11-24
| | | | | | | | | | | | | | This allows MSVC 2013 and ICL to build with no external dependencies. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f187557ab4612776f7f527ecf3d40062975c3e4c': build: more fine-grained dependencies for documentation build tools Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: more fine-grained dependencies for documentation build toolsDiego Biurrun2013-11-23
| | | | | | | | Perl is needed to build the manual pages, texi2html for the HTML pages.
* | Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add support for VDPAU decodingAnton Khirnov2013-11-23
| |
* | Add --enable-rpath option to add -Wl,-rpath to pkg-config files.Reimar Döffinger2013-11-23
| | | | | | | | | | | | | | | | | | | | | | | | This allows installing into e.g. /usr/lib/ffmpeg and binaries linked against ffmpeg will pick these .so file while binaries linked against some fork or different version will pick the libraries in /usr/lib. There will be still some issues for binaries that (indirectly) end up depending on multiple variants, but for the simpler cases it should allow different applications to use different (compatible) variants that are installed at the same time. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-21
|\| | | | | | | | | | | | | | | | | | | * qatar/master: configure: Avoid requiring c99wrap for working around msys path issues Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Avoid requiring c99wrap for working around msys path issuesMartin Storsjö2013-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Msys is unable to convert unix style absolute paths to windows style paths when combined with certain multichar MSVC options such as -Fo<file>. We used to work around this issue by passing them as two separate parameters separated by a space to c99wrap, which then mapped them back to the actual parameter format that MSVC uses. The only paths that actually are an issue are absolute unix style paths, and the only place such absolute paths are used with the output arguments (-Fo, -Fe, -Fi, -out:) are for the temp files within configure. By setting TMPDIR to . for msvc/icl builds, we never need to use absolute unix style paths for the file output, and we can use the actual proper form of the file output parameters. This avoids requiring the c99wrap wrapper for remapping the parameters for cases where the c99 converter isn't invoked at all (MSVC2013 and ICL). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-20
|\| | | | | | | | | | | | | * qatar/master: win{32,64}: Hard disable symbol versioning Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * win{32,64}: Hard disable symbol versioningDerek Buitenhuis2013-11-19
| | | | | | | | | | | | | | | | ICL doesn't return an error on unknown parameters, and will always pass the symver_gnu_asm test, and since Windows never has symbol versioning, just always disable it. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | * qatar/master: configure: Don't use symlinks for creating the out of tree makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>