diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/mplayer | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index f4ea0a183..ab22f18d3 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -17,6 +17,8 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://openadk.org/distfiles/ +PKG_HOST_DEPENDS:= !darwin + PKG_FLAVOURS:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support PKGFS_WITH_DIRECTFB:= directfb diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure index 711488515..0189d6962 100644 --- a/package/mplayer/patches/patch-configure +++ b/package/mplayer/patches/patch-configure @@ -1,6 +1,15 @@ ---- mplayer-1.0-31648.orig/configure 2010-07-09 11:54:31.000000000 +0200 -+++ mplayer-1.0-31648/configure 2010-07-15 19:03:13.247109421 +0200 -@@ -4304,7 +4304,7 @@ dfb_version() { +--- mplayer-1.0-31868.orig/configure 2010-07-30 17:43:10.000000000 +0200 ++++ mplayer-1.0-31868/configure 2010-10-10 13:06:15.000000000 +0200 +@@ -1530,7 +1530,7 @@ fi + if irix ; then + _ranlib='ar -r' + elif linux ; then +- _ranlib='true' ++ _ranlib='ranlib' + fi + + if win32 ; then +@@ -4354,7 +4354,7 @@ dfb_version() { if test "$_directfb" = yes; then cat > $TMPC << EOF |