Commit graph

2092 commits

Author SHA1 Message Date
Amar Takhar
b9e9ab7906 The swscale check was enabling ffmpeg without checking if ffmpeg had been
detected or not.  This reworks how ffmpeg is detected and it is now _disabled_
if swscale does not exist.  Also fix some nearby style issues.

Originally committed to SVN as r2192.
2008-05-14 15:15:52 +00:00
Alysson Souza
4e334cb1d1 oops, forgot to commit hotkeys.cpp
Originally committed to SVN as r2191.
2008-05-09 05:03:40 +00:00
Alysson Souza
baf52a3430 Applied Harukalover's patch #2 - Added play audio/video buttons to Styling Assistant
Originally committed to SVN as r2190.
2008-05-09 04:27:10 +00:00
Alysson Souza
0de8190b21 Applied Harukalover's patch #1 - Added play audio/video buttons to Translation Assistant
Originally committed to SVN as r2189.
2008-05-09 03:43:47 +00:00
Amar Takhar
37a50cd97d Fix hunspell run-check, NULL,NULL used to work fine for the aff/dic path in
<1.2 but it segfaults in >1.2.  They've been changed to ".","." which works
fine.

Originally committed to SVN as r2188.
2008-04-25 20:47:13 +00:00
Amar Takhar
86d02ede5e Make hunspell 1.2.0 the default, no sense in supporting the old version.
Originally committed to SVN as r2187.
2008-04-25 04:39:49 +00:00
Amar Takhar
ecf30d37d7 Make --without-hunspell work correctly.
Originally committed to SVN as r2186.
2008-04-25 02:28:05 +00:00
Rodrigo Braz Monteiro
8918fb6296 Added a little very specific hacked up tool that isn't enabled unless you modify config.dat.
Originally committed to SVN as r2185.
2008-04-21 16:41:46 +00:00
Amar Takhar
8fa30c8f15 libass update r26303: Case insensitive parsing of SSA/ASS section headers.
Originally committed to SVN as r2184.
2008-04-21 05:47:09 +00:00
Amar Takhar
fa125abc3a s/.../../ and s/.././ where required for consistency.
Originally committed to SVN as r2183.
2008-04-20 14:53:59 +00:00
Amar Takhar
03953062c2 Add missing AC_DEFINE for WITH_HUNSPELL, without this hunspell was not being
activated.  I've just verified that it works fine.

Originally committed to SVN as r2182.
2008-04-20 14:52:09 +00:00
Amar Takhar
d0de1fe366 s/return;/return 0;/ for the Freetype run-check, bug #700, thank you!
Originally committed to SVN as r2181.
2008-04-14 20:47:22 +00:00
Amar Takhar
b012a3149c Freetype/Fontconfig were pushed under two conditionals beacuse on Darwin we use
Freetype to list fonts (it uses native features).  When support for glibc iconv
was added the case broke and set $build_linux, the conditional for the
fontconfig font lister was $build_default which no longer got triggered.  Puts
the font listers under FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon
$build_darwin being no/yes.

Originally committed to SVN as r2180.
2008-04-13 17:44:54 +00:00
Amar Takhar
806ba1eb5a Fix with_csri test, I typoed it without spaces which test requires. This was
forcing CSRI on in every condition.

Originally committed to SVN as r2179.
2008-04-13 17:00:23 +00:00
Amar Takhar
dc404a954e Add UNIX (and with luck, OS X) support to assdraw. This (unfortunatly)
includes propgrid, the build system for propgrid is brutal rather than fend of
users trying to build it themselves it's worth it to just include it with
assdraw for now.

Originally committed to SVN as r2177.
2008-04-13 06:57:09 +00:00
Amar Takhar
4966c21cc8 Fix alignment of --help messages.
Originally committed to SVN as r2176.
2008-04-13 05:55:40 +00:00
Amar Takhar
870b2cf2e7 Fix --enable-wx-styledtextctrl,--enable-wx-opengl and rename them to
--disable-check-wx-stc / --disable-check-wx-opengl which makes more sense.

Originally committed to SVN as r2175.
2008-04-13 05:52:24 +00:00
Amar Takhar
aa7cc5a2dc Add support for CSRI (ASA), this has been tested and confirmed as working.
Compiling libass/asa in at the same time is OK.

Originally committed to SVN as r2174.
2008-04-13 05:10:27 +00:00
Amar Takhar
0734c81d9e Whoops, re-add nuked } after 'extern "C" {' that got removed when the __WINDOWS__ wrap
was removed.

Originally committed to SVN as r2173.
2008-04-13 04:47:33 +00:00
Amar Takhar
a2d584c115 Add missing 'test' before iconv linux check.
Originally committed to SVN as r2172.
2008-04-11 16:13:08 +00:00
Amar Takhar
b19daec0ae Move iconv out of the libass check block and under 'program features' (in
preperation for asa support which requires iconv as well.)

Originally committed to SVN as r2171.
2008-04-11 15:17:00 +00:00
Amar Takhar
041820e259 Remove -liconv from the default LDFLAGS if we're building on linux, since iconv
support is built-in.  If this ever causes an issue between glibc and iconv
support I'll add a warning.

Originally committed to SVN as r2170.
2008-04-10 16:15:26 +00:00
Amar Takhar
0607976605 Remove the __WINDOWS__ around 'include "../libass/ass.h"', I didn't notice this
on my system since I have ass/ass.h in /usr/local/include.  The header hasn't
changed so no damage done, unless you don't have libass installed.

Originally committed to SVN as r2169.
2008-04-06 15:08:43 +00:00
Amar Takhar
016dbfca80 add a missing } in the hunspell run-check (reported by sl1pkn07 via IRC)
Originally committed to SVN as r2168.
2008-04-06 03:12:35 +00:00
Fredrik Mellbin
975c85be7c FFmpegSource 1.18
Originally committed to SVN as r2167.
2008-04-05 09:33:35 +00:00
Fredrik Mellbin
f72e6794a3 FFmpegSource 1.17
Originally committed to SVN as r2166.
2008-04-04 22:43:33 +00:00
Amar Takhar
c03fc5b447 Switch iconv support to use AC_AGI_COMPILE.
Originally committed to SVN as r2165.
2008-04-01 18:49:01 +00:00
Amar Takhar
b38e6582c2 Fix Lua 5.0 (auto3) and Lua 5.1 (auto4) detection to use AC_AGI_COMPILE, Lua 5.1
requires LIBS= to be set to pull the Lua symbols in properly, this is a temp
solution until we move to modules.

Originally committed to SVN as r2164.
2008-04-01 01:56:49 +00:00
Amar Takhar
bc0811d4f3 Fix a cut-and-paste-o. (s/LUA50/LUA/)
Originally committed to SVN as r2163.
2008-03-31 19:28:56 +00:00
Niels Martin Hansen
58788ea5ce Change default ALSA output device to something more sensible, namely 'default:0'.
Originally committed to SVN as r2162.
2008-03-31 17:55:21 +00:00
Fredrik Mellbin
0e01a74fb5 fix for h264 with b-frame pyramid stuff
Originally committed to SVN as r2161.
2008-03-30 15:39:02 +00:00
Amar Takhar
aaa6d081d3 Fix typo in help message, alignment.
Originally committed to SVN as r2160.
2008-03-30 15:37:12 +00:00
Amar Takhar
7746efa54e * Fix ICONV_CFLAGS / ICONV_LDFLAGS so they're properly propogated during the
build.
* s/ICONV_LIBS/ICONV_LDFLAGS/ to fix the addtion of ICONV_LDFLAGS during final
  linking.

Originally committed to SVN as r2159.
2008-03-30 08:08:43 +00:00
Amar Takhar
0cf6fce7de Add -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries to
aegisub_LDFLAGS, for now we don't do any GL link checks so there is no point in
adding it to configure.

Originally committed to SVN as r2158.
2008-03-30 06:35:00 +00:00
Amar Takhar
cfa2003553 Sigh, really fix the typo(s).
Originally committed to SVN as r2157.
2008-03-30 06:17:08 +00:00
Amar Takhar
cc25285ddd Fix typo that slipped into previous commit.
Originally committed to SVN as r2156.
2008-03-30 06:13:36 +00:00
Amar Takhar
ad63c0fbac Add a check for avutil, conditional on BUILD_DARWIN which is required on OSX.
Originally committed to SVN as r2155.
2008-03-30 06:11:45 +00:00
Amar Takhar
8b7ddf12aa Allow PERL_(CFLAGS|LDFLAGS) and RUBY_(CFLAGS|LDFLAGS) to be set, which overrides
using the perl and ruby binaries to get them.

Originally committed to SVN as r2154.
2008-03-29 23:56:44 +00:00
Amar Takhar
0f196ca1f9 Add missing $ to ICONV_CFLAGS/ICONV_LDFLAGS, also change CFLAGS tp CPPCFLAGS for
the header check. (this fixes the libass build)

Originally committed to SVN as r2153.
2008-03-29 23:09:55 +00:00
Amar Takhar
0fb1fee1a8 * Add target platform detection, at the moment this only uses OS info.
* Fix font_file_lister to use fontconfig for unix, freetype for OS X
* Set bevelbutton to be conditional for Darwin only. (this fixes the header
  missing header as well)

Originally committed to SVN as r2152.
2008-03-29 22:30:30 +00:00
Fredrik Mellbin
d6e76cee4f FFmpegSource 1.16 + minor fix
Originally committed to SVN as r2151.
2008-03-28 21:14:06 +00:00
Amar Takhar
b7af0a06d5 * Add a detection for platform/arch.
* Add a new condtitional BUILD_DARWIN for fontconfig/freetype font listing
  support.

Originally committed to SVN as r2150.
2008-03-26 23:58:39 +00:00
Niels Martin Hansen
abeaf06776 Possible fix for bevelButton problem
Originally committed to SVN as r2149.
2008-03-26 23:28:12 +00:00
Amar Takhar
d47ee5f164 s/libass_aegisub_a_CPPFLAGS/AM_CPPFLAGS/, it's only 1 library a general case is OK.
Originally committed to SVN as r2148.
2008-03-26 00:03:14 +00:00
Amar Takhar
3cd825e98b c_str() on _filename.
Originally committed to SVN as r2147.
2008-03-25 23:51:54 +00:00
Amar Takhar
91c641789f Remove #ifdef __APPLE__ glue, this will be the same as UNIX, eventually.
Originally committed to SVN as r2146.
2008-03-25 23:43:28 +00:00
Amar Takhar
ffaac724e1 Remove a !defined(__APPLE__) around #include "lavc_keyframes.h", also add a c_str().
Originally committed to SVN as r2145.
2008-03-25 23:42:39 +00:00
Amar Takhar
5ad19a2558 More .cstr().
Originally committed to SVN as r2144.
2008-03-25 23:08:28 +00:00
Amar Takhar
f0f0d541b6 Add a .c_str(); to _filename (line 83)
Originally committed to SVN as r2143.
2008-03-25 23:01:29 +00:00
Amar Takhar
bd836309be Make ICONV_CFLAGS/ICONV_LDFLAGS override the default flags like everything else.
(required for OS X)

Originally committed to SVN as r2142.
2008-03-25 20:03:26 +00:00