summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add notes about non-free codecs to README.debianKevin Mitchell2014-01-291-0/+9
|
* update debian changelogKevin Mitchell2014-01-291-0/+7
|
* debian package: build-depend and enable libmp3lame and libx264 in ffmpegKevin Mitchell2014-01-292-3/+8
| | | | add note to package description about what this package is and where it came from
* allow user to specify ffmpeg options from either or both theKevin Mitchell2014-01-291-1/+2
| | | | ffmpeg_options file and arguments to the scripts/ffmpeg-config script
* fix parallel building in the debian package: ffmpeg at least was only ↵Kevin Mitchell2014-01-281-9/+22
| | | | building serially before
* Merge remote-tracking branch 'origin/pr/17'wm42014-01-2813-2/+212
|\
| * take fribidi build out of the debian pacakge and replace it with aKevin Mitchell2014-01-283-16/+4
| | | | | | | | dependency on the debian pacakge libfribidi-dev
| * build more features in debian package including custom-built fribidiKevin Mitchell2014-01-285-10/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * build fribidi for the debian package * add dependencies to debian package taking cues from the official debian version enable everything except: + libsdl2 (not available in wheezy or precise) + libmpeg123 (build error on precise due to old version) + caca, radio interface, openal output, portaudio output, rsound/libroar/sndio input/output, sdl1, joystick, videoio.h/libpt * additional ffmpeg features (and dependencies) are still to be handled manually by the builder using the ffmpeg_options file as described in README.rst * adjust debian/changelog so building works on both debian and ubuntu (tested on saucy,precise,wheezy,sid amd64) * tweak debian parts of README.rst
| * Bring back a waf-compatible deiban build systemKevin Mitchell2014-01-272-4/+32
| | | | | | | | | | | | | | | | | | | | For override_dh_auto_install, just tell waf to install the files under debian/mpv. The main problem was that the script names clean,build,install in the root directory collided with makefile targets in debian/rules which lead make to do nothing since they appeared already up-to-date. .PHONY wasn't enough since the targets are implicit via the % operator. I had to explicitly declare the problematic targets AND list them as .PHONY
| * Revert "Remove incomprehensible Debian magic"Kevin Mitchell2014-01-2711-0/+102
| | | | | | | | This reverts commit ba60c400ae5c69bd8b7f6c1368e6e8c6bfb42f24.
* | libass: fix compilation with newer git versionswm42014-01-281-0/+3
|/
* Switch FFmpeg to GitHub mirror, prefer HTTP(S)Martin Herkt2014-01-081-2/+2
| | | | | FFmpeg's own site tends to be overloaded/slow at times, and using HTTP(S) avoids trouble with fascist firewalls.
* Re-enable building fribidi (with -j1)Martin Herkt2014-01-084-1/+7
| | | | This works now that the build scripts are not Makefiles anymore.
* Fix updatingwm42014-01-021-0/+4
| | | | | ./update didn't download new commits/releases, so it was severely broken.
* Implement version sorting using POSIX.1-2008 only.Rudolf Polzer2013-12-301-1/+11
|
* Remove incomprehensible Debian magicwm42013-12-2911-102/+0
| | | | | | | | | | | | | | | I don't know how to fix this. It appears that debian/rules should contain a override_dh_auto_install target, but I have not the slightest clue what it should do or what it did with the old Makefile or how to make it work with waf. Why the heck can't I just list the files that should be installed? Note: this is not a real removal. If someone wants to fix this, a pull request reverting this commit + fixing the waf build would be welcome. For now I'm removing this, because fixing it is probably a huge time sink (just to learn Debian cryptomagic?), and I don't want to confuse users with non-working instructions and packaging files.
* Add ./rebuild command and suggest its use over ./update and ./buildwm42013-12-292-9/+14
|
* clean: remove build_libs at the endwm42013-12-291-1/+1
| | | | Looks better IMO.
* mpv-clean: use distcleanwm42013-12-291-1/+1
|
* README: list of dependencies is not at the end of the file anymorewm42013-12-291-2/+1
|
* README: mention what happened to force-headwm42013-12-291-0/+2
|
* mpv-clean: explicitly remove files produced by old build systemwm42013-12-291-0/+3
| | | | | | | | | | This is a temporary step and currently breaks everything. The next commit will add regular git checkouts to the update script. Conflicts: ffmpeg mpv
* Adding waf support for mpv.Josh Driver2013-12-2919-57/+87
|
* README.rst: add a warning about making local changeswm42013-12-291-0/+12
|
* Remove force-head scriptwm42013-12-292-13/+1
| | | | This is now done by ./update --master
* Modify update script to always do git checkoutswm42013-12-291-23/+37
|
* Detab update scriptwm42013-12-291-41/+41
| | | | Death to tabs.
* Remove git submoduleswm42013-12-295-12/+0
|
* Switch ffmpeg from git to latest stable releasewm42013-12-101-0/+0
|
* Updatewm42013-12-012-0/+0
| | | | | By the way, if anyone wonders by ./force-head doesn't work anymore, use the waf-plus-kill-submodules branch.
* Updatewm42013-11-082-0/+0
|
* debian: increase compat level for debianization to allow for more build optionsblinxwang2013-11-051-1/+1
|
* fix debian packagingblinxwang2013-11-041-6/+5
|
* update --master: use git pull --rebase.Rudolf Polzer2013-11-041-2/+2
|
* update: Add missing 'git pull' command.Rudolf Polzer2013-11-041-0/+1
|
* ./update script: support extra arguments.Rudolf Polzer2013-11-041-3/+63
| | | | | | --submodule: update to the submodule-registered versions. --master: update to the master branch versions. --release: update to the latest released versions.
* Update mpv and ffmpegwm42013-11-032-0/+0
|
* Update ffmpegwm42013-10-291-0/+0
| | | | This is pretty arbitrary, but it was time.
* Add uninstall targetwm42013-10-251-1/+4
| | | | | | Patch by pfor on IRC, but with the uninstall target added to PHONY too. Untested.
* Update mpvwm42013-10-211-0/+0
|
* Update everythingwm42013-10-163-0/+0
| | | | Switch to mpv 0.2.0.
* Update ffmpeg and libasswm42013-10-072-0/+0
| | | | mpv is still at our latest release.
* Updatewm42013-09-202-0/+0
|
* Updatewm42013-09-152-0/+0
|
* Updatewm42013-09-072-0/+0
|
* Updatewm42013-08-292-0/+0
|
* Updatewm42013-08-242-0/+0
|
* Updatewm42013-08-192-0/+0
|
* Updatewm42013-08-122-0/+0
|
* Updatewm42013-08-052-0/+0
|
* Update libasswm42013-07-191-0/+0
| | | | | This fixes the fribidi include path, so installing fribidi into build_libs should just work and make libass pick it up... I think.
* README: fix rst formatting and github displaywm42013-07-181-4/+7
|
* Update mpvwm42013-07-161-0/+0
|
* Disable building fribidi for nowwm42013-07-152-4/+4
| | | | | | | It completely breaks parallel builds. I couldn't find out how to get "make" not to build fribidi with parallel build enabled.
* Updatewm42013-07-152-0/+0
|
* Update mpvwm42013-07-111-0/+0
|
* force-head: add fribidiTuncer Ayaz2013-07-111-3/+4
|
* Slightly better way to allow custom ffmpeg configurationwm42013-07-092-4/+29
| | | | | This read options from a file named ffmpeg_options and passes them to ffmpeg's configure.
* libass-config: override FRIBIDI_CFLAGSTuncer Ayaz2013-07-061-1/+1
| | | | | | | libass/configure sets FRIBIDI_CFLAGS to "-I$(pwd)/build_libs/include/fribidi" instead of "-I$(pwd)/build_libs/include". As a workaround override FRIBIDI_CFLAGS in scripts/libass-config.
* Add support for building fribidi locallyTuncer Ayaz2013-07-065-4/+23
|
* Updatewm42013-07-052-0/+0
|
* Mention how to get mk-build-depswm42013-06-281-1/+5
|
* Updatewm42013-06-283-0/+0
|
* ffmpeg-config: remove needless --enable-nonfree flag; add example flagsRudolf Polzer2013-06-211-1/+6
| | | | | | This removes the needlessly enabled --enable-nonfree flag, and also adds commented out lines to add libx264, libmp3lame and libfdk_aac support to the ffmpeg used for building mpv.
* Updatewm42013-06-153-0/+0
|
* Updatewm42013-06-012-0/+0
|
* debian: update some MPlayer leftoverswm42013-05-232-23/+20
| | | | The mime file is probably incomplete/broken anyway.
* Updatewm42013-05-232-0/+0
|
* Updatewm42013-05-151-0/+0
|
* Updatewm42013-05-142-0/+0
|
* Updatewm42013-05-122-0/+0
| | | | | In case someone reads this: this comes with lots of changes concerning multi-channel audio handling. Bugs are possible.
* Updatewm42013-05-102-0/+0
|
* Update mpvwm42013-04-301-0/+0
|
* Updatewm42013-04-272-0/+0
|
* Update ffmpegwm42013-04-131-0/+0
|
* Add force-head script, which throws away everything and uses masterwm42013-04-132-0/+26
| | | | | The script is intentionally not marked +x. The hasbang is just for making clear that it's a shell script.
* Update mpv and libasswm42013-04-132-0/+0
|
* Update mpvwm42013-04-081-0/+0
|
* Update mpvwm42013-04-021-0/+0
|
* Updatewm42013-04-023-0/+0
|
* Enable libavresample by defaultwm42013-04-011-1/+1
|
* Add git submodule sync to updatewm42013-04-011-0/+1
| | | | | To make existing repos actually change the URL. No idea why this is needed.
* Switch libass repo to google'swm42013-04-011-1/+2
| | | | Both are official, but repo.or.cz likes crapping out.
* Updatewm42013-03-223-0/+0
| | | | Back to ffmpeg git master.
* Update mpvwm42013-03-132-1/+1
| | | | | Also add --disable-doc to the ffmpeg options. They're useless and make the local installation slightly slower.
* Some more improvements to README.rst and debian/controlwm42013-03-113-11/+31
|
* Oops.wm42013-03-101-1/+2
|
* Minor improvements to README.rst and debian/controlwm42013-03-102-2/+23
|
* Updatewm42013-03-092-0/+0
| | | | ffmpeg is not quite git HEAD - it's the last version before The Big Mess.
* Update mpvwm42013-03-021-0/+0
|
* Updatewm42013-02-212-0/+0
|
* Update mpvwm42013-02-072-1/+1
|
* Change README to .rstwm42013-02-011-3/+29
|
* Update mpvwm42013-02-011-0/+0
|
* Update mpv (libcdio compatibility)wm42013-01-241-0/+0
| | | | Fixes compilation failure with newer libcdio versions.
* Add a basic dh-based debian directorywm42013-01-2311-1/+72
| | | | Merges pull request #1.
* Updatewm42013-01-233-0/+0
|
* Updatewm42013-01-062-0/+0
| | | | | | Note: --osd-font-size (and similar options) don't affect unstyled subtitles anymore. Now you have to use --sub-text-font-size etc. to change the appearance of unstyled subtitles.
* Updatewm42012-12-292-0/+0
|
* Update mpvwm42012-12-051-0/+0
| | | | Fixes crash when switching to vobsubs.
* Update mpv and ffmpegwm42012-12-055-10/+26
| | | | | | | | | | | | | | | | | | | | | | | Major user-visible changes: - OSD overhaul: remove some of the old OSD/sub options, which did not or barely worked, and add new options that work properly. The OSD font is now slightly more configureable as well. Look for options starting with --osd-... on the manpage. - Image subtitles (like DVD/vobsubs) are rendered in color (disable with --sub-gray), and image subtitle placement is a bit more correct. - The 's' key now takes screenshots with subtitles by default, and 'shift+s' takes screenshots without subtitles. (Assumes you don't have a custom input.conf, or that your input