[oe-commits] org.oe.dev merge of '1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 19:32:47 UTC 2008
merge of '1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7'
and 'f5e925a4d49eda729a2458839beb6944538b4ece'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c
ViewMTN: http://monotone.openembedded.org/revision/info/b52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c
Files:
1
packages/images/openmoko-python-devel-image.bb
packages/tasks/task-python-efl-examples.bb
packages/libsdl/libsdl-x11_1.2.7.bb
packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
packages/libsdl/files/explicit-extern-C.patch
packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch
packages/libsdl/files/fixlibs-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch
packages/libsdl/files/kill-stdc++-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch
packages/libsdl/files/pygame-1.2.9.patch
packages/libjson
packages/libjson/libjson_0.6.bb
packages/libsdl/files/pagesize.patch
packages/libsdl/libsdl.inc
conf/distro/colinuxoe.conf
conf/distro/generic-uclibc.conf
conf/distro/nylon.conf
packages/busybox/busybox_1.9.1.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.1.4.bb
packages/libsdl/libsdl-directfb_1.2.9.bb
packages/libsdl/libsdl-qpe_1.2.9.bb
packages/libsdl/libsdl-x11_1.2.9.bb
Diffs:
#
# mt diff -r1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7 -rb52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c
#
#
#
# patch "packages/images/openmoko-python-devel-image.bb"
# from [314c670f5711b4e925e3261db65ca753dbbd5a78]
# to [1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b]
#
# patch "packages/tasks/task-python-efl-examples.bb"
# from [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
# to [c735dfada39bf25a56a17bd3b671cb79ea1e9ecf]
#
============================================================
--- packages/images/openmoko-python-devel-image.bb 314c670f5711b4e925e3261db65ca753dbbd5a78
+++ packages/images/openmoko-python-devel-image.bb 1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b
@@ -1,6 +1,7 @@ IMAGE_INSTALL += "\
require openmoko-image.bb
IMAGE_INSTALL += "\
task-openmoko-python-devel \
+ task-python-efl-examples \
+ edje-viewer \
"
-
============================================================
--- packages/tasks/task-python-efl-examples.bb bf69dc5858a5a32c723a3146a32c4d96419db9ab
+++ packages/tasks/task-python-efl-examples.bb c735dfada39bf25a56a17bd3b671cb79ea1e9ecf
@@ -1,10 +1,14 @@ RDEPENDS = "\
DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
LICENSE = "MIT"
SECTION = "devel/python"
RDEPENDS = "\
- python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \
+ task-python-efl \
+ python-ecore-examples \
+ python-emotion-examples \
+ python-edje-examples \
+ python-epsilon-examples \
python-math python-textutils \
"
-PR = "ml2"
+PR = "ml3"
ALLOW_EMPTY = "1"
#
# mt diff -rf5e925a4d49eda729a2458839beb6944538b4ece -rb52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c
#
#
#
# delete "packages/libsdl/libsdl-x11_1.2.7.bb"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch"
# to "packages/libsdl/files/explicit-extern-C.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch"
# to "packages/libsdl/files/fixlibs-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch"
# to "packages/libsdl/files/kill-stdc++-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch"
# to "packages/libsdl/files/pygame-1.2.9.patch"
#
# add_dir "packages/libjson"
#
# add_file "packages/libjson/libjson_0.6.bb"
# content [57349c69fb7f4206bcae0906624bdedfd3f6a5b8]
#
# add_file "packages/libsdl/files/pagesize.patch"
# content [685e5e3d3f38aaf2558a01e5d26f04248d55e40f]
#
# add_file "packages/libsdl/libsdl.inc"
# content [50d941276aa6e48d473b59355b178be3c185f8c5]
#
# patch "conf/distro/colinuxoe.conf"
# from [ccdddecbd8f6e1e25357bbf924e495e75a035370]
# to [4f165f8548d04da3291cbc867c1706b00ee32f28]
#
# patch "conf/distro/generic-uclibc.conf"
# from [2280bf1003490f3615211613df40817df22352d3]
# to [4b6c77936994e0b78819a2d3d1f6a9e68262429f]
#
# patch "conf/distro/nylon.conf"
# from [8023e0c2edd176168e71abdd5abe8904105e6ba7]
# to [55b55fd58b093f18dc69ad389287e77c548403ae]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [3a914925d1165b2233a86cff45de9256eb4eb9d3]
# to [bc182dde57834bba53bbe9431d9fd0bba7e17521]
#
# patch "packages/dbus/dbus.inc"
# from [d2ebf6fc194524deeab9e6da2a97e839999171a9]
# to [afa9d185f101fddb15e7fc80aa75db16945c0520]
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [a941688e3a8621769a37bb46e79d4f2d5764966a]
# to [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
#
# patch "packages/libsdl/libsdl-directfb_1.2.9.bb"
# from [406ccc95e51fa48fbf7a3e05f121fb4c844235ca]
# to [7cee0ace7a8b1ca3181cb5a3db699dda21ececab]
#
# patch "packages/libsdl/libsdl-qpe_1.2.9.bb"
# from [1a41fea40fbd70743eb8fd8b3a7946b8d50acc6f]
# to [bc4c99538eb36cd779ec379046f207fb0223ad54]
#
# patch "packages/libsdl/libsdl-x11_1.2.9.bb"
# from [06aede1a5997211b6a86bab9b2462f2f8e4c0343]
# to [b8fbd61ef90fce1e7962217839c47f784d8f8cc6]
#
============================================================
--- packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
+++ packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
@@ -0,0 +1,15 @@
+DESCRIPTION = "A library for parsing and creating JSON files"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+S = "${WORKDIR}/json-c-${PV}"
+
+inherit autotools
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/libsdl/files/pagesize.patch 685e5e3d3f38aaf2558a01e5d26f04248d55e40f
+++ packages/libsdl/files/pagesize.patch 685e5e3d3f38aaf2558a01e5d26f04248d55e40f
@@ -0,0 +1,15 @@
+Remove obsolete non-portable macro.
+
+Index: SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+===================================================================
+--- SDL-1.2.9.orig/src/video/fbcon/SDL_fbvideo.c
++++ SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+@@ -405,7 +405,7 @@ static int FB_VideoInit(_THIS, SDL_Pixel
+
+ /* Memory map the device, compensating for buggy PPC mmap() */
+ mapped_offset = (((long)finfo.smem_start) -
+- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++ (((long)finfo.smem_start)&~(getpagesize()-1)));
+ mapped_memlen = finfo.smem_len+mapped_offset;
+ mapped_mem = mmap(NULL, mapped_memlen,
+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
============================================================
--- packages/libsdl/libsdl.inc 50d941276aa6e48d473b59355b178be3c185f8c5
+++ packages/libsdl/libsdl.inc 50d941276aa6e48d473b59355b178be3c185f8c5
@@ -0,0 +1,50 @@
+DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
+PROVIDES = "virtual/libsdl"
+LICENSE = "LGPL"
+PR = "r3"
+
+SRC_URI = "\
+ http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+ file://extra-keys.patch;patch=1 \
+ file://pagesize.patch;patch=1 \
+ file://acinclude.m4"
+S = "${WORKDIR}/SDL-${PV}"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "<overwrite me>"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/*config"
+
+do_configure_prepend() {
+ rm -f ${S}/acinclude.m4
+ cp ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_append () {
+ cd ${S}
+
+ # prevent libtool from linking libs against libstdc++, libgcc, ...
+ cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+ mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage() {
+ oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
+ rm ${STAGING_LIBDIR}/libSDL.la
+ ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
+ #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
+ install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/SDL
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/SDL/
+ done
+
+ install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
+}
============================================================
--- conf/distro/colinuxoe.conf ccdddecbd8f6e1e25357bbf924e495e75a035370
+++ conf/distro/colinuxoe.conf 4f165f8548d04da3291cbc867c1706b00ee32f28
@@ -1,7 +1,9 @@
#@TYPE: Distribution
#@NAME: coLinuxoe
#@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
+TARGET_OS = "linux"
+
INHERIT += "package_ipk debian"
# MACHINE decides that linux-colinux is the correct kernel.
============================================================
--- conf/distro/generic-uclibc.conf 2280bf1003490f3615211613df40817df22352d3
+++ conf/distro/generic-uclibc.conf 4b6c77936994e0b78819a2d3d1f6a9e68262429f
@@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/libintl = "li
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
PREFERRED_PROVIDER_virtual/libintl = "libintl"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+PREFERRED_VERSION_uclibc = "0.9.29"
+PREFERRED_VERSION_uclibc-initial = "0.9.29"
+
============================================================
--- conf/distro/nylon.conf 8023e0c2edd176168e71abdd5abe8904105e6ba7
+++ conf/distro/nylon.conf 55b55fd58b093f18dc69ad389287e77c548403ae
@@ -11,6 +11,8 @@
#
# Bruno Randolf <bruno.randolf at 4g-systems.biz>
+TARGET_OS = "linux"
+
INHERIT += "package_ipk debian nylon-mirrors"
INHERIT += "linux-kernel-base"
============================================================
--- packages/busybox/busybox_1.9.1.bb 3a914925d1165b2233a86cff45de9256eb4eb9d3
+++ packages/busybox/busybox_1.9.1.bb bc182dde57834bba53bbe9431d9fd0bba7e17521
@@ -1,7 +1,10 @@ require busybox.inc
require busybox.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+ http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
+ file://udhcpscript.patch;patch=1 \
+ file://adduser-longops.patch;patch=1 \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
@@ -10,16 +13,12 @@ SRC_URI = "http://www.busybox.net/downlo
file://mount.busybox \
file://syslog \
file://syslog.conf \
- file://udhcpscript.patch;patch=1 \
- file://adduser-longops.patch;patch=1 \
file://umount.busybox \
- file://run_parts.c \
file://defconfig"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
do_configure () {
- cp ${WORKDIR}/run_parts.c ${S}/debianutils/
install -m 0644 ${WORKDIR}/defconfig ${S}/.config
cml1_do_configure
}
============================================================
--- packages/dbus/dbus.inc d2ebf6fc194524deeab9e6da2a97e839999171a9
+++ packages/dbus/dbus.inc afa9d185f101fddb15e7fc80aa75db16945c0520
@@ -25,7 +25,18 @@ PACKAGES += "${PN}-lib"
PACKAGES += "${PN}-lib"
-FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services"
+FILES_${PN} = "\
+${bindir}/dbus-daemon* \
+${bindir}/dbus-uuidgen \
+${bindir}/dbus-launch \
+${bindir}/dbus-cleanup-sockets \
+${bindir}/dbus-send \
+${bindir}/dbus-monitor \
+${libexecdir}/dbus* \
+${sysconfdir} \
+${datadir}/dbus-1/services \
+${datadir}/dbus-1/system-services \
+"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
============================================================
--- packages/dbus/dbus_1.1.4.bb a941688e3a8621769a37bb46e79d4f2d5764966a
+++ packages/dbus/dbus_1.1.4.bb 13d62bf774c4fbb379fe51e709aa9044ae5084e9
@@ -1,3 +1,3 @@ include dbus.inc
include dbus.inc
+PR = "r1"
-PR = "r0"
============================================================
--- packages/libsdl/libsdl-directfb_1.2.9.bb 406ccc95e51fa48fbf7a3e05f121fb4c844235ca
+++ packages/libsdl/libsdl-directfb_1.2.9.bb 7cee0ace7a8b1ca3181cb5a3db699dda21ececab
@@ -1,73 +1,21 @@
-DESCRIPTION = "Simple DirectMedia Layer - DirectFB Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib directfb"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
+require libsdl.inc
-PR = "r3"
+DEPENDS = "alsa-lib directfb"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://agawa-piro-mickey-1.2.9.patch;patch=1 \
- file://pygame-1.2.9.patch;patch=1 \
- file://mouse-1.2.9.patch;patch=1 \
- file://kill-stdc++-1.2.9.patch;patch=1 \
- file://ipaq-1.2.9.patch;patch=1 \
- file://SDL-Akita-1.2.9.patch;patch=1 \
- file://fixlibs-1.2.9.patch;patch=1 \
- file://no-PAGE_SIZE.patch;patch=1 \
- file://explicit-extern-C.patch;patch=1 \
- file://acinclude.m4 \
- file://directfb_obsolete_calls.patch;patch=1"
-S = "${WORKDIR}/SDL-${PV}"
+SRC_URI += "\
+ file://explicit-extern-C.patch;patch=1 \
+ file://acinclude.m4 \
+ file://directfb_obsolete_calls.patch;patch=1 \
+"
-inherit autotools binconfig
-
CFLAGS_append += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
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 --disable-video-x11 --disable-video-dga \
- --disable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
+ --enable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
--disable-video-opengl --enable-input-events --enable-pthreads \
--disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
-do_configure_prepend() {
- rm -f ${S}/acinclude.m4
- cp ${WORKDIR}/acinclude.m4 ${S}/
- if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
- then
- sed -i s,-lqte,-lqte-mt, src/Makefile
- fi
-}
-do_configure_append () {
- cd ${S}
-
- # prevent libtool from linking libs against libstdc++, libgcc, ...
- cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
- mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
- find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
-
-}
-
-do_stage() {
- oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
- rm ${STAGING_LIBDIR}/libSDL.la
- ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
- #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
- install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/SDL
- for f in include/*.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/SDL/
- done
-
- install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}
============================================================
--- packages/libsdl/libsdl-qpe_1.2.9.bb 1a41fea40fbd70743eb8fd8b3a7946b8d50acc6f
+++ packages/libsdl/libsdl-qpe_1.2.9.bb bc4c99538eb36cd779ec379046f207fb0223ad54
@@ -1,69 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition"
+require libsdl.inc
+
SECTION = "opie/libs"
-PRIORITY = "optional"
DEPENDS = "virtual/libqpe1 libopie2"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-# NOTE: make sure to keep PR in sync with libsdl-x11
-PR = "r1"
+SRC_URI += "\
+ file://agawa-piro-mickey-1.2.9.patch;patch=1 \
+ file://pygame-1.2.9.patch;patch=1 \
+ file://mouse-1.2.9.patch;patch=1 \
+ file://kill-stdc++-1.2.9.patch;patch=1 \
+ file://ipaq-1.2.9.patch;patch=1 \
+ file://SDL-Akita-1.2.9.patch;patch=1 \
+ file://fixlibs-1.2.9.patch;patch=1 \
+ file://explicit-extern-C.patch;patch=1 \
+"
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://agawa-piro-mickey-1.2.9.patch;patch=1 \
- file://pygame-1.2.9.patch;patch=1 \
- file://mouse-1.2.9.patch;patch=1 \
- file://kill-stdc++-1.2.9.patch;patch=1 \
- file://ipaq-1.2.9.patch;patch=1 \
- file://SDL-Akita-1.2.9.patch;patch=1 \
- file://fixlibs-1.2.9.patch;patch=1 \
- file://no-PAGE_SIZE.patch;patch=1 \
- file://explicit-extern-C.patch;patch=1 \
- file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
-
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
- --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+ --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
--disable-video-opengl --enable-input-events --enable-pthreads \
--disable-video-picogui --enable-video-qtopia --enable-dlopen"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
do_compile_prepend() {
- rm -f ${S}/acinclude.m4
- cp ${WORKDIR}/acinclude.m4 ${S}/
if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
then
sed -i s,-lqte,-lqte-mt, src/Makefile
fi
}
-
-do_configure_append () {
- cd ${S}
-
- # prevent libtool from linking libs against libstdc++, libgcc, ...
- cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
- mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
- oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
- rm ${STAGING_LIBDIR}/libSDL.la
- ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
- install -m 0655 src/main/libSDLmain.a src/main/.libs/
- oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/SDL
- for f in include/*.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/SDL/
- done
-
- install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}
============================================================
--- packages/libsdl/libsdl-x11_1.2.9.bb 06aede1a5997211b6a86bab9b2462f2f8e4c0343
+++ packages/libsdl/libsdl-x11_1.2.9.bb b8fbd61ef90fce1e7962217839c47f784d8f8cc6
@@ -1,56 +1,11 @@
-DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
+require libsdl.inc
-PR = "r2"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://extra-keys.patch;patch=1 \
- file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
-
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-t%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list