diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-30 15:28:20 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-30 15:28:20 +0200 |
commit | 6d43095085294f6c2496c92d1a0f9661d1138e54 (patch) | |
tree | 8c370b25e93f1c7ae4e662a038b7ca061e39a8ae /package/mplayer/Makefile | |
parent | f3f363240d49eed73964dfffdc04a81f667429c2 (diff) | |
parent | 050b471cb5e78e5d97a1a033d2a16cf34a245fb4 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mplayer/Makefile')
-rw-r--r-- | package/mplayer/Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0a98de806..51ecceea4 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player PKG_SECTION:= multimedia @@ -19,6 +19,8 @@ PKG_BUILDDEP+= xvidcore libvpx gettext-tiny PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://www.mplayerhq.hu/MPlayer/releases/ +PKG_BUILDDEP_IBM_X40:= yasm-host + DISTFILES:= MPlayer-$(PKG_VERSION).tar.xz WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} @@ -89,6 +91,12 @@ else CONFIGURE_DIRECTFB= --disable-directfb endif +ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y) + --yasm=${STAGING_HOST_DIR}/usr/bin/yasm +else + --yasm='' +endif + CONFIGURE_ARGS:= --prefix=/usr \ --enable-x11 \ --confdir=/etc \ @@ -96,8 +104,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --target=${ARCH}-linux \ --cc='$(TARGET_CC)' \ --host-cc=$(CC_FOR_BUILD) \ - --yasm='' \ - --disable-mencoder \ --enable-fbdev \ --enable-alsa \ --enable-tv \ @@ -109,7 +115,11 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-faac \ --enable-theora \ --enable-xvid \ + --enable-x264 \ + --enable-x264-lavc \ + --disable-mencoder \ --disable-ossaudio \ + --disable-caca \ --disable-vm \ --disable-iconv \ --disable-lirc \ @@ -141,6 +151,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-xinerama \ --disable-vidix \ --disable-gl \ + --disable-ssse3 \ --extra-cflags="${EXTRA_CFLAGS}" \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ |