diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2013-07-06 16:38:03 +0200 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2013-07-06 21:23:36 +0200 |
| commit | 4d6f1256116aa785992e2ed1df78c1d9932ceb3b (patch) | |
| tree | abea5d2cc1248a0276728e9fbb0713ac07e313e7 | |
| parent | 59953352d7ca4fc27266e489a799dd1030a8ae6f (diff) | |
| download | mpv-build-4d6f1256116aa785992e2ed1df78c1d9932ceb3b.tar.bz2 mpv-build-4d6f1256116aa785992e2ed1df78c1d9932ceb3b.tar.xz | |
Add support for building fribidi locally
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| m--------- | fribidi | 0 | ||||
| -rwxr-xr-x | scripts/fribidi-config | 9 | ||||
| -rwxr-xr-x | scripts/libass-config | 2 |
5 files changed, 23 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 83b13ca..8f14252 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,6 @@ [submodule "libass"] path = libass url = https://code.google.com/p/libass/ - +[submodule "fribidi"] + path = fribidi + url = git://anongit.freedesktop.org/fribidi/fribidi.git @@ -11,7 +11,13 @@ ffmpeg-config: ffmpeg: ffmpeg-config $(MAKE) -C ffmpeg_build install -libass-config: +fribidi-config: + scripts/fribidi-config + +fribidi: fribidi-config + $(MAKE) -C fribidi install + +libass-config: fribidi scripts/libass-config libass: libass-config @@ -19,6 +25,7 @@ libass: libass-config noconfig: $(MAKE) -C ffmpeg_build install + $(MAKE) -C fribidi install $(MAKE) -C libass install $(MAKE) -C mpv @@ -27,7 +34,8 @@ install: clean: -rm -rf ffmpeg_build build_libs + -$(MAKE) -C fribidi distclean -$(MAKE) -C libass distclean -$(MAKE) -C mpv distclean -.PHONY: mpv-config mpv ffmpeg-config ffmpeg libass-config libass noconfig install clean +.PHONY: mpv-config mpv ffmpeg-config ffmpeg fribidi-config fribidi libass-config libass noconfig install clean diff --git a/fribidi b/fribidi new file mode 160000 +Subproject fecb73185c223cf1db5533ed6cb55b035563c1e diff --git a/scripts/fribidi-config b/scripts/fribidi-config new file mode 100755 index 0000000..b6c762e --- /dev/null +++ b/scripts/fribidi-config @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +OPTIONS="" + +BUILD="$(pwd)" +cd "$BUILD"/fribidi +./bootstrap +./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS diff --git a/scripts/libass-config b/scripts/libass-config index d27d769..65ab5f1 100755 --- a/scripts/libass-config +++ b/scripts/libass-config @@ -5,4 +5,4 @@ OPTIONS="" BUILD="$(pwd)" cd "$BUILD"/libass -./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS +PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS |