[oe-commits] org.oe.dev merge of '74c061404accba6de9e626ef3f093a8293209def'
Laibsch commit
oe at amethyst.openembedded.net
Mon Sep 1 18:26:43 UTC 2008
merge of '74c061404accba6de9e626ef3f093a8293209def'
and 'af69f1d59affc73e1d3f65055a0ad0ff767a39e1'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 439075141b0d6ffd64c201829b5e172db68ef97e
ViewMTN: http://monotone.openembedded.org/revision/info/439075141b0d6ffd64c201829b5e172db68ef97e
Files:
1
packages/meta/meta-gpephone.bb
packages/nonworking/meta/meta-gpephone.bb
packages/meta/meta-sectest-gpe.bb
packages/nonworking/meta/meta-sectest-gpe.bb
packages/nonworking/meta
contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
packages/mesa/mesa-full-7.0.2
packages/mesa/mesa-full-7.0.2/fix-host-compile.patch
packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch
packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch
packages/mesa/mesa-full_7.0.2.bb
packages/openmoko-projects/tichy_svn.bb
classes/icecc.bbclass
packages/gsoap/gsoap_2.7.7.bb
packages/iptables/iptables.inc
packages/iptables/iptables_1.3.8.bb
packages/libsdl/libsdl-image_1.2.3.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/libsdl/libsdl-x11_1.2.9.bb
packages/libsdl/libsdl.inc
packages/perl/perl_5.8.8.bb
packages/slugos-init/files/boot/disk
packages/slugos-init/files/boot/kexec
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_5.0.bb
packages/spandsp/spandsp.inc
packages/spandsp/spandsp_0.0.3.bb
packages/spandsp/spandsp_0.0.4-pre16.bb
Diffs:
#
# mt diff -r74c061404accba6de9e626ef3f093a8293209def -r439075141b0d6ffd64c201829b5e172db68ef97e
#
#
#
# rename "packages/meta/meta-gpephone.bb"
# to "packages/nonworking/meta/meta-gpephone.bb"
#
# rename "packages/meta/meta-sectest-gpe.bb"
# to "packages/nonworking/meta/meta-sectest-gpe.bb"
#
# add_dir "packages/nonworking/meta"
#
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/control"
# from [0c3280f88a76ccf4454f600420c2394625422b57]
# to [859341ac1de9827fad8ed770f372f2f98262359f]
#
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/control 0c3280f88a76ccf4454f600420c2394625422b57
+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/control 859341ac1de9827fad8ed770f372f2f98262359f
@@ -7,7 +7,7 @@ Architecture: all
Package: openembedded-essential
Architecture: all
-Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2
+Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man
Description: Metapackage to install all needed packages to start using OpenEmbedded
OpenEmbedded is a full-featured development environment allowing users to
target a wide variety of devices. Supporting multiple build, release paths and
#
# mt diff -raf69f1d59affc73e1d3f65055a0ad0ff767a39e1 -r439075141b0d6ffd64c201829b5e172db68ef97e
#
#
#
# add_dir "packages/mesa/mesa-full-7.0.2"
#
# add_file "packages/mesa/mesa-full-7.0.2/fix-host-compile.patch"
# content [b099c7506653362001d76f153df4dd8e9a295fc6]
#
# add_file "packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch"
# content [51ef2f9d461e46c65da6b11a25e950c8309f7776]
#
# add_file "packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch"
# content [e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f]
#
# add_file "packages/mesa/mesa-full_7.0.2.bb"
# content [2cfeab574a78ee7a807a06a8c90e17e6212cb8b9]
#
# add_file "packages/openmoko-projects/tichy_svn.bb"
# content [3db3dbc56b7c3213e909b48cf04cf2c90298886b]
#
# patch "classes/icecc.bbclass"
# from [a138cd782d31fb7b6a7dab8c89a1cd1bdbc901ae]
# to [e011b735f0e546f6cc89dea1b727608c6e07e8f3]
#
# patch "packages/gsoap/gsoap_2.7.7.bb"
# from [1a1a5a86dc83aabfdc3267bab7630b645e47c98f]
# to [f53cbef4be09f9507d24b0dcbacc122d258fb032]
#
# patch "packages/iptables/iptables.inc"
# from [9bdc0697629642c839316278317d5d03da11e89d]
# to [13a67f8f73e3668fa5585822fe28f75f63d46b07]
#
# patch "packages/iptables/iptables_1.3.8.bb"
# from [378c457280c7e7598672d9a4d4eb53a84894c568]
# to [efdd026ff187cac184158a2a3fb27a4dc6df6ccc]
#
# patch "packages/libsdl/libsdl-image_1.2.3.bb"
# from [f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0]
# to [bfaec0d9c2d7fe4fc4907d7ae04554e7c9895004]
#
# patch "packages/libsdl/libsdl-x11_1.2.11.bb"
# from [22b2b21fa489b2c8f56b5956e0a7e33eef629415]
# to [014b8c61a107fc5b83400d5f54a552a13f70e9cf]
#
# patch "packages/libsdl/libsdl-x11_1.2.9.bb"
# from [b8fbd61ef90fce1e7962217839c47f784d8f8cc6]
# to [1185a893a6484d1abc0bd4eb3d7faa09aa149600]
#
# patch "packages/libsdl/libsdl.inc"
# from [715891cf3725571a5a2243bac9cb73170dc2ca37]
# to [a713e3f4058fde4835393971ac28fb209880c323]
#
# patch "packages/perl/perl_5.8.8.bb"
# from [3aca32440feddd983fff24ef6e8448cc34d35493]
# to [3e99caafea88daab44023dba20ebdd71e5533067]
#
# patch "packages/slugos-init/files/boot/disk"
# from [0853a98ec96963dcaf9f81f162c4bf2900366c46]
# to [2812a8e183761c88f764ab143d6e65cf1bfc8290]
#
# patch "packages/slugos-init/files/boot/kexec"
# from [c24e253fa7a0417e61f46145915f5a38d088dc42]
# to [6b3c4cc871eb7111261969670e39d147f3f80400]
#
# patch "packages/slugos-init/files/boot/network"
# from [24a86887b19822c0276b0b4206959bddae2cd3c3]
# to [024d9620d5f3fde3cd9a2305b0d0d86bb6409081]
#
# patch "packages/slugos-init/files/functions"
# from [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
# to [3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5]
#
# patch "packages/slugos-init/files/turnup"
# from [8eb7efd8fbaf4a131d1e25e012806db17e21eb37]
# to [d94a8247eae67fe247bce151f90da0b92e8c9617]
#
# patch "packages/slugos-init/slugos-init_5.0.bb"
# from [77db73d4a4c178a7a01dd6a1bfafc30334a7c0dd]
# to [9a455a4cc8bd81f72ac4bedd0d75467081204750]
#
# patch "packages/spandsp/spandsp.inc"
# from [7a5c5ca2cf5ff4a844e530c565b7d883200eba67]
# to [caa7fd87f5ce220574eb1923670c97e781110c0b]
#
# patch "packages/spandsp/spandsp_0.0.3.bb"
# from [3299ad935f81769ffe792924086078142e52f310]
# to [eb2f1db53d144dd7db0d9e848b982e54f92ffc90]
#
# patch "packages/spandsp/spandsp_0.0.4-pre16.bb"
# from [c407c189154e9ff32b8c3ce3c0f698ea193fc8b2]
# to [3bbd7941a12f2e8f2c905fb64528cdbc7c5f0ea1]
#
============================================================
--- packages/mesa/mesa-full-7.0.2/fix-host-compile.patch b099c7506653362001d76f153df4dd8e9a295fc6
+++ packages/mesa/mesa-full-7.0.2/fix-host-compile.patch b099c7506653362001d76f153df4dd8e9a295fc6
@@ -0,0 +1,30 @@
+--- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300
++++ /src/mesa/x86/Makefile 2007-06-07 21:52:31.000000000 +0300
+@@ -5,6 +5,7 @@
+
+
+ INCLUDE_DIRS = \
++ -I/usr/include \
+ -I$(TOP)/include/GL \
+ -I$(TOP)/include \
+ -I.. \
+@@ -13,6 +14,10 @@
+ -I../glapi \
+ -I../tnl
+
++OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
++
++CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
++ $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
+
+ default: gen_matypes matypes.h
+
+@@ -21,7 +26,7 @@
+
+
+ gen_matypes: gen_matypes.c
+- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
++ $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
+
+ # need some special rules here, unfortunately
+ matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
============================================================
--- packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch 51ef2f9d461e46c65da6b11a25e950c8309f7776
+++ packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch 51ef2f9d461e46c65da6b11a25e950c8309f7776
@@ -0,0 +1,65 @@
+Index: Mesa-7.0.2/progs/demos/Makefile
+===================================================================
+--- Mesa-7.0.2.orig/progs/demos/Makefile 2008-08-22 15:52:16.000000000 +0800
++++ Mesa-7.0.2/progs/demos/Makefile 2008-08-22 15:52:33.000000000 +0800
+@@ -13,7 +13,7 @@
+
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++
+
+ PROGS = \
+ arbfplight \
+Index: Mesa-7.0.2/progs/glsl/Makefile
+===================================================================
+--- Mesa-7.0.2.orig/progs/glsl/Makefile 2008-08-22 15:56:37.000000000 +0800
++++ Mesa-7.0.2/progs/glsl/Makefile 2008-08-22 15:56:52.000000000 +0800
+@@ -7,7 +7,7 @@
+
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++
+
+ PROGS = \
+ brick \
+Index: Mesa-7.0.2/progs/redbook/Makefile
+===================================================================
+--- Mesa-7.0.2.orig/progs/redbook/Makefile 2008-08-22 15:55:10.000000000 +0800
++++ Mesa-7.0.2/progs/redbook/Makefile 2008-08-22 15:55:27.000000000 +0800
+@@ -7,7 +7,7 @@
+
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++
+
+ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \
+ bezcurve bezmesh checker clip colormat cube depthcue dof \
+Index: Mesa-7.0.2/progs/samples/Makefile
+===================================================================
+--- Mesa-7.0.2.orig/progs/samples/Makefile 2008-08-22 15:56:01.000000000 +0800
++++ Mesa-7.0.2/progs/samples/Makefile 2008-08-22 15:56:13.000000000 +0800
+@@ -7,7 +7,7 @@
+
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++
+
+ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
+ font line logo nurb olympic overlay point prim quad select \
+Index: Mesa-7.0.2/progs/xdemos/Makefile
+===================================================================
+--- Mesa-7.0.2.orig/progs/xdemos/Makefile 2008-08-22 15:57:11.000000000 +0800
++++ Mesa-7.0.2/progs/xdemos/Makefile 2008-08-22 15:57:22.000000000 +0800
+@@ -8,7 +8,7 @@
+
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++
+
+ PROGS = glthreads \
+ glxdemo \
============================================================
--- packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f
+++ packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f
@@ -0,0 +1,23 @@
+--- /tmp/mklib 2007-12-08 11:03:23.000000000 +0100
++++ Mesa-7.0.2/bin/mklib 2007-12-08 11:04:02.509863000 +0100
+@@ -106,6 +106,9 @@
+ -L*)
+ DEPS="$DEPS $1"
+ ;;
++ -Wl*)
++ DEPS="$DEPS $1"
++ ;;
+ -pthread)
+ # this is a special case (see bugzilla 10876)
+ DEPS="$DEPS $1"
+--- /tmp/default 2007-12-08 11:04:17.000000000 +0100
++++ Mesa-7.0.2/configs/default 2007-12-08 11:05:06.279863000 +0100
+@@ -76,7 +76,7 @@
+ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+
+ # Program dependencies - specific GL/glut libraries added in Makefiles
+-APP_LIB_DEPS = -lm
++APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
+
+
+
============================================================
--- packages/mesa/mesa-full_7.0.2.bb 2cfeab574a78ee7a807a06a8c90e17e6212cb8b9
+++ packages/mesa/mesa-full_7.0.2.bb 2cfeab574a78ee7a807a06a8c90e17e6212cb8b9
@@ -0,0 +1,20 @@
+include mesa-mesa.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+ ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2 \
+ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 \
+ file://mklib-rpath-link.patch;patch=1 \
+ file://fix-host-compile.patch;patch=1 \
+ file://fix-progs-makefile.patch;patch=1 \
+ "
+
+do_install_append = "install -d ${D}${bindir}; \
+ for f in glxgears glxheads glxdemo glxinfo; do \
+ cp progs/xdemos/${f} ${D}${bindir}; \
+ done"
+
+PACKAGES =+ "libglut libglut-dev mesa-utils"
+
+FILES_libglut = "${libdir}/libglut.so.*"
+FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*"
+FILES_mesa-utils = "${bindir}/*"
============================================================
--- packages/openmoko-projects/tichy_svn.bb 3db3dbc56b7c3213e909b48cf04cf2c90298886b
+++ packages/openmoko-projects/tichy_svn.bb 3db3dbc56b7c3213e909b48cf04cf2c90298886b
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python applets manager"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS = "python-pygame"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http"
+S = "${WORKDIR}/tichy"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}"
============================================================
--- classes/icecc.bbclass a138cd782d31fb7b6a7dab8c89a1cd1bdbc901ae
+++ classes/icecc.bbclass e011b735f0e546f6cc89dea1b727608c6e07e8f3
@@ -154,7 +154,7 @@ def create_cross_kernel_env(bb,d):
try:
os.stat(os.path.join(ice_dir, 'bin', kernel_cc))
except: # no cross compiler built yet
- bb.error('no cross compiler built yet')
+ bb.error('no kernel cross compiler built yet')
return ""
VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) )
@@ -251,23 +251,16 @@ def icc_path(bb,d):
#"system" package blacklist contains a list of packages that can not distribute compile tasks
#for one reason or the other
- system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ]
+ system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ]
+ user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split()
+ package_blacklist = system_package_blacklist + user_package_blacklist
- for black in system_package_blacklist:
+ for black in package_blacklist:
if black in package_tmp:
bb.note(package_tmp, ' found in blacklist, disable icecc')
bb.data.setVar("PARALLEL_MAKE" , "", d)
return ""
- #user defined exclusion list
- user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or ""
- user_package_blacklist = user_package_blacklist.split()
-
- for black in user_package_blacklist:
- if black in package_tmp:
- bb.data.setVar("PARALLEL_MAKE" , "", d)
- return ""
-
prefix = bb.data.expand('${HOST_PREFIX}', d)
if bb.data.inherits_class("cross", d):
============================================================
--- packages/gsoap/gsoap_2.7.7.bb 1a1a5a86dc83aabfdc3267bab7630b645e47c98f
+++ packages/gsoap/gsoap_2.7.7.bb f53cbef4be09f9507d24b0dcbacc122d258fb032
@@ -3,7 +3,7 @@ DEPENDS = "gsoap-native"
SECTION = "devel"
LICENSE = "GPL"
DEPENDS = "gsoap-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz"
S = "${WORKDIR}/gsoap-2.7"
@@ -22,4 +22,5 @@ do_install_append() {
done
}
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}"
============================================================
--- packages/iptables/iptables.inc 9bdc0697629642c839316278317d5d03da11e89d
+++ packages/iptables/iptables.inc 13a67f8f73e3668fa5585822fe28f75f63d46b07
@@ -29,4 +29,5 @@ RRECOMMENDS = "\
kernel-module-ip-tables \
kernel-module-iptable-nat \
kernel-module-iptable-filter \
+ kernel-module-ipt-masquerade \
"
============================================================
--- packages/iptables/iptables_1.3.8.bb 378c457280c7e7598672d9a4d4eb53a84894c568
+++ packages/iptables/iptables_1.3.8.bb efdd026ff187cac184158a2a3fb27a4dc6df6ccc
@@ -1,5 +1,5 @@ require iptables.inc
require iptables.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "\
file://getsockopt-failed.patch;patch=1 \
============================================================
--- packages/libsdl/libsdl-image_1.2.3.bb f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0
+++ packages/libsdl/libsdl-image_1.2.3.bb bfaec0d9c2d7fe4fc4907d7ae04554e7c9895004
@@ -3,12 +3,12 @@ LICENSE = "LGPL"
PRIORITY = "optional"
DEPENDS = "zlib libpng jpeg virtual/libsdl"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
- file://autotools.patch;patch=1 \
- "
-
+SRC_URI = "\
+ http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
+ file://autotools.patch;patch=1 \
+"
S = "${WORKDIR}/SDL_image-${PV}"
export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
============================================================
--- packages/libsdl/libsdl-x11_1.2.11.bb 22b2b21fa489b2c8f56b5956e0a7e33eef629415
+++ packages/libsdl/libsdl-x11_1.2.11.bb 014b8c61a107fc5b83400d5f54a552a13f70e9cf
@@ -3,14 +3,16 @@ DEFAULT_PREFERENCE = "-1"
# extra-keys.patch is missing
DEFAULT_PREFERENCE = "-1"
-PR = "r1"
+PR = "r6"
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://acinclude.m4 \
- file://configure_tweak.patch;patch=1 \
- file://pagesize.patch;patch=1 \
- file://kernel-asm-page.patch;patch=1 \
- file://sdl-cdfix.patch;patch=1 "
+SRC_URI = "\
+ http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+ file://acinclude.m4 \
+ file://configure_tweak.patch;patch=1 \
+ file://pagesize.patch;patch=1 \
+ file://kernel-asm-page.patch;patch=1 \
+ file://sdl-cdfix.patch;patch=1 \
+"
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
============================================================
--- packages/libsdl/libsdl-x11_1.2.9.bb b8fbd61ef90fce1e7962217839c47f784d8f8cc6
+++ packages/libsdl/libsdl-x11_1.2.9.bb 1185a893a6484d1abc0bd4eb3d7faa09aa149600
@@ -1,4 +1,5 @@ require libsdl.inc
require libsdl.inc
+PR = "r6"
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
============================================================
--- packages/libsdl/libsdl.inc 715891cf3725571a5a2243bac9cb73170dc2ca37
+++ packages/libsdl/libsdl.inc a713e3f4058fde4835393971ac28fb209880c323
@@ -5,7 +5,6 @@ LICENSE = "LGPL"
DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
-PR = "r5"
SRC_URI = "\
http://www.libsd%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list