mplayer2: bump SRCREV to fix build issues with newer live555

* live555 support was removed in:
  http://git.mplayer2.org/mplayer2/commit/?id=e77b823b341fca0b931228d3e623dab50aa11723
* remove now unsupported options
* needs libav-9.10 which is in oe-core but with negative D_P otherwise
  configure fails:
  Requested 'libavcodec >= 54.25.0' but version of libavcodec is 53.35.0
* disable man installation, because we don't have rst2man

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2014-03-21 13:33:46 +01:00
parent 38818bf223
commit 6a7f8bf6a9
3 changed files with 35 additions and 48 deletions

View File

@ -0,0 +1,26 @@
From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 27 Mar 2014 00:08:54 +0100
Subject: [PATCH] configure: don't disable ASS support when explicitly enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 60fd308..2f7df3b 100755
--- a/configure
+++ b/configure
@@ -4346,7 +4346,7 @@ fi
echocheck "SSA/ASS support"
-if test "$_ass" = auto ; then
+if test "$_ass" = auto -o "$_ass" = yes ; then
if pkg_config_add libass ; then
_ass=yes
def_ass='#define CONFIG_ASS 1'
--
1.9.1

View File

@ -1,16 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
diff --git a/Makefile b/Makefile
index 6013ca3..28c6383 100644
--- a/Makefile
+++ b/Makefile
@@ -600,7 +602,7 @@ mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h
- $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
+ $(BUILD_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@

View File

@ -1,7 +1,7 @@
SUMMARY = "Open Source multimedia player" SUMMARY = "Open Source multimedia player"
SECTION = "multimedia" SECTION = "multimedia"
HOMEPAGE = "http://www.mplayerhq.hu/" HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
libxv virtual/libx11 libass speex faad2" libxv virtual/libx11 libass speex faad2"
@ -13,11 +13,11 @@ RCONFLICTS_${PN} = "mplayer"
LICENSE = "GPLv3" LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "git://repo.or.cz/mplayer.git;branch=master \ SRC_URI = "git://repo.or.cz/mplayer.git \
file://cross.compile.codec-cfg.patch \ file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
" "
SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac" SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9"
ARM_INSTRUCTION_SET = "arm" ARM_INSTRUCTION_SET = "arm"
@ -47,21 +47,15 @@ EXTRA_OECONF = " \
--disable-vm \ --disable-vm \
--disable-xf86keysym \ --disable-xf86keysym \
--enable-tv \ --enable-tv \
--disable-tv-v4l1 \
--enable-tv-v4l2 \ --enable-tv-v4l2 \
--disable-tv-bsdbt848 \ --disable-tv-bsdbt848 \
--enable-rtc \ --enable-rtc \
--enable-networking \ --enable-networking \
--disable-smb \ --disable-smb \
--enable-live \
--disable-dvdnav \ --disable-dvdnav \
--enable-dvdread \ --enable-dvdread \
--disable-dvdread-internal \ --disable-dvdread-internal \
--disable-libdvdcss-internal \ --disable-libdvdcss-internal \
--disable-cdparanoia \
--enable-freetype \
--enable-sortsub \
--disable-fribidi \
--disable-enca \ --disable-enca \
--disable-ftp \ --disable-ftp \
--disable-vstream \ --disable-vstream \
@ -84,49 +78,31 @@ EXTRA_OECONF = " \
--disable-musepack \ --disable-musepack \
\ \
--disable-gl \ --disable-gl \
--disable-vesa \
--disable-svga \
--enable-sdl \ --enable-sdl \
--disable-aa \
--disable-caca \ --disable-caca \
--disable-ggi \
--disable-ggiwmh \
--disable-directx \ --disable-directx \
--disable-dxr3 \
--disable-dvb \ --disable-dvb \
--disable-mga \
--disable-xmga \
--enable-xv \ --enable-xv \
--disable-vm \ --disable-vm \
--disable-xinerama \ --disable-xinerama \
--enable-x11 \ --enable-x11 \
--enable-fbdev \
--disable-3dfx \
--disable-tdfxfb \
--disable-s3fb \
--disable-directfb \ --disable-directfb \
--disable-bl \
--disable-tdfxvid \
--disable-tga \ --disable-tga \
--disable-pnm \ --disable-pnm \
--disable-md5sum \ --disable-md5sum \
\ \
--enable-alsa \ --enable-alsa \
--enable-ossaudio \ --enable-ossaudio \
--disable-arts \
--disable-esd \
--disable-pulse \ --disable-pulse \
--disable-jack \ --disable-jack \
--disable-openal \ --disable-openal \
--disable-nas \
--disable-sgiaudio \
--disable-sunaudio \
--disable-win32waveout \
--enable-select \ --enable-select \
--enable-libass \ --enable-libass \
\ \
--extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \ --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \
" "
# -ltheoradec is missing in:
# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0'
EXTRA_OECONF_append_armv6 = " --enable-armv6" EXTRA_OECONF_append_armv6 = " --enable-armv6"
EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
@ -157,7 +133,8 @@ do_compile () {
oe_runmake oe_runmake
} }
do_install_append() { do_install() {
oe_runmake 'DESTDIR=${D}' install-no-man
install -d ${D}/usr/etc/mplayer install -d ${D}/usr/etc/mplayer
install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ install ${S}/etc/example.conf ${D}/usr/etc/mplayer/