mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
4784 commits 10 branches 31 tags 48 MiB
Commit graph

86 commits

Author SHA1 Message Date
Thomas Goyne
4bd34ee32f Actually compile ffms and libass providers when they're enabled 
Originally committed to SVN as r5838.
 2011-11-08 06:06:43 +00:00
Thomas Goyne
3a80292762 Increase required wx version to 2.9.2 
Originally committed to SVN as r5836.
 2011-11-08 04:14:03 +00:00
Thomas Goyne
2d61579a65 Remove the AC_LIB_RPATH hack as it breaks gettext detection and generates a million warnings 
Originally committed to SVN as r5835.
 2011-11-08 04:12:47 +00:00
Thomas Goyne
14d734298e Add -lrt to the test for ALSA 
Originally committed to SVN as r5827.
 2011-11-07 15:50:52 +00:00
Thomas Goyne
8b5545c98f Finish porting the alsa player from 2.1.9 so that it actually compiles 
Originally committed to SVN as r5825.
 2011-11-07 05:24:46 +00:00
Thomas Goyne
0a91be1c7c Unconditionally enable building automation even if there are no enabled engines as there isn't really any reason not to and the defines uglify the code. 
Originally committed to SVN as r5621.
 2011-09-28 19:45:35 +00:00
Thomas Goyne
85b46bceff Fix required version of FFMS2 
Originally committed to SVN as r5486.
 2011-07-16 18:43:22 +00:00
Thomas Goyne
eea30df7db Kill in-repo libass and ffms and clean up some old cruft in the configure script 
Originally committed to SVN as r5480.
 2011-07-16 03:36:28 +00:00
Amar Takhar
e1a59d307e * Fix iconv LDFLAGS for *bsd* 
* Minor style fix for $GL_LIBS test.
 * Fail if iconv isn't found.
 * Fix variable name for the ! subtitle-found case which was over-writing the audio variable.

Originally committed to SVN as r5154.
 2011-01-09 01:37:34 +00:00
Amar Takhar
3f110101aa Ensure the proper cflags are set for common/charset_conv.cpp in libaegisub. Also fix iconv include path on *bsd. 
Originally committed to SVN as r5145.
 2011-01-08 17:46:46 +00:00
Amar Takhar
5a635ebdb3 Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. 
Originally committed to SVN as r4895.
 2010-12-05 19:12:42 +00:00
Amar Takhar
714fa65071 Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. 
Originally committed to SVN as r4747.
 2010-08-15 18:40:58 +00:00
Amar Takhar
d4ba1f48ca Remove libosxutil and fold it into libaegisub. 
Originally committed to SVN as r4743.
 2010-08-14 17:42:37 +00:00
Thomas Goyne
f0aa85dfbb Delete the quicktime provider, as it's unmaintained and doesn't work 
Originally committed to SVN as r4715.
 2010-07-27 03:52:40 +00:00
Grigori Goronzy
6589d258ce Merge r4634. 
Originally committed to SVN as r4635.
 2010-06-28 11:14:00 +00:00
Thomas Goyne
61138e9b5d Add configure check for sys/time.h 
Originally committed to SVN as r4529.
 2010-06-16 07:49:35 +00:00
Karl Blomster
fec1f47501 Make configure not break on testing for newer ffmpeg's by hardcoding a #define into the test program. This is pretty dumb but I don't know about autotools to fix it properly and it's not like it matters. Why is it compiling C code as extern "C" with a C++ compiler, anyway? 
Originally committed to SVN as r4516.
 2010-06-14 21:11:01 +00:00
Karl Blomster
0061a58210 Fix the ffmpeg configure test so it doesn't try to use a function that has been deprecated for well over a fucking year and a half (since before 0.5, in fact). 
Originally committed to SVN as r4515.
 2010-06-14 20:55:35 +00:00
Amar Takhar
b1a0142c93 Fix r4483, close conditionals (i was a bit zealous in cutting.) 
Originally committed to SVN as r4484.
 2010-06-12 06:51:25 +00:00
Amar Takhar
74905e5f4d FFMPEG A/V providers were removed a long time ago, also add OSS as the alternative global before PA. 
Originally committed to SVN as r4483.
 2010-06-12 05:50:27 +00:00
Amar Takhar
cd62441b70 Fix some status outputs, updates #1170, requires merging 
Originally committed to SVN as r4482.
 2010-06-12 05:48:02 +00:00
Amar Takhar
c95eb3fcce universalchardet is no longer optional. 
Originally committed to SVN as r4481.
 2010-06-12 05:29:01 +00:00
Amar Takhar
d8f5d3bff0 Sigh, revert r4451, I checked this before I comitted but the reason it worked was due to a typo (in this case failure was what i was looking for): to do the const check the values must be initialised otherwise (all/most?) compilers will ignore keywords in a signature check unless you actually try to give it a real value. 
Originally committed to SVN as r4452.
 2010-06-06 03:24:01 +00:00
Amar Takhar
576d7dd8cc Unlike the other tests the iconv const check is just looking for the actual function signature it doesn't use it, we don't need to initialise anything.. 
Originally committed to SVN as r4451.
 2010-06-06 03:11:41 +00:00
Amar Takhar
aa895f9a26 Follow previous conventions and change ICONV_CONST to AGI_ICONV_CONST as wx' defines ICONV_CONST. 
Originally committed to SVN as r4448.
 2010-06-06 02:46:36 +00:00
Amar Takhar
4d9ff8d626 * Set ICONV_CONST to 1 if iconv is const or not, aparrantly this differs between versions (annoying!) 
* Remove -fpermissive, this was required long ago but now there are only a couple of trivial fixes to make.

Originally committed to SVN as r4446.
 2010-06-06 02:40:29 +00:00
Amar Takhar
9d0c5a4890 Add Googles mutex.h which seems to be used in many of googles projects. It's better to use something that's well-tested rather than rolling our own. Also a huge time saver. 
Originally committed to SVN as r4372.
 2010-05-31 21:57:08 +00:00
Grigori Goronzy
8f67d48487 Initial support for external libass with pkg-config 
This introduces the configure option --with-external-libass; the
internal copy is still used by default. Fixes #917.

Originally committed to SVN as r4356.
 2010-05-24 02:44:31 +00:00
Amar Takhar
40e12403d5 Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. 
Initial support for low-level access and file I/O methods are included as well.

Originally committed to SVN as r4331.
 2010-05-21 01:13:36 +00:00
Amar Takhar
e4364ae6f9 Fix typo. (from kovensky), should be merged to 2.1.9 
Originally committed to SVN as r4164.
 2010-03-01 19:36:57 +00:00
Amar Takhar
e247dec1f3 Merge r4010,r4013,r4014 (configure and bundle/dmg generation fixes.) 
Originally committed to SVN as r4024.
 2010-01-21 00:34:45 +00:00
Amar Takhar
113ae0cd6d merge r4007 (optimisation flag fix.) 
Originally committed to SVN as r4023.
 2010-01-21 00:30:42 +00:00
Amar Takhar
73ab47f8ec merge r3986 (configure release support. 
Originally committed to SVN as r4022.
 2010-01-21 00:29:26 +00:00
Amar Takhar
e00936c3bf Add AC_PROG_RANLIB to configure.in, fixes 'make distclean' 
Originally committed to SVN as r3898.
 2009-12-25 04:31:59 +00:00
Amar Takhar
fff128fcfa Add support for building the QuickTime A/V providers under OSX. 
Originally committed to SVN as r3893.
 2009-12-24 23:06:47 +00:00
Amar Takhar
ec6053a674 Merge r3877. 
Originally committed to SVN as r3878.
 2009-12-22 04:19:27 +00:00
Amar Takhar
0c34323b5d Hopefully this is the last test. 
Originally committed to SVN as r3828.
 2009-11-29 14:01:57 +00:00
Amar Takhar
ddcb31cfa9 How much whitespace does it take... (another test.) 
Originally committed to SVN as r3827.
 2009-11-29 13:31:38 +00:00
Amar Takhar
1834434b13 Another commit to test the buildbot. 
Originally committed to SVN as r3826.
 2009-11-29 13:27:56 +00:00
Amar Takhar
7709a5bbb4 Bunk commit to test the buildbot. 
Originally committed to SVN as r3825.
 2009-11-29 13:16:08 +00:00
Amar Takhar
9a4db2b466 Use the two new macros to supply auto-detection for lua. updates #989. 
Originally committed to SVN as r3802.
 2009-11-17 04:47:26 +00:00
Amar Takhar
c72ac65d0f Fix --enable-gcov: 
* Rename GCOV_FLAGS -> GCOV_CFLAGS
 * Add GCOV_LDFLAGS (default is -lgcov)

Originally committed to SVN as r3724.
 2009-10-20 03:35:42 +00:00
Amar Takhar
669e11d10b Remove boost check as ffms has removed the usage of boost::format. This is trunk-only for now. Updates #1023. 
Originally committed to SVN as r3691.
 2009-10-12 00:14:36 +00:00
Amar Takhar
61c3a3149e Remove boost check, the macro I'm using has serious bugs that only shows up on some systems. 
Originally committed to SVN as r3660.
 2009-10-09 15:22:06 +00:00
Amar Takhar
3bea135663 Check for lua.hpp usability not lua.h, Updates #998. 
Originally committed to SVN as r3654.
 2009-10-09 14:43:14 +00:00
Amar Takhar
df259693d9 Add a check for boost which is now required by ffms.. this should be backported to 2.1.8. 
Originally committed to SVN as r3639.
 2009-10-07 01:34:47 +00:00
Amar Takhar
4f01dab280 Add dynamic build support for *bsd and linux. 
Originally committed to SVN as r3560.
 2009-09-26 14:50:24 +00:00
Grigori Goronzy
9d0daf6821 Add OSS audio player 
Tested on OSS4 (4front), FreeBSD 7.2 OSS and with ALSA's OSS emulation.
Bear with me, this is both my first serious C++ and OSS code.

Originally committed to SVN as r3497.
 2009-09-08 22:06:07 +00:00
Amar Takhar
6c08c50d92 Revert 3489 the issue is more complex than I originally thought. Updates #1009. 
Originally committed to SVN as r3490.
 2009-09-05 20:19:13 +00:00
Amar Takhar
7bbf2e6ce8 * Add a check and warnming message if X_CFLAGS / X_LIBS isn't set (and a note that you need Imake) 
* Remove two lines that have been commented for a year
 * Fix some error message wording.

Originally committed to SVN as r3489.
 2009-09-05 19:53:18 +00:00