[meta-oe 0/4] Small fixes, move kbd and libsdl to oe-core

[meta-oe 0/4] Small fixes, move kbd and libsdl to oe-core

[Martin Jansa]

Patches 3 and 4 depend on oe-core patchset
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012397.html

The following changes since commit dd54be4a2fc0f0597a82525fcb97c69539a547c4:

  rsyslog: change postrm to prerm (2011-11-09 14:16:14 +0100)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (4):
  mplayer-common: import from OE-classic
  openssl: bump PR to fix license
  libsdl-x11: drop from meta-oe
  kbd: move to oe-core

 .../recipes-connectivity/openssl/openssl_0.9.8m.bb |    2 +-
 .../recipes-connectivity/openssl/openssl_1.0.0e.bb |    2 +-
 meta-oe/recipes-core/kbd/kbd_1.15.2.bb             |   19 --------------
 meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc  |   27 --------------------
 .../recipes-graphics/libsdl/libsdl-x11_1.2.14.bb   |   18 -------------
 .../recipes-multimedia/mplayer/mplayer-common.bb   |   22 ++++++++++++++++
 .../mplayer/mplayer-common/mplayer.conf            |   15 +++++++++++
 7 files changed, 39 insertions(+), 66 deletions(-)
 delete mode 100644 meta-oe/recipes-core/kbd/kbd_1.15.2.bb
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-x11_1.2.14.bb
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf

-- 
1.7.8.rc1

[meta-oe 1/4] mplayer-common: import from OE-classic

[Martin Jansa]

From: Martin Jansa <martin.jansa@gmail.com>

* commit b28081b6039db85f18bf9e722fece59bff6e7b0f

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-multimedia/mplayer/mplayer-common.bb   |   22 ++++++++++++++++++++
 .../mplayer/mplayer-common/mplayer.conf            |   15 +++++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
new file mode 100644
index 0000000..889bb95
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
@@ -0,0 +1,22 @@
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: MIT (see COPYING.MIT)
+
+DESCRIPTION = "Preconfigured mplayer preferences"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PV = "0.0.1"
+
+SRC_URI = "file://mplayer.conf"
+
+# Yes, really /usr/etc!!!
+do_install() {
+	install -d "${D}/usr${sysconfdir}/mplayer"
+
+	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer"
+}
+
+FILES_${PN} = "/usr${sysconfdir}/mplayer"
+
+inherit allarch
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
new file mode 100644
index 0000000..92aeb15
--- /dev/null
+++ b/meta-oe/recipes-multimedia/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
+
-- 
1.7.8.rc1

[meta-oe 2/4] openssl: bump PR to fix license

[Martin Jansa]

* see http://patchwork.openembedded.org/patch/14217/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-connectivity/openssl/openssl_0.9.8m.bb |    2 +-
 .../recipes-connectivity/openssl/openssl_1.0.0e.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
index 1091bf2..dde797b 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
@@ -4,7 +4,7 @@ require openssl.inc
 SRC_URI[src.md5sum] = "898bf125370926d5f692a2201124f8ec"
 SRC_URI[src.sha256sum] = "36037160281cf4977d964e403d2bc0680fbca0a7ff9f65e33136d75fae12cb5b"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 export OE_LDFLAGS="${LDFLAGS}"
 
diff --git a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
index 8fcf0ff..ea12974 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-- 
1.7.8.rc1

[meta-oe 3/4] libsdl-x11: drop from meta-oe

[Martin Jansa]

* there is libsdl in oe-core and nothing depends on libsdl-x11 here

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc  |   27 --------------------
 .../recipes-graphics/libsdl/libsdl-x11_1.2.14.bb   |   18 -------------
 2 files changed, 0 insertions(+), 45 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-x11_1.2.14.bb

diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc
deleted file mode 100644
index 92627e3..0000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.14.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer (DirectFB and Framebuffer support)"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
-
-DEPENDS = "alsa-lib"
-PROVIDES = "virtual/libsdl"
-INC_PR = "r0"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-SRC_URI[md5sum] = "e52086d1b508fa0b76c52ee30b55bec4"
-SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6"
-
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools lib_package binconfig pkgconfig
-
-EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
-
-do_configure_prepend () {
-        # Remove old libtool macros.
-        MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-        for i in ${MACROS}; do
-               rm -f acinclude/$i
-        done
-	export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
-}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-x11_1.2.14.bb b/meta-oe/recipes-graphics/libsdl/libsdl-x11_1.2.14.bb
deleted file mode 100644
index 26f2c18..0000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl-x11_1.2.14.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require libsdl-1.2.14.inc
-
-DEPENDS += "virtual/libgl virtual/libx11 libxext tslib"
-DEPENDS_avr32 += "alsa-lib virtual/libx11 libxext tslib"
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF = " \
-  --disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
-  --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
-  --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-  --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-  --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-  --disable-video-xbios --disable-video-gem --disable-video-dummy \
-  --enable-video-opengl --enable-input-events --enable-pthreads \
-  --disable-video-picogui --disable-video-qtopia --enable-dlopen \
-  --enable-input-tslib --disable-video-ps3 --disable-rpath \
-"
-- 
1.7.8.rc1

[meta-oe 4/4] kbd: move to oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/kbd/kbd_1.15.2.bb |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)
 delete mode 100644 meta-oe/recipes-core/kbd/kbd_1.15.2.bb

diff --git a/meta-oe/recipes-core/kbd/kbd_1.15.2.bb b/meta-oe/recipes-core/kbd/kbd_1.15.2.bb
deleted file mode 100644
index 36e68a0..0000000
--- a/meta-oe/recipes-core/kbd/kbd_1.15.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "This package contains keytable files and keyboard utilities"
-# everything minus console-fonts is GPLv2+
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
-
-inherit autotools gettext
-
-BBCLASSEXTEND = "native"
-
-SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
-SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
-SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
-
-PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
-
-FILES_${PN}-consolefonts = "${datadir}/consolefonts"
-FILES_${PN}-consoletrans = "${datadir}/consoletrans"
-FILES_${PN}-keymaps = "${datadir}/keymaps"
-FILES_${PN}-unimaps = "${datadir}/unimaps"
-- 
1.7.8.rc1

Re: [meta-oe 1/4] mplayer-common: import from OE-classic

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 09-11-11 18:47, Martin Jansa schreef:
> From: Martin Jansa <martin.jansa@gmail.com>
> 
> * commit b28081b6039db85f18bf9e722fece59bff6e7b0f
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- 
> .../recipes-multimedia/mplayer/mplayer-common.bb   |   22
> ++++++++++++++++++++ .../mplayer/mplayer-common/mplayer.conf            |
> 15 +++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create
> mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common.bb create
> mode 100644
> meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
> 
> diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
> b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb new file mode
> 100644 index 0000000..889bb95 --- /dev/null +++
> b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb @@ -0,0 +1,22 @@ 
> +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License:
> MIT (see COPYING.MIT) + +DESCRIPTION = "Preconfigured mplayer
> preferences" + +LICENSE = "MIT" +LIC_FILES_CHKSUM =
> "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>
> 
+
> +PV = "0.0.1" + +SRC_URI = "file://mplayer.conf" + +# Yes, really
> /usr/etc!!! +do_install() { +	install -d "${D}/usr${sysconfdir}/mplayer" 
> + +	install -m 0644 ${WORKDIR}/mplayer.conf
> "${D}/usr${sysconfdir}/mplayer" +} + +FILES_${PN} =
> "/usr${sysconfdir}/mplayer" + +inherit allarch diff --git
> a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
> b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf new file
> mode 100644 index 0000000..92aeb15 --- /dev/null +++
> b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf @@ -0,0
> +1,15 @@ + +# You probably shouldn't touch these +ac=mad, +ao=oss,

Are those still needed? On armv6 and up the builtin ffmpeg decoder is faster
than mad and who is using non-alsa emulated oss nowadays?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOu4roMkyGM64RGpERApONAJ0cAehUkELZSbomF2h1y92Pv40P0wCgpWd1
1nkJwVaKO6lYpmSRFXOiOzU=
=72y+
-----END PGP SIGNATURE-----

Re: [meta-oe 1/4] mplayer-common: import from OE-classic

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2372 bytes --]

On Thu, Nov 10, 2011 at 09:27:20AM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Op 09-11-11 18:47, Martin Jansa schreef:
> > From: Martin Jansa <martin.jansa@gmail.com>
> > 
> > * commit b28081b6039db85f18bf9e722fece59bff6e7b0f
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- 
> > .../recipes-multimedia/mplayer/mplayer-common.bb   |   22
> > ++++++++++++++++++++ .../mplayer/mplayer-common/mplayer.conf            |
> > 15 +++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create
> > mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer-common.bb create
> > mode 100644
> > meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
> > 
> > diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
> > b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb new file mode
> > 100644 index 0000000..889bb95 --- /dev/null +++
> > b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb @@ -0,0 +1,22 @@ 
> > +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License:
> > MIT (see COPYING.MIT) + +DESCRIPTION = "Preconfigured mplayer
> > preferences" + +LICENSE = "MIT" +LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> >
> > 
> +
> > +PV = "0.0.1" + +SRC_URI = "file://mplayer.conf" + +# Yes, really
> > /usr/etc!!! +do_install() { +	install -d "${D}/usr${sysconfdir}/mplayer" 
> > + +	install -m 0644 ${WORKDIR}/mplayer.conf
> > "${D}/usr${sysconfdir}/mplayer" +} + +FILES_${PN} =
> > "/usr${sysconfdir}/mplayer" + +inherit allarch diff --git
> > a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
> > b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf new file
> > mode 100644 index 0000000..92aeb15 --- /dev/null +++
> > b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf @@ -0,0
> > +1,15 @@ + +# You probably shouldn't touch these +ac=mad, +ao=oss,
> 
> Are those still needed? On armv6 and up the builtin ffmpeg decoder is faster
> than mad and who is using non-alsa emulated oss nowadays?

default
Selected audio codec: [ffmp3float] afm: ffmpeg (FFmpeg MPEG layer-3 audio)
is terribly slow on armv4t without FPU

but you're right ao could have better default

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe 3/4] libsdl-x11: drop from meta-oe

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

On Wed, Nov 09, 2011 at 06:47:55PM +0100, Martin Jansa wrote:
> * there is libsdl in oe-core and nothing depends on libsdl-x11 here
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

finally this can go in and I'll resend updated mplayer patches with next
pull request.

Cheers,


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]