a0322120e0
Remove @BOOST_CPPFLAGS@ as the boost detection is now disabled.
...
Originally committed to SVN as r3665.
2009-10-09 16:11:18 +00:00
0227c77de4
Remove boost check, the macro I'm using has serious bugs that only shows up on some systems.
...
Originally committed to SVN as r3659.
2009-10-09 15:21:59 +00:00
a67728516e
Merge r3654, Closes #998 .
...
Originally committed to SVN as r3655.
2009-10-09 14:44:25 +00:00
f4269dee62
Merge r3644 into milestone:2.1.8 for jfs, closes #1019 .
...
Originally committed to SVN as r3645.
2009-10-08 20:25:41 +00:00
555117ec75
Merge r3639 (boost check) from trunk.
...
Originally committed to SVN as r3640.
2009-10-07 03:31:58 +00:00
d15d6d6af9
Merge ass_parse.* and ass_render.h from r3446.
...
Originally committed to SVN as r3602.
2009-09-28 14:27:04 +00:00
ac0a42a77b
Merge r3545 into 2.1.8.
...
Originally committed to SVN as r3546.
2009-09-21 01:58:49 +00:00
d1b97af4aa
Merge r3408 into 2.1.8.
...
Originally committed to SVN as r3544.
2009-09-21 01:16:03 +00:00
2fa986cd01
merge r3542 (vfr export fix) into the 2.1.8 branch
...
Originally committed to SVN as r3543.
2009-09-20 20:52:00 +00:00
7784a2610c
Merge libass updates into 2.1.8: r3176, r3446, r3448.
...
Originally committed to SVN as r3491.
2009-09-05 22:30:15 +00:00
78259cfa39
Merge r3445 (German translation fixes) into 2.1.8.
...
Originally committed to SVN as r3447.
2009-09-02 02:33:42 +00:00
fc29062da1
Update ffms to r140.
...
Originally committed to SVN as r3367.
2009-08-05 23:05:22 +00:00
d615fcb3ad
Merge r3361.
...
Originally committed to SVN as r3362.
2009-08-05 04:04:30 +00:00
424f84c3aa
Merge 3355 into 2.1.8.
...
Originally committed to SVN as r3356.
2009-08-03 21:38:00 +00:00
216bf20670
Merge r3302 into 2.1.8 so dummy video works again there too.
...
Originally committed to SVN as r3303.
2009-07-28 00:57:54 +00:00
437c315536
Merged r3299 (Korean translation) into the 2.1.8 branch. This should be safe because nobody has gotten around to updating aegisub.pot for trunk yet.
...
Originally committed to SVN as r3300.
2009-07-27 23:40:10 +00:00
1f81078d75
Merge r3294 (ffms2 using utf8 cache filenames) into the 2.1.8 branch. Updates #955 .
...
Originally committed to SVN as r3298.
2009-07-27 21:49:53 +00:00
04ce442f8c
Bump kara-templater version for 2.1.8 branch.
...
Originally committed to SVN as r3279.
2009-07-25 18:22:54 +00:00
4630c0cd75
Merge r3277 into 2.1.8 branch. Updates #950 .
...
Originally committed to SVN as r3278.
2009-07-25 18:18:20 +00:00
0bb38c472b
Merge r3211 (and add the same one-line mod to the dshow provider that doesn't exist in trunk anymore) into the 2.1.8 branch.
...
Originally committed to SVN as r3213.
2009-07-23 05:01:36 +00:00
264043e1a7
Merge trunk r3192 into 2.1.8. It builds so it must be good. Updates #929 .
...
Originally committed to SVN as r3193.
2009-07-22 22:36:07 +00:00
08e93a8d7f
Merge r3152-r3153 (FFMS2 video provider YV12 fix) into the 2.1.8 branch.
...
Originally committed to SVN as r3173.
2009-07-19 18:41:03 +00:00
a5aaea0a06
Merge r3147 (caching video provider colorspace fix) into the 2.1.8 branch.
...
Originally committed to SVN as r3172.
2009-07-19 18:38:48 +00:00
a0ade19643
Merge revisions r3160-r3163 (styles manager bug fixes) into the 2.1.8 branch.
...
Originally committed to SVN as r3171.
2009-07-19 18:36:43 +00:00
65e84aeaca
Merge r3165Merge r3165 (german translation update) into the 2.1.8 branch.
...
Originally committed to SVN as r3170.
2009-07-19 18:33:55 +00:00
9234b52784
Merge r3140
...
Originally committed to SVN as r3142.
2009-07-14 23:53:40 +00:00
e7ad9b85c2
Change version from 2.1.7 -> 2.1.8 for both windows and unix.
...
Originally committed to SVN as r3136.
2009-07-14 20:57:41 +00:00
8a664e3220
Branch r3131 (milestone:2.1.7) as milestone:2.1.8, trunk will become milestone:2.2.0 any changes to the 2.1.7 tree should go here not trunk.
...
Originally committed to SVN as r3133.
2009-07-14 18:10:02 +00:00
26d3877bcf
More cleanup of local config:
...
* Remove option from Options dialogue, it's an install-time thing really
* Don't try to do file associations at startup if we're portable
* General clean up of config handling code; properly make ?user point to ?data and then everything magically follows, makes a lot of handling cleaner
Originally committed to SVN as r3131.
2009-07-14 04:51:35 +00:00
81515f024f
Properly fix "local config" option, previously it only made config.dat local and kept everything else in %APPDATA% still. Now fixed, along with a load of other problematic uses of relative paths. Still a lot more to go.
...
This also makes a bit of sense of the default options for various paths that previously were implicitly relative to ?user or ?data but never explicitly specified in options.
Originally committed to SVN as r3130.
2009-07-14 03:02:17 +00:00
26d07c7aea
Remove the dangerous CopyFile function that on Unix attempted to create hard links of files instead of copying them. Replace it with wxCopyFile instead. Patch by jfs. Fixes #912 .
...
Originally committed to SVN as r3129.
2009-07-14 02:20:40 +00:00
ccd001fbbd
Apply patch to fix #910 .
...
Originally committed to SVN as r3128.
2009-07-14 02:00:56 +00:00
28bf657fda
More minor fixes to Windows installer... we're installing VSFilter 2.39e from guliverkli2 and not one from MPC-HC, and list a couple more files for the pre-install cleanup jobs.
...
Originally committed to SVN as r3127.
2009-07-14 00:15:42 +00:00
712fd197c3
Add src/core/*.h not core/*.h to SOURCES for distfiles.
...
Originally committed to SVN as r3126.
2009-07-13 23:26:03 +00:00
27bb28190b
Even more changes to Windows installer:
...
* Include ffms2.pdb
* Have some files/actions depend on multiple components
Originally committed to SVN as r3125.
2009-07-13 23:09:30 +00:00
eaf507ca97
Fix include path for MSVC project to point to the new location of ffms2 sources.
...
Originally committed to SVN as r3124.
2009-07-13 22:43:46 +00:00
d298d21e5d
Update libass to 94d4104 from http://greg.geekmind.org/viewgit/ .
...
Originally committed to SVN as r3123.
2009-07-13 22:43:25 +00:00
32c6f54be7
Actually fix libosxutil includes, as many times as I'd like to belive using 'diff' to transfer from a working copy to a non-working copy is the safest I always endup convincing myself that it's impossible to screw-up a _two_ line patch.
...
Originally committed to SVN as r3121.
2009-07-13 22:38:43 +00:00
0e22e6dfd9
Remove a deprecated compiler flag causing warnings during universalcharset build on Windows.
...
Originally committed to SVN as r3120.
2009-07-13 22:37:19 +00:00
9bfdc30102
I can't belive these snuck in, I specifically ensured they wern't there but obviously I didn't do nearly a good enough job!
...
Originally committed to SVN as r3119.
2009-07-13 22:35:26 +00:00
cc4fd946d8
Wrap libosxutils headers with "extern C"
...
Originally committed to SVN as r3118.
2009-07-13 22:32:11 +00:00
c0c9d99700
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
83960dcce3
Update the FFMS2 audio and video providers to use the new API features.
...
Originally committed to SVN as r3116.
2009-07-13 22:30:48 +00:00
ccf07d8a8a
Update to the latest ffms (r116) from http://code.google.com/p/ffmpegsource/ .
...
Originally committed to SVN as r3115.
2009-07-13 22:27:40 +00:00
7455f77ad3
Rename FFmpegsource2/ to libffms/ before the update to r115 from the ffms repo. This doens't make any build changes so things will be broken in this commit.
...
Originally committed to SVN as r3114.
2009-07-13 22:19:44 +00:00
7bf71d3ee3
More little changes to Windows installer:
...
* Don't include dictionaries and thesaurii if they don't exist on the machine building the installer
* Sprinkle some more 'solidbreak' flags around, hoping to make compact/custom installations spend less time decompressing huge files that won't be installed
Originally committed to SVN as r3113.
2009-07-13 21:48:53 +00:00
d8161a9071
Add Russian dictionary and thesaurus files to Windows installer.
...
Originally committed to SVN as r3112.
2009-07-13 21:38:58 +00:00
a78bbf6323
Some changes to file ordering, and cosmetic changes, in Windows installer script.
...
Originally committed to SVN as r3111.
2009-07-13 21:26:28 +00:00
d02b75b199
Preparing for 2.1.7 release, new URLs for latest.txt.
...
Originally committed to SVN as r3110.
2009-07-13 18:31:43 +00:00
3dc40e5c34
Missed two renamings in the last commit.
...
Originally committed to SVN as r3109.
2009-07-13 02:48:07 +00:00
Amar Takhar