diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/mplayer/Makefile | |
parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/mplayer/Makefile')
-rw-r--r-- | package/mplayer/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 5dee24517..b3a908e8b 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -9,14 +9,18 @@ PKG_NAME:= mplayer PKG_VERSION:= 1.0rc2 PKG_RELEASE:= 2 PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707 -DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/ +PKG_DESCR:= popular video player +PKG_SECTION:= video +PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread +PKG_URL:= http://www.mplayerhq.hu +PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/ +DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= auto |