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

login
mail settings
Submitter Martin Jansa
Date Nov. 9, 2011, 5:47 p.m.
Message ID <15e1d24dd8ceb0b5caad096f215a3ace86f6c14d.1320860740.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/14661/
State Accepted
Commit f3ca7acd0b678a9247e432aee34512a26e30f509
Headers show

Comments

Martin Jansa - Nov. 9, 2011, 5:47 p.m.
* 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
Martin Jansa - Nov. 29, 2011, 2:21 p.m.
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,

Patch

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 \
-"