--- ...rol-prototype-to-match-the-one-in-video_o.patch | 25 ++ .../files/0002-remove-libaf-af_lavcac3enc.c.patch | 49 ++++ recipes/mplayer/mplayer_git.bb | 232 ++++++++++++++++++++ 3 files changed, 306 insertions(+), 0 deletions(-) create mode 100644 recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch create mode 100644 recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch create mode 100644 recipes/mplayer/mplayer_git.bb
diff --git a/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch b/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch new file mode 100644 index 0000000..e7e50c9 --- /dev/null +++ b/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch @@ -0,0 +1,25 @@ +From abc6589edec24a8151d53741c2fe479b983e1f46 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Sun, 1 Nov 2009 21:58:21 +0100 +Subject: [PATCH 1/2] Modify control() prototype to match the one in video_out_internal.h + +--- + libvo/vo_glamo.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libvo/vo_glamo.c b/libvo/vo_glamo.c +index f528649..e53d523 100644 +--- a/libvo/vo_glamo.c ++++ b/libvo/vo_glamo.c +@@ -182,7 +182,7 @@ static int glamo_window(mp_win_t *win) + return VO_TRUE; + } + +-static int control(uint32_t request, void *data, ...) ++static int control(uint32_t request, void *data) + { + switch (request) { + case VOCTRL_QUERY_FORMAT: +-- +1.6.5.2 + diff --git a/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch b/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch new file mode 100644 index 0000000..9359cd5 --- /dev/null +++ b/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch @@ -0,0 +1,49 @@ +From 73f1df1d1719dcdf6c2989e75d4ee87d44141eaa Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Mon, 2 Nov 2009 09:33:46 +0100 +Subject: [PATCH 2/2] remove libaf/af_lavcac3enc.c + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index ce4999c..213be06 100644 +--- a/Makefile ++++ b/Makefile +@@ -138,7 +138,7 @@ SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ + libmpcodecs/vf_uspp.c \ + + # These filters use private headers and do not work with shared libavcodec. +-SRCS_COMMON-$(LIBAVCODEC_INTERNALS) += libaf/af_lavcac3enc.c \ ++SRCS_COMMON-$(LIBAVCODEC_INTERNALS) += \ + libmpcodecs/vf_fspp.c \ + libmpcodecs/vf_geq.c \ + libmpcodecs/vf_mcdeint.c \ +-- +1.6.5.2 + +From d194f944b7fd07ec77987a91df17732a4a9a47cd Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Mon, 2 Nov 2009 09:38:53 +0100 +Subject: [PATCH] remove libaf/af_lavcac3enc.c + +--- + Makefile | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 213be06..25c4577 100644 +--- a/Makefile ++++ b/Makefile +@@ -372,7 +372,6 @@ SRCS_COMMON = asxparser.c \ + libaf/af_tools.c \ + libaf/af_volnorm.c \ + libaf/af_volume.c \ +- libaf/af_lavcac3enc.c \ + libaf/filter.c \ + libaf/format.c \ + libaf/reorder_ch.c \ +-- +1.6.5.2 + diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb new file mode 100644 index 0000000..d33a14d --- /dev/null +++ b/recipes/mplayer/mplayer_git.bb @@ -0,0 +1,232 @@ +DESCRIPTION = "Open Source multimedia player." +SECTION = "multimedia" +PRIORITY = "optional" +HOMEPAGE = "http://www.mplayerhq.hu/"; +DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel \ + $...@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" + +RDEPENDS = "mplayer-common" +LICENSE = "GPL" +SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=tmp_build" +SRC_URI_om-gta02 = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \ + file://0001-Modify-control-prototype-to-match-the-one-in-video_o.patch;patch=1 \ + file://0002-remove-libaf-af_lavcac3enc.c.patch;patch=1 \ + file://makefile-nostrip-svn.patch;patch=1 \ + " + +SRC_URI_append = " \ + file://pld-onlyarm5-svn.patch;patch=1 \ + file://makefile-nostrip-svn.patch;patch=1 \ + " + +SRC_URI_append_armv7a = " \ + file://omapfb.patch;patch=1 \ + file://vo_omapfb.c \ + file://yuv.S \ + " + +# This is required for the collie machine only as all stacks in that +# machine seem to be set to executable by the toolchain. If someone +# discovers this is more general than please make this more general +# ie. for all armv4 machines. +SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1" + +SRCREV_om-gta02 = "dd07d2721934bc664f69af36e20565d6eac27f7a" +SRCREV = "8bbb79c03a594e452fb9109dd6fda781d390a798" + +PACKAGE_ARCH_collie = "collie" +PACKAGE_ARCH_c7x0 = "c7x0" +PACKAGE_ARCH_hx4700 = "hx4700" + +ARM_INSTRUCTION_SET = "ARM" + +RCONFLICTS_${PN} = "mplayer-atty" +RREPLACES_${PN} = "mplayer-atty" + +PV = "0.0+1.0rc2+gitr${SRCPV}" +PR = "r15" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_armv7a = "1" +DEFAULT_PREFERENCE_om-gta02 = "1" + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/git" + +PACKAGES =+ "mencoder" + +FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" +FILES_mencoder = "${bindir}/mencoder" +CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ + /usr/etc/mplayer/example.conf \ + /usr/etc/mplayer/codecs.conf \ + " + +inherit autotools pkgconfig + +# We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" + +EXTRA_OECONF = " \ + --prefix=/usr \ + --mandir=${mandir} \ + --target=${SIMPLE_TARGET_SYS} \ + \ + --enable-mencoder \ + --disable-gui \ + --enable-largefiles \ + --disable-linux-devfs \ + --disable-lirc \ + --disable-lircc \ + --disable-joystick \ + --disable-vm \ + --disable-xf86keysym \ + --enable-tv \ + --enable-tv-v4l1 \ + --enable-tv-v4l2 \ + --disable-tv-bsdbt848 \ + --enable-rtc \ + --enable-network \ + --disable-smb \ + --enable-live \ + --disable-dvdnav \ + --enable-dvdread \ + --disable-dvdread-internal \ + --enable-libdvdcss-internal \ + --disable-cdparanoia \ + --enable-freetype \ + --enable-menu \ + --enable-sortsub \ + --disable-fribidi \ + --disable-enca \ + --disable-ftp \ + --disable-vstream \ + \ + --disable-gif \ + --enable-png \ + --enable-jpeg \ + --disable-libcdio \ + --disable-liblzo \ + --disable-qtx \ + --disable-xanim \ + --disable-real \ + --disable-xvid \ + --disable-x264 \ + \ + --enable-tremor-low \ + \ + --disable-speex \ + --enable-theora \ + --disable-faac \ + --disable-ladspa \ + --disable-libdv \ + --enable-mad \ + --disable-toolame \ + --disable-twolame \ + --disable-xmms \ + --disable-mp3lib \ + --enable-libmpeg2 \ + --disable-musepack \ + \ + --disable-gl \ + --disable-vesa \ + --disable-svga \ + --enable-sdl \ + --disable-aa \ + --disable-caca \ + --disable-ggi \ + --disable-ggiwmh \ + --disable-directx \ + --disable-dxr2 \ + --disable-dxr3 \ + --disable-dvb \ + --disable-dvbhead \ + --disable-mga \ + --disable-xmga \ + --enable-xv \ + --disable-xvmc \ + --disable-vm \ + --disable-xinerama \ + --enable-x11 \ + --enable-fbdev \ + --disable-mlib \ + --disable-3dfx \ + --disable-tdfxfb \ + --disable-s3fb \ + --disable-directfb \ + --disable-zr \ + --disable-bl \ + --disable-tdfxvid \ + --disable-tga \ + --disable-pnm \ + --disable-md5sum \ + \ + --enable-alsa \ + --enable-ossaudio \ + --disable-arts \ + --disable-esd \ + --disable-pulse \ + --disable-jack \ + --disable-openal \ + --disable-nas \ + --disable-sgiaudio \ + --disable-sunaudio \ + --disable-win32waveout \ + --enable-select \ + \ + --extra-libs=' -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++' \ +" + +EXTRA_OECONF_append_armv6 = " --enable-armv6" +EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" + +EXTRA_OECONF_append_om-gta02 = " --enable-glamo" + +#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up) +#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "$...@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}" + +MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}" +TARGET_CC_ARCH = "$...@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}" + +EXTRA_OECONF_append = " $...@base_contains('MACHINE_FEATURES', 'iwmmxt', ' --enable-iwmmxt', '',d)} " +EXTRA_OECONF_append = " $...@base_contains('MACHINE_FEATURES', 'x86', '--enable-runtime-cpudetection', '',d)} " + +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" + +do_configure_prepend_armv7a() { + cp ${WORKDIR}/yuv.S ${S}/libvo + cp ${WORKDIR}/vo_omapfb.c ${S}/libvo + cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S}/libvo/omapfb.h || true + cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S}/libvo/omapfb.h || true + cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S}/libvo/omapfb.h || true + sed -e 's/__user//g' -i ${S}/libvo/omapfb.h || true +} + +CFLAGS_append = " -I${S}/libdvdread4 " + +do_configure() { + sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure + sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure + sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure + sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure + sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile + + export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" + ./configure ${EXTRA_OECONF} + +} + +do_compile () { + oe_runmake +} + +do_install_append() { + install -d ${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/codecs.conf ${D}/usr/etc/mplayer/ +} -- 1.6.5.3 _______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
