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

153 commits

Author SHA1 Message Date
Amar Takhar
0d12775f4b osx-bundle target fixes. 
Originally committed to SVN as r4742.
 2010-08-14 17:38:37 +00:00
Amar Takhar
cbdb906da0 Build universalchardet before libaegisub. 
Originally committed to SVN as r4485.
 2010-06-12 07:04:12 +00:00
Amar Takhar
c95eb3fcce universalchardet is no longer optional. 
Originally committed to SVN as r4481.
 2010-06-12 05:29:01 +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
81282bf06e Add LICENCE to EXTRA_DIST. 
Originally committed to SVN as r4261.
 2010-05-06 16:07:00 +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
88d6c783b1 Remove boost.m4 from EXTRA_DIST it was nuked a long time ago. 
Originally committed to SVN as r3756.
 2009-11-02 21:44:08 +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
ecc15a9935 Add the reporter subdir to Makefile.am so it gets built. 
Originally committed to SVN as r3565.
 2009-09-26 20:00:34 +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
a0099e7f74 s/scripts/tools/ after the rename 
Originally committed to SVN as r3267.
 2009-07-25 05:23:04 +00:00
Amar Takhar
75a5c70297 Remove some old scripts from Makefile.am that were used for the bmp->xpm conversion. 
Originally committed to SVN as r3259.
 2009-07-25 02:11:27 +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
d603ceeda9 Fix osx-bundle and osx-dmg breakage after adding buildbot support, both scripts now accept spaces in the directory names. 
Originally committed to SVN as r3001.
 2009-06-02 00:16:45 +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
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
Amar Takhar
bf730cf96e * Rework the debugging flags to set the variables conditionally on either being 
enabled.
* Fix some cut-and-paste-o's (dunno how I managed these)
* Move AC_SUBST* outside of the conditionally enabled blocks
* Fix typo.

Originally committed to SVN as r2746.
 2009-02-22 22:01:14 +00:00
Amar Takhar
4960863be2 Add --enable-gcov, --enable-efence and --enable-ccmalloc for gcov, Electric 
Fence and ccmalloc support.  gcov support won't work without manual
intervention (for now) but some hooks will be added later to automate it.

Originally committed to SVN as r2745.
 2009-02-22 05:38:46 +00:00
Amar Takhar
0eaa08c405 Add audio_provider_dummy.cpp to the build which is required when _DEBUG is used. 
Originally committed to SVN as r2739.
 2009-02-17 08:12:19 +00:00
Amar Takhar
9c6780a33e * Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking. 
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
  otherwise.

Originally committed to SVN as r2718.
 2009-01-29 21:32:39 +00:00
Amar Takhar
594d44f594 avutil is required on unix/dawrin, not just darwin. 
Originally committed to SVN as r2710.
 2009-01-28 23:34:17 +00:00
Amar Takhar
9a6265afb6 * Switch FFMPEG detection to use pkg-config. 
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.

Originally committed to SVN as r2705.
 2009-01-28 03:19:53 +00:00
Amar Takhar
c476b7b883 Add PORTAUDIO_CFLAGS to portaudio static library compile. 
Originally committed to SVN as r2684.
 2009-01-12 00:21:17 +00:00
Amar Takhar
852ceef55d On OS X shared librarys end with .dylib not .so, this fixes the (lame) workaround 
for auto3 linking.

Originally committed to SVN as r2676.
 2009-01-08 08:46:10 +00:00
Amar Takhar
81a168d625 Add a workaround for dependency_libs in auto3/, libtool brings in libraries 
automatically which causes link errors due to auto4 (lua 5.1).

Originally committed to SVN as r2675.
 2009-01-08 08:22:53 +00:00
Amar Takhar
d5f5e66e33 * Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG 
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
  detection.

Originally committed to SVN as r2664.
 2009-01-06 13:59:15 +00:00
Amar Takhar
90062363f3 Really do the aegisub->aegisub-2.1 binary rename. 
Originally committed to SVN as r2663.
 2009-01-06 13:58:21 +00:00
Amar Takhar
bbe33f2b91 Set bin_PROGRAMS to aegisub-2.1 
Originally committed to SVN as r2661.
 2009-01-06 12:35:57 +00:00
Amar Takhar
675c4caa09 Add multiple version support, everything is now suffixed with MAJOR.MINOR, this 
will allow users on unix to install and operate different versions of aegisub a$
the same time.  Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.

Originally committed to SVN as r2659.
 2009-01-06 10:44:49 +00:00
Amar Takhar
2ded1e69db Remove unused files, add config/*.h 
Originally committed to SVN as r2651.
 2009-01-05 11:51:34 +00:00
Amar Takhar
bf09c76081 Remove posix dir and 'libposix' and create 'libresrc' which includes 
resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
 2009-01-04 09:01:49 +00:00
Amar Takhar
e66eed8126 Remove -include posix/defines.h 
Originally committed to SVN as r2625.
 2009-01-04 07:02:28 +00:00
Amar Takhar
610a6c11cf Sigh, s/Framwork/Framework/ 
Originally committed to SVN as r2587.
 2008-12-31 09:25:11 +00:00
Amar Takhar
1fd3ffc313 Add 'libosxutil' which gives us functions to locate paths within bundles, for 
now this is used by libass to load fontconfig's fonts.conf.

Originally committed to SVN as r2585.
 2008-12-31 09:20:50 +00:00
Amar Takhar
c30992fbbc Rename macosx/bevelButton* to ./osx_bevelButton*, the macosx/ dir is going away. 
Originally committed to SVN as r2543.
 2008-12-29 02:57:41 +00:00
Niels Martin Hansen
a6c169a4b2 Complete rewrite of the DirectSound audio player, this time doing threading and synchronisation better, and following the COM apartment model strictly too. It replaces the old player by default, but the old is still available in the runtime configuration. 
Originally committed to SVN as r2495.
 2008-11-27 18:35:26 +00:00
Amar Takhar
2b13dfbb43 Add support for FFmpegSource2, it's enabled by default if libpostproc is there. 
Originally committed to SVN as r2425.
 2008-10-28 02:18:14 +00:00
Karl Blomster
a2c5b5778c eol-style native on new files, also add said new files to Makefile.am 
Originally committed to SVN as r2388.
 2008-09-24 11:27:42 +00:00
Karl Blomster
df3512e8eb add video_provider_ffmpegsource.cpp to Makefile.am 
Originally committed to SVN as r2321.
 2008-09-05 19:07:31 +00:00
Rodrigo Braz Monteiro
2d7b2527a7 OMFG AMZ IS ALIVE! Partial TranStation export support (SMPTE drop-frames seem to be broken, and line merging isn't working) 
Originally committed to SVN as r2266.
 2008-07-18 01:36:20 +00:00
Karl Blomster
e8dffb60ec add audio_provider_downmix.cpp to Makefile.am 
Originally committed to SVN as r2259.
 2008-07-15 22:49:02 +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
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
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