merge of 2e6f4fc5b24b571067b1137624e2b534da044e21

     and 4aa63ccabe96771d4c4363d6c68ebc597fd1c378

5 files changed, 52 insertions, 4 deletions

diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index 5a8194b388..cfc8c7a40a 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.skr.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 <dp@xora.org.uk>"
-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 <devel@hentges.net> (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 <oe@hentges.net>"
+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
--- /dev/null
+++ b/packages/mplayer/mplayer-common/.mtn2git_empty
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 bb9f540ab5..5413ab214c 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 \
@@ -14,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
-PR = "r2"
+PR = "3"
 
 PARALLEL_MAKE = ""