[oe-commits] org.oe.dev merge of '2c989e7a8173d51a40c417152f5997ab57099663'
polyonymous commit
openembedded-commits at lists.openembedded.org
Tue Jul 17 13:02:57 UTC 2007
merge of '2c989e7a8173d51a40c417152f5997ab57099663'
and 'e09ef5f5a677602e791414d3d06ac799a01ee404'
Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: d6a622b7acf7195708592b09daf70c6e3b9cfcd5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6a622b7acf7195708592b09daf70c6e3b9cfcd5
Files:
1
packages/libsdl/files/kernel-asm-page.patch
packages/libsdl/libsdl-native_1.2.11.bb
packages/libopieobex/files/obex-fixes.patch
packages/opie-taskbar/opie-taskbar/01-1px-gap.patch
conf/checksums.ini
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/libopieobex/libopieobex0_cvs.bb
packages/linphone/linphone_1.6.0.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:
#
# mt diff -r2c989e7a8173d51a40c417152f5997ab57099663 -rd6a622b7acf7195708592b09daf70c6e3b9cfcd5
#
#
#
# add_file "packages/libsdl/files/kernel-asm-page.patch"
# content [c330d9173694f5d2da97b4be571622fb8ad8d195]
#
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
# from [e9e581735b9f05b42424cddeb52b17e590296483]
# to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
#
============================================================
--- packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -0,0 +1,13 @@
+diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
+index 4e3d662..de38a3c 100644
+--- a/src/video/Xext/Xxf86dga/XF86DGA.c
++++ b/src/video/Xext/Xxf86dga/XF86DGA.c
+@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #define HAS_MMAP_ANON
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <unistd.h>
+ #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
+ #define HAS_GETPAGESIZE
+ #endif /* linux */
============================================================
--- packages/libsdl/libsdl-native_1.2.11.bb e9e581735b9f05b42424cddeb52b17e590296483
+++ packages/libsdl/libsdl-native_1.2.11.bb 5e5d90533f76a9b2ce70d129759c139f4c7df596
@@ -1,11 +1,12 @@ LICENSE = "LGPL"
DESCRIPTION = "Simple DirectMedia Layer - native Edition"
HOMEPAGE = "http://www.libsdl.org"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://acinclude.m4"
+ file://acinclude.m4 \
+ file://kernel-asm-page.patch;patch=1 "
S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig pkgconfig native
#
# mt diff -re09ef5f5a677602e791414d3d06ac799a01ee404 -rd6a622b7acf7195708592b09daf70c6e3b9cfcd5
#
#
#
# delete "packages/libopieobex/files/obex-fixes.patch"
#
# delete "packages/opie-taskbar/opie-taskbar/01-1px-gap.patch"
#
# patch "conf/checksums.ini"
# from [1d8a92c505fdd30e0febc91c33edbfa9555113ee]
# to [3a96d02586ad710446de71948a7d4b77f4a09c62]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [07a52b1c21aa01167bd3a2e275bec12dab2a4797]
# to [274dcb7d5c72996b49644fa765c72f56ce8f956e]
#
# patch "packages/libopieobex/libopieobex0_cvs.bb"
# from [ddfb3da6248450a036239ce20bf7dcb24af49aea]
# to [0e5adb40de222cf5c66a7884fa46c00160d179a7]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
# to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [0ac380655ef5579c913ee85fcea4b8d882cdc448]
# to [61a236fc7e91c5eab32ed70a7bd08065ed5186a2]
#
============================================================
--- conf/checksums.ini 1d8a92c505fdd30e0febc91c33edbfa9555113ee
+++ conf/checksums.ini 3a96d02586ad710446de71948a7d4b77f4a09c62
@@ -3986,14 +3986,6 @@ sha256=bfa7def7d0f1190a111bde232920d2b34
md5=bed4259905a7d7bc070c6319142b2075
sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a
-[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.4.tar.gz]
-md5=912050a9cb6b0f415b76ba56052fb4cf
-sha256=89dcc463f88e0b785ee2cf2662d97c6b7d045393283664876370970a09b8cbef
-
-[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.7.tar.gz]
-md5=dacefa1fe3c5b6d7bbc334ad94826131
-sha256=916d7e1393ed09ca4c61b3c1ecb5f5564266c955db81ff587d2da8af7a7abaab
-
[http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-2.6.1.tar.bz2]
md5=194fab4e2e87c7ae3c7fea926fd281bc
sha256=31d894960e0d2eba8fa2746e4fde31983a1e49dc856a880adb59d5f251a690cf
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 07a52b1c21aa01167bd3a2e275bec12dab2a4797
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 274dcb7d5c72996b49644fa765c72f56ce8f956e
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
#
# Default versions
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070703"
+OPIE_SRCDATE ?= "20070717"
OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb ddfb3da6248450a036239ce20bf7dcb24af49aea
+++ packages/libopieobex/libopieobex0_cvs.bb 0e5adb40de222cf5c66a7884fa46c00160d179a7
@@ -1,7 +1,6 @@ PV = "${OPIE_CVS_PV}"
require libopieobex0.inc
PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+ ${HANDHELDS_CVS};module=opie/pics"
- ${HANDHELDS_CVS};module=opie/pics \
- file://obex-fixes.patch;patch=1"
============================================================
--- packages/linphone/linphone_1.6.0.bb 77c69b1286f82211e37b6d6cde29f8fc492c17c7
+++ packages/linphone/linphone_1.6.0.bb 12fa57bdfc35f887f98bd8c835b566f34d02f011
@@ -16,9 +16,9 @@ RDEPENDS_libmediastreamer = "speex libog
RDEPENDS_libquickstream = "speex libmediastreamer libasound"
RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
-PROVIDES = "linphone linphonec liblinphone"
+PROVIDES += "linphone linphonec liblinphone"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
@@ -61,9 +61,9 @@ FILES_${PN}-rings = "${datadir}/sounds/l
FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
-FILES_liblinphone = "${libdir}/liblinphone.so*"
-FILES_libquickstream = "${libdir}/libquickstream.so*"
-FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
-FILES_libortp = "${libdir}/libortp.so*"
-FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb 0ac380655ef5579c913ee85fcea4b8d882cdc448
+++ packages/opie-taskbar/opie-taskbar_cvs.bb 61a236fc7e91c5eab32ed70a7bd08065ed5186a2
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r14"
+PR = "r15"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -13,6 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
file://no-builtin-qss-startup.patch;patch=1 \
file://kbdlocks-runtime.patch;patch=1 \
file://restart-from-bindir.patch;patch=1 \
- file://01-1px-gap.patch;patch=1 \
file://server.pro \
"
More information about the Openembedded-commits
mailing list