Commit Graph

129 Commits

Author SHA1 Message Date
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
Amar Takhar ad542ab8fc Drop the curl version from 7.19.2 to 7.18.2 beacuse debian/ubuntu have ancient versions installed.
Originally committed to SVN as r3477.
2009-09-03 07:10:57 +00:00
Amar Takhar 930f593d6a dd the beginings of the Aegisub Reporter, this is my first C++ program from scratch. (yes, that's a disclaimer)
What's left to be done:
  * Crash support. (only works for 'reports')
  * UI cleanups.
  * Interfacing with Aegisub to get proper metrics.
  * OSX support.
  * Windows support. (someone else will have to do this)
  * Server-side code.

There's probably a lot of other things I'm forgetting, anyone is free to commit to this, if you want to make major changes let me know beforehand.

Originally committed to SVN as r3475.
2009-09-03 06:53:55 +00:00
Amar Takhar aef7375ddb * Add a new define WITH_EXCEPTIONS to allow exception handling to be forced on when in debug mode.
* Add --enable-debug-exceptions to set WITH_EXCEPTIONS.
 * Fix precompiled header msg using AC_RESULT. (forgot this in the original patch)

Originally committed to SVN as r3451.
2009-09-02 07:59:17 +00:00
Amar Takhar 2bd48754bd Fix alignment of some --help messages.
Originally committed to SVN as r3371.
2009-08-06 04:39:35 +00:00
Amar Takhar 02581bf1f1 Add a new option --enable-gcc-prec which will enable the use of gcc precompiled headers, this speeds up the build time (including one time builds) by several oders of magnitude. closes #975
Originally committed to SVN as r3369.
2009-08-06 04:35:35 +00:00
Amar Takhar fb3431df66 Commit changes to support importing bitmaps as character strings, this is still broken however the final fix should be quite simple.
Originally committed to SVN as r3270.
2009-07-25 09:35:44 +00:00
Amar Takhar 85330c01ae Remove PERL,Ruby from the scripting engine status at the bottom of configure output.
Originally committed to SVN as r3235.
2009-07-23 22:40:02 +00:00
Amar Takhar 11ad86631a Switch configure.in to use the new wx2.9 m4 macros and change autogen.sh to look for wxwin29.mp4 versus wxwin28.mp4. This forces the requirement of wx2.9 now.
Originally committed to SVN as r3227.
2009-07-23 20:20:03 +00:00
Amar Takhar af5df13f00 Remove Auto4 Ruby from the (unix) build system, updates #665 and #938.
Originally committed to SVN as r3204.
2009-07-23 01:23:35 +00:00
Amar Takhar 3403a5faea Remove Auto4 PERL from the build system, updates #840 and #938.
Originally committed to SVN as r3203.
2009-07-23 01:18:51 +00:00
Amar Takhar dbf0f48713 Nuke auto3 from the Unix/OSX build system.
Originally committed to SVN as r3199.
2009-07-23 00:27:57 +00:00
Amar Takhar 2ef6260938 Move +AM_PROG_CC_C_O after AC_PROG_CC to silence automake 1.10
Originally committed to SVN as r3169.
2009-07-19 18:33:08 +00:00
Amar Takhar fb8196dcf8 Chase r3148 and r3149 and remove the FFMPEG video provider from the unix build system. Updates #921.
Originally committed to SVN as r3150.
2009-07-16 19:16:31 +00:00
Amar Takhar 49a116804d Change version in version.cpp and configure.in to 2.2.0, the string freeze is officially over and all the commits we've been holding back can now go in!
Originally committed to SVN as r3134.
2009-07-14 18:15:11 +00:00
Amar Takhar 5ad6e777d3 Build changes for the new ffms, TheFluff will be comitting the aegisub changes shortly.
Originally committed to SVN as r3117.
2009-07-13 22:30:49 +00:00
Amar Takhar 06259dfb1e Disable Fortran checks, thanks Greg! For whatever reason I only looked at the autoconf source, sigh.
Originally committed to SVN as r3101.
2009-07-11 03:45:03 +00:00
Amar Takhar 1b9f38747b Supplant the portaudio player with the portaudio2 player. This still doesn't handle some of the issues that happen on linux, that will be fixed in a later commit, updates #876.
Originally committed to SVN as r3043.
2009-06-10 04:45:57 +00:00
Amar Takhar 5cff8b2d6a Remove support for old FFMPEG releases, if you require or want this support you are officially on your own, closes #875.
Originally committed to SVN as r3039.
2009-06-10 02:21:20 +00:00
Amar Takhar e2015ca7e9 The finance department (jfs) let me know that we don't depreciate things here, only deprecate.
Originally committed to SVN as r3038.
2009-06-10 02:15:40 +00:00
Amar Takhar 08d507e40c Disable FFMPEG provider, use --with-provider-ffmpeg to enable, closes #874.
Originally committed to SVN as r3036.
2009-06-10 02:09:00 +00:00
Amar Takhar f8219e4863 Set versions for ffmpeg: avcodec 52.27.0, avformat 52.32.0, avutil 50.3.0, postproc 51.2.0 and swscale 0.7.1, all of these are from r18642 in ffmpeg.. updates #831
Originally committed to SVN as r3035.
2009-06-09 20:47:28 +00:00
Amar Takhar 667f950176 * Re-format the arch detection case.
* Fix an annoying buy, I hate the loops configure gets stuck in when you do "$blah" = "$blah" vs test "$blah..

Originally committed to SVN as r2874.
2009-04-29 00:49:38 +00:00
Amar Takhar 5b3a60c506 * Add support in configure.in to detect the arch.
* Add two new targets, osx-tinderbox-(bundle|dmg) to handle tinderbox building.

Originally committed to SVN as r2873.
2009-04-28 23:25:42 +00:00
Amar Takhar 3648f61083 Testing the tinderbox.
Originally committed to SVN as r2863.
2009-04-27 20:58:42 +00:00
Amar Takhar e2d0317df3 Bunk commit to trigger the build cluster.
Originally committed to SVN as r2835.
2009-04-21 18:48:59 +00:00
Amar Takhar dc34db7f62 Early morning code-o, setting AM_CONDITIONAL _after_ the Makefiles are
generated isn't going to work very well.

Originally committed to SVN as r2793.
2009-04-12 10:48:20 +00:00
Amar Takhar 95e9ccaf79 Add support for ALSA_(LD|C)FLAGS.
Originally committed to SVN as r2790.
2009-04-12 10:28:42 +00:00
Amar Takhar d71cbda47b * s/$found_audio/$found_audio_player/ for clarity.
* Add AM_CONDITIONAL for FOUND_AUDIO_PLAYER and FOUND_VIDEO_PROVIDER.

Originally committed to SVN as r2788.
2009-04-12 10:08:28 +00:00
Amar Takhar 579b46f097 Update PortAudio v19 support.
Originally committed to SVN as r2787.
2009-04-12 10:04:10 +00:00
Amar Takhar b89ec65c43 Move the PortAudio v19 check above the v18 check.
Originally committed to SVN as r2786.
2009-04-11 23:40:15 +00:00
Amar Takhar 5f5960ef00 * Fix check for libavutil/pixfmt.h
* Add detection for PortAudio2 (v19)

Originally committed to SVN as r2779.
2009-04-11 18:06:23 +00:00
Amar Takhar 26e427e838 Add a check for libavutil/pixfmt.h as a low-brow check for FFMPEG r18129+, this
needs to be fixed to check exact versions of the library.  For now this should
work.

Originally committed to SVN as r2778.
2009-04-11 08:13:09 +00:00
Amar Takhar d642bb37ab Fix an error message to be clearer.
Originally committed to SVN as r2777.
2009-04-11 07:51:50 +00:00
Amar Takhar a9180cfcf7 Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3.
Originally committed to SVN as r2760.
2009-03-09 05:48:13 +00:00
Amar Takhar 689e353c90 Update the build system for the new repository layout.
Originally committed to SVN as r2757.
2009-03-09 00:58:38 +00:00
Amar Takhar 91d73ec8ea SVN Transition Step 3/7
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
2009-03-08 08:30:39 +00:00