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

137 commits

Author SHA1 Message Date
Amar Takhar
908e9381e8 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
d7e023e57f 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
a067bd560d 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
10a531b684 * 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
eac9424b2a 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
ae6541cde4 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
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
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
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
Amar Takhar
e4d77f6474 Completely remove support for an external libass: 
* The internal libass will always be newer than external packages.
  * aegisub requires fontconfig _and_ iconv support, some systems have
    either/or but rarely both.
  * There's zero benifit to supporting an external version.

In the future I might add some flags to allow it, if there is a compelling
reason to.

Originally committed to SVN as r2125.
 2008-03-23 22:56:21 +00:00
Amar Takhar
ca920eea36 Remove comments about adding revision / build credit support. 
Originally committed to SVN as r2102.
 2008-03-22 08:24:52 +00:00
Amar Takhar
5da0b16f48 Move WITH_INTERNAL_LIBASS beove WITH_LIBASS for clarity. 
Originally committed to SVN as r2101.
 2008-03-22 08:24:21 +00:00
Amar Takhar
65e92e8e3c * Sort program sources in alphabetical order. 
* Put program headers under aegisub_SOURCES and external headers under
  noinst_HEADERS.

Originally committed to SVN as r2099.
 2008-03-22 08:20:28 +00:00
Amar Takhar
04e9ff224f Add support for an 'internal' libass, with this we can chase changes to the 
libass in MPlayer which is more up-to-date than the external library that's
available.

Originally committed to SVN as r2096.
 2008-03-21 21:01:03 +00:00
Amar Takhar
21b3db9b2a Enable OpenMP globally, at amz's suggestion. (if this breaks things, it's his 
fault.)

Originally committed to SVN as r2088.
 2008-03-21 02:59:57 +00:00
Amar Takhar
90e9e6fef1 Re-enable univerchardet (for now), also make it use STL rather than stdio (which 
isn't complete)

Originally committed to SVN as r2085.
 2008-03-20 22:24:28 +00:00
Amar Takhar
1f23637cd2 Fix auto4/auto3 (lua51/lua50) support, this removes the --with-* flags in favor 
of LUA_(C|LD)FLAGS and LUA50_(C|LD)FLAGS, also add the LUA LDFLAGS to LIBS like
perl in order to have it bring in the symbols properly, this is a temp measure
until we have modules.

Originally committed to SVN as r2082.
 2008-03-20 21:24:01 +00:00
Amar Takhar
722c1c6dc8 Mutter more library ordering, DynaLoader.a has to be after libauto4_perl.a so 
I've used LIBS= for now (not sure if this is right but we'll see)

Originally committed to SVN as r2018.
 2008-03-11 06:31:06 +00:00
Amar Takhar
c3008be27f Aparrantly the CFLAGS to plugin_manager.cpp were never needed in the first 
place, it was the result of a missed change for perl automation.

Originally committed to SVN as r2016.
 2008-03-11 06:19:20 +00:00
Amar Takhar
cdf86550f2 Sigh, GNU LD can be really annoying at times, most linkers will only pull a 
symbol in from a static library if that symbol is used. (how it should work)
However! if you place the library that *uses* those symbols *after* the
libraries that have them, then the gnu ld will skip past those symbols, they
will never get included and you'll get a linking error.. There are two fixes,
tell LD to scan all libraries twice (non-portable?) or just put the libraries in
an order that LD can deal with.  (annoying!)

Originally committed to SVN as r2014.
 2008-03-11 06:07:08 +00:00
Amar Takhar
311b78afec Put plugin_manager.cpp into it's own library, since it needs to be sent all 
CFLAGS for any enabled automation. (this is temp until we have actual working
plugins)

Originally committed to SVN as r2013.
 2008-03-11 05:45:45 +00:00
Niels Martin Hansen
bb31ddb1da Re-introduce the wxBevelButton control of old and use it for Commit button in subs edit area on wxMac builds. 
Originally committed to SVN as r2006.
 2008-03-09 23:40:45 +00:00