summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Do not clear existing PKG_CONFIG_PATH settings.Rudolf Polzer2015-09-083-4/+31
| | | | | | | | | In my setup, I use PKG_CONFIG_PATH to point to libfdk-aac; the previous version of these files overrode this, making ffmpeg fail to configure for not finding libfdk-aac. Now, the PKG_CONFIG_PATH variable is always honored, with our own build directory put in front of existing settings.
* quiet grep for ffmpeg ssl librariesKevin Mitchell2015-04-031-2/+2
|
* ffmpeg-config: prefer gnutls and redistributionwd02015-03-291-5/+5
| | | | | Avoid unnecessarily adding --enable-nonfree and prefer gnutls over openssl in configuring ffmpeg.
* Autodetect OpenSSL or GnuTLSwm42015-02-121-1/+14
| | | | | | | | | I'll probably regret it. There's also a very small chance that the pkg-config things I'm checking are debian-specific. Fixes #54.
* Don't build libavresamplewm42015-02-121-1/+1
| | | | | | | The mpv configure script actually doesn't pick up libavresample anymore if it finds libswscale. Closes #55.
* Mention ./update when switching brancheswm42014-12-291-0/+1
| | | | ./rebuild calls ./update, but ./update alone also works.
* mpv-clean: exit early if the git archive doesn't exist yetKevin Mitchell2014-11-271-0/+1
| | | | closes #49
* move ffmpeg build after libassKevin Mitchell2014-11-031-1/+1
| | | | in case someone wants to add --enable-libass to ffmpeg_options
* debian: make debian-update-versions work with use-[ffmpeg|mpv]-[release|master]Kevin Mitchell2014-10-271-33/+8
|
* Clean on manual branch-switchingwm42014-10-271-0/+7
| | | | | | Especially with FFmpeg, users get into trouble with FFmpeg's broken build system, which might error on incremental builds for no good reason.
* Add a simpler way to switch between release and master versionswm42014-10-271-0/+10
| | | | | | | | | | | This remembers the selection, and users are not tricked into accidentally switching back to the release all the time. Don't do this for libass, we always use master. (No reason to use a usually buggy and outdated release.) We don't do it for fribidi either, because fribidi is just in a permanent state of bitrotting and brokenness.
* redirect cd stdout to null in debian-update-versionsKevin Mitchell2014-09-251-2/+2
|
* replace tabs with spaces in debian-update-versionsKevin Mitchell2014-09-251-10/+9
|
* Allow building libmpvwm42014-06-264-3/+32
| | | | | | | The tricky part is enabling PIC for all libraries if required. We don't always enable PIC, because I'm unsure about its performance or binary size impact. So play it safe.
* increment the debian epoch (the number before : in the version) for git ↵Kevin Mitchell2014-04-191-3/+4
| | | | | | | | | | | | master so that 1:0.3.8 and with --master 2:2014.04.19.0879db9 This ensures that --master is considered "newer"
* scripts/mpv-config: don't add extra options twicewm42014-04-191-1/+3
| | | | Also, print the configure args, like ffmpeg-config does.
* Fix previous commitwm42014-04-181-1/+2
| | | | Was untested, is still untested.
* Remove customization note in ffmpeg-configwm42014-04-182-6/+5
| | | | | | | | People edit this -> ./update stops working, unless the changes are committed, which is not very obvious. They should edit ffmpeg_options instead. There's a big section in the README about this. Also, make mpv-config read mpv_config.
* enable harfbuzz support for libassKevin Mitchell2014-02-221-1/+1
|
* minor whitespace tweakKevin Mitchell2014-02-081-1/+1
|
* move debian/changelog to debian/changelog.TEMPLATEKevin Mitchell2014-02-081-3/+3
| | | | | and drop version control on debian/changelog, which gets modified by scripts/debian-update-version
* fridibi: disable glibwm42014-02-071-1/+1
| | | | | | | | Fribidi uses glib incorrectly, and apparently raises a compilation error with newer glib versions. Since glib is not really needed, just disable it. Untested, but a user reported adding --without-glib works fine.
* Better changelog hack in separate script called from ./update.Kevin Mitchell2014-02-061-0/+48
| | | | | | | dpkg-buildpackage reads the changelog before ever calling debian/rules, so its not a good idea to change it from there. Move this to a separate script called from ./update which does not depend on any debian-specific commands.
* 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
* Merge remote-tracking branch 'origin/pr/17'wm42014-01-282-2/+6
|\
| * build more features in debian package including custom-built fribidiKevin Mitchell2014-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-271-1/+3
| | | | | | | | | | | | | | | | | | | | 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
* | libass: fix compilation with newer git versionswm42014-01-281-0/+3
|/
* Re-enable building fribidi (with -j1)Martin Herkt2014-01-082-1/+4
| | | | This works now that the build scripts are not Makefiles anymore.
* mpv-clean: use distcleanwm42013-12-291-1/+1
|
* 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-2911-1/+47
|
* Disable building fribidi for nowwm42013-07-151-1/+1
| | | | | | | It completely breaks parallel builds. I couldn't find out how to get "make" not to build fribidi with parallel build enabled.
* Slightly better way to allow custom ffmpeg configurationwm42013-07-091-2/+8
| | | | | 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-062-1/+10
|
* 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.
* Enable libavresample by defaultwm42013-04-011-1/+1
|
* Update mpvwm42013-03-131-1/+1
| | | | | Also add --disable-doc to the ffmpeg options. They're useless and make the local installation slightly slower.
* Add a basic dh-based debian directorywm42013-01-231-1/+1
| | | | Merges pull request #1.
* Update mpv and ffmpegwm42012-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 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.conf doesn't overrides these keys.) - vo_xv can now take screenshots without OSD or subtitles natively. It doesn't framestep anymore in certain situations (e.g. playing with OSD on screen -> pausing -> toggling fullscreen -> vo_xv used to play one video frame and some audio to redraw the OSD). (Subtitle colors should be more correct as well and behave the same as with vo_opengl and vo_vdpau.) - Show video title in window title instead on the console when streaming with libquvi. - Encoding audio breakage with newer ffmpeg versions has been fixed.
* Fix compilation on systems where autoconf will use lib64 instead of libwm42012-10-231-1/+1
| | | | | | | | | | | At least on openSUSE 12.2 x86_64, autoconf will install libass' library files into build_libs/lib64. Since we set PKG_CONFIG_PATH to build_libs/lib/pkgconfig, mpv compilation won't find the libass.pc file. Even worse, if libass is globally installed too, mpv will still use the local libass headers in build_libs/include, while linking with the globally installed libass. Fix by forcing autoconf always to use build_libs/lib.
* Initial commitwm42012-10-133-0/+25
This is based on mplayer-git [1], except that it doesn't need Python. Some features, such as specifying custom options, are not available, but these should be considered out of the scope of the basic build wrapper. [1] http://repo.or.cz/w/mplayer-build.git
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 03:06:46 +0000