diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 22:17:36 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 22:17:36 +0000 |
commit | cf18445e2ad496b9b72149fd90dfef1168731d6c (patch) | |
tree | 59c127fa86569411be07a95a0030974baa124c61 /packages | |
parent | b4b75f55ab85e3ba6b6a726acfaeb86d7db0d55c (diff) | |
parent | e4c662217cc8e8a0c9e13c1310dafd6d3d250753 (diff) |
merge of '395d6de41c854bc96db2108e2c2b5a7736072d2d'
and 'e0818c624e0ff59f9dba6d80979f53a71cac71a4'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/libsdl/files/kernel-asm-page.patch | 13 | ||||
-rw-r--r-- | packages/libsdl/libsdl-native_1.2.11.bb | 5 | ||||
-rw-r--r-- | packages/linphone/linphone_1.6.0.bb | 14 | ||||
-rw-r--r-- | packages/webkit/webkit/WebKit.pri | 6 |
4 files changed, 28 insertions, 10 deletions
diff --git a/packages/libsdl/files/kernel-asm-page.patch b/packages/libsdl/files/kernel-asm-page.patch new file mode 100644 index 0000000000..42bceadfdc --- /dev/null +++ b/packages/libsdl/files/kernel-asm-page.patch @@ -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 */ diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb index 3c3f17d1d2..d75eec53e8 100644 --- a/packages/libsdl/libsdl-native_1.2.11.bb +++ b/packages/libsdl/libsdl-native_1.2.11.bb @@ -2,10 +2,11 @@ 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 diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 563f21440e..7a90cdd5c9 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -16,9 +16,9 @@ RDEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2" 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 @@ PACKAGES += "linphonec linphone-rings liblinphone libquickstream libmediastreame 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}" diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 00a72dc3d5..11cc0ac9fd 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -1,7 +1,10 @@ # Include file to make it easy to include WebKit into Qt projects -isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} !gdk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 @@ -32,6 +35,7 @@ INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/bindings \ $$BASE_DIR/JavaScriptCore/bindings/c \ $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ $$BASE_DIR/WebCore \ $$BASE_DIR/WebCore/ForwardingHeaders \ $$BASE_DIR/WebCore/platform \ |