From 11e62d752a522433f7c040b840d9d3b9d22bd011 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 26 Mar 2006 16:06:45 +0000 Subject: mplayer: Add mplayer-common. mplayer-common includes a default configuration for mplayer which should work on all devices. Also added mplayer-common to the mplayer and mplayer-atty .bb's --- packages/mplayer/mplayer-atty_1.1.5.bb | 5 +++-- packages/mplayer/mplayer-common.bb | 31 ++++++++++++++++++++++++++ packages/mplayer/mplayer-common/.mtn2git_empty | 0 packages/mplayer/mplayer-common/mplayer.conf | 15 +++++++++++++ packages/mplayer/mplayer_1.0pre7.bb | 5 +++-- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 packages/mplayer/mplayer-common.bb create mode 100644 packages/mplayer/mplayer-common/.mtn2git_empty create mode 100644 packages/mplayer/mplayer-common/mplayer.conf diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb index 116758c326..96f0027d0a 100644 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ b/packages/mplayer/mplayer-atty_1.1.5.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib" +DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory " -PR = "r4" +PR = "r5" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb new file mode 100644 index 0000000000..93ddc975b9 --- /dev/null +++ b/packages/mplayer/mplayer-common.bb @@ -0,0 +1,31 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: mplayer-common.bb +# Date: 26-Mar-06 + +DESCRIPTION = "Preconfigured mplayer preferences" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PV = "0.0.1" +PR = "r0" + +###################################################################################### + +SRC_URI = "file://mplayer.conf" + +###################################################################################### + +FILES_${PN} = "/usr/etc/mplayer" + +###################################################################################### + +do_install() { + install -d "${D}/usr/etc/mplayer" + + install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer" +} diff --git a/packages/mplayer/mplayer-common/.mtn2git_empty b/packages/mplayer/mplayer-common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-common/mplayer.conf b/packages/mplayer/mplayer-common/mplayer.conf new file mode 100644 index 0000000000..92aeb15f3b --- /dev/null +++ b/packages/mplayer/mplayer-common/mplayer.conf @@ -0,0 +1,15 @@ + +# You probably shouldn't touch these +ac=mad, +ao=oss, + +# Required on SL-Cxxxx for correct rotation in the *VT*, +# breaks rotation in X! +# vf=rotate=1 + +# Enable fullscreen display by default +# fs=true + +# Drop frames to keep audio and video in sync +framedrop=true + diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index a9ace88530..bcfc11363b 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" +DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=1 \ @@ -12,7 +13,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://libmpcodecs-ogg-include.patch;patch=1 " MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" -PR = "r2" +PR = "r3" PARALLEL_MAKE = "" -- cgit 1.2.3-korg