summaryrefslogtreecommitdiff
path: root/package/mplayer/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/mplayer/Makefile')
-rw-r--r--package/mplayer/Makefile127
1 files changed, 63 insertions, 64 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index d05da35f5..875f61c07 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,14 +4,14 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0-31425
-PKG_RELEASE:= 1
-PKG_MD5SUM:= e65b88e7a5c1c2f98c98e565357b9663
+PKG_VERSION:= 1.0-31648
+PKG_RELEASE:= 2
+PKG_MD5SUM:= eeb9219f9015e0e0dfbf4a70efefb751
PKG_DESCR:= popular video player
-PKG_SECTION:= video
+PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
PKG_DEPENDS+= libogg libpng libpthread libvorbis
-PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
+PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib
PKG_BUILDDEP+= libX11 libXv libpng libXext
ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
@@ -30,7 +30,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIG_STYLE:= manual
+# gcc 4.5 produces internal compiler error with -Os
+#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
+CONFIG_STYLE:= minimal
FAKE_FLAGS+= INSTALLSTRIP=''
@@ -67,70 +70,66 @@ CONFIGURE_CPU_OPTS:= \
endif
ifeq ($(ADK_DEBUG),y)
-CONFIGURE_DEBUG= --enable-debug --enable-crash-debug
+CONFIGURE_DEBUG= --enable-debug
endif
ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-CONFIGURE_DIRECTFB=--enable-directfb
+CONFIGURE_DIRECTFB= --enable-directfb
else
-CONFIGURE_DIRECTFB=--disable-directfb
+CONFIGURE_DIRECTFB= --disable-directfb
endif
-pre-configure:
- (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- ./configure \
- --enable-x11 \
- --prefix=/usr \
- --confdir=/etc \
- --enable-cross-compile \
- --target=${ARCH}-linux \
- --cc=$(TARGET_CC) \
- --host-cc=$(HOSTCC) \
- --disable-mencoder \
- --enable-fbdev \
- --enable-alsa \
- --enable-tv \
- --enable-v4l2 \
- --enable-png \
- --enable-jpeg \
- --enable-mad \
- --disable-faad-internal \
- --enable-libvorbis \
- --disable-ossaudio \
- --disable-vm \
- --disable-iconv \
- --disable-lirc \
- --disable-radio-v4l2 \
- --disable-faac \
- --disable-libdv \
- --disable-live \
- --disable-pvr \
- --disable-ftp \
- --disable-ivtv \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-freetype \
- --disable-tremor-internal \
- --disable-arts \
- --disable-esd \
- --disable-jack \
- --disable-openal \
- --disable-nas \
- --disable-sgiaudio \
- --disable-sunaudio \
- --disable-win32waveout \
- --disable-tga \
- --disable-pnm \
- --disable-md5sum \
- --disable-liblzo \
- --disable-xinerama \
- --disable-vidix \
- --disable-gl \
- --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
- ${CONFIGURE_CPU_OPTS} \
- ${CONFIGURE_DEBUG} \
- ${CONFIGURE_DIRECTFB} \
- );
+CONFIGURE_ARGS:= --prefix=/usr \
+ --enable-x11 \
+ --confdir=/etc \
+ --enable-cross-compile \
+ --target=${ARCH}-linux \
+ --cc=$(TARGET_CC) \
+ --host-cc=$(HOSTCC) \
+ --disable-mencoder \
+ --enable-fbdev \
+ --enable-alsa \
+ --enable-tv \
+ --enable-v4l2 \
+ --enable-png \
+ --enable-jpeg \
+ --enable-mad \
+ --disable-faad-internal \
+ --enable-libvorbis \
+ --disable-ossaudio \
+ --disable-vm \
+ --disable-iconv \
+ --disable-lirc \
+ --disable-radio-v4l2 \
+ --disable-faac \
+ --disable-libdv \
+ --disable-live \
+ --disable-pvr \
+ --disable-ftp \
+ --disable-ivtv \
+ --disable-dvdread-internal \
+ --disable-libdvdcss-internal \
+ --disable-freetype \
+ --disable-tremor-internal \
+ --disable-arts \
+ --disable-esd \
+ --disable-jack \
+ --disable-openal \
+ --disable-nas \
+ --disable-sgiaudio \
+ --disable-sunaudio \
+ --disable-win32waveout \
+ --disable-tga \
+ --disable-pnm \
+ --disable-md5sum \
+ --disable-liblzo \
+ --disable-xinerama \
+ --disable-vidix \
+ --disable-gl \
+ --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
+ ${CONFIGURE_CPU_OPTS} \
+ ${CONFIGURE_DEBUG} \
+ ${CONFIGURE_DIRECTFB}
post-install:
${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin