From 66b0bc39f2bedac32cb76ea5de07d431f5fae21d Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 25 Jul 2009 18:40:51 +0300 Subject: [PATCH] Initial commit --- .gitignore | 5 +++++ .gitmodules | 9 +++++++++ Makefile | 28 ++++++++++++++++++++++++++++ clean | 4 ++++ ffmpeg | 1 + libass | 1 + mplayer | 1 + script/ffmpeg-config | 8 ++++++++ script/foreach_submodule | 4 ++++ script/libass-config | 5 +++++ script/mplayer-config | 13 +++++++++++++ update | 4 ++++ 12 files changed, 83 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 Makefile create mode 100755 clean create mode 160000 ffmpeg create mode 160000 libass create mode 160000 mplayer create mode 100755 script/ffmpeg-config create mode 100755 script/foreach_submodule create mode 100755 script/libass-config create mode 100755 script/mplayer-config create mode 100755 update diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f6807b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/build_libs +/common_options +/ffmpeg_options +/mplayer_options +/ffmpeg_build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..24de2e7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "ffmpeg"] + path = ffmpeg + url = git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git +[submodule "mplayer"] + path = mplayer + url = git://repo.or.cz/mplayer.git +[submodule "libass"] + path = libass + url = git://greg.geekmind.org/libass.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..965c22e --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ +mplayer: ffmpeg libass + script/mplayer-config + $(MAKE) -C mplayer + +mplayer-config: + script/mplayer-config + +ffmpeg-config: + script/ffmpeg-config + +ffmpeg: ffmpeg-config + $(MAKE) -C ffmpeg_build install + +libass-config: + script/libass-config + +libass: libass-config + $(MAKE) -C libass install + +noconfig: + $(MAKE) -C ffmpeg_build install + $(MAKE) -C libass install + $(MAKE) -C mplayer + +install: + $(MAKE) -C mplayer install + +.PHONY: mplayer-config mplayer ffmpeg-config ffmpeg libass-config libass noconfig install diff --git a/clean b/clean new file mode 100755 index 0000000..d3b0230 --- /dev/null +++ b/clean @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +rm -rf build_libs ffmpeg_build +MPBUILD_COMMAND='git clean -x -d -f' "`pwd`"/script/foreach_submodule nottop diff --git a/ffmpeg b/ffmpeg new file mode 160000 index 0000000..62f972f --- /dev/null +++ b/ffmpeg @@ -0,0 +1 @@ +Subproject commit 62f972f7ed406ecd8c004dddbce55f23bcdbf083 diff --git a/libass b/libass new file mode 160000 index 0000000..f21c5b6 --- /dev/null +++ b/libass @@ -0,0 +1 @@ +Subproject commit f21c5b6b2788d1ba2073cb4066eedee0de1b249e diff --git a/mplayer b/mplayer new file mode 160000 index 0000000..152e480 --- /dev/null +++ b/mplayer @@ -0,0 +1 @@ +Subproject commit 152e480397c160eae0a29257eb9c343f35bfdb33 diff --git a/script/ffmpeg-config b/script/ffmpeg-config new file mode 100755 index 0000000..256c6b2 --- /dev/null +++ b/script/ffmpeg-config @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +mkdir -p ffmpeg_build +mydir="$(pwd)" +if test ! -e ffmpeg_options ; then touch ffmpeg_options ; fi +if test ! -e common_options ; then touch common_options ; fi +cd "$mydir"/ffmpeg_build +"$mydir"/ffmpeg/configure --prefix="$mydir"/build_libs --enable-gpl --cpu=native --disable-debug --enable-pthreads --disable-shared --enable-static --enable-postproc --disable-devices --disable-protocols --disable-ffmpeg --disable-ffplay --disable-ffserver `cat ../common_options` `cat ../ffmpeg_options` diff --git a/script/foreach_submodule b/script/foreach_submodule new file mode 100755 index 0000000..00315a3 --- /dev/null +++ b/script/foreach_submodule @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +test -z $1 && $MPBUILD_COMMAND +git submodule foreach "$0" diff --git a/script/libass-config b/script/libass-config new file mode 100755 index 0000000..404714d --- /dev/null +++ b/script/libass-config @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +mydir="$(pwd)" +cd "$mydir"/libass +./autogen.sh --prefix="$mydir/build_libs" --enable-static --disable-shared diff --git a/script/mplayer-config b/script/mplayer-config new file mode 100755 index 0000000..8d2b8c0 --- /dev/null +++ b/script/mplayer-config @@ -0,0 +1,13 @@ +#!/bin/sh +set -e +mydir="$(pwd)" +if test ! -e mplayer_options ; then touch mplayer_options ; fi +if test ! -e common_options ; then touch mplayer_options ; fi +cd "$mydir"/mplayer + +# The --extra-cflags and --extra-ldflags parameters should not be necessary +# to find the libraries, but they're there to ensure those directories +# appear first in the search path in case there's another version of the +# library installed on the system. + +PKG_CONFIG_PATH="$mydir/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH" ./configure --extra-cflags="-I$mydir/build_libs/include" --extra-ldflags="-L$mydir/build_libs/lib" `cat ../common_options` `cat ../mplayer_options` diff --git a/update b/update new file mode 100755 index 0000000..7c23818 --- /dev/null +++ b/update @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +git pull +MPBUILD_COMMAND='git submodule update --init' "`pwd`"/script/foreach_submodule nottop -- 2.11.4.GIT