diff options
| author | Michael Krelin <hacker@klever.net> | 2007-05-03 21:51:55 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 21:51:55 +0000 |
| commit | 5c59726be653249443ecfdb084bff22c948f2eec (patch) | |
| tree | db822d22595dfdb0bf518a604836a9918f425bf9 | |
| parent | 1280d3735aefbfebd0fce63565f1c166e712b481 (diff) | |
qte 2.3.10: Fix lack of PAGE_* in latest linux-headers properly: use getpagesize()
* Closes #2201.
| -rw-r--r-- | packages/qte/qte-2.3.10/kernel-asm-page.patch | 20 | ||||
| -rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 3 | ||||
| -rw-r--r-- | packages/qte/qte-mt-static_2.3.10.bb | 2 | ||||
| -rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 2 | ||||
| -rw-r--r-- | packages/qte/qte_2.3.10.bb | 2 |
5 files changed, 17 insertions, 12 deletions
diff --git a/packages/qte/qte-2.3.10/kernel-asm-page.patch b/packages/qte/qte-2.3.10/kernel-asm-page.patch index cbbd114144..bad2d95967 100644 --- a/packages/qte/qte-2.3.10/kernel-asm-page.patch +++ b/packages/qte/qte-2.3.10/kernel-asm-page.patch @@ -1,14 +1,20 @@ diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp -index c2e7d9b..b2d42b5 100644 +index c2e7d9b..8d39585 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp -@@ -122,7 +122,9 @@ void cleanup_pixmap_cache(); - +@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); #ifdef THROW_AWAY_UNUSED_PAGES # include <sys/mman.h> // madvise -+# define __KERNEL__ # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN -+# undef __KERNEL__ ++# include <unistd.h> // getpagesize() ++# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) ++# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) ++# endif # ifndef PAGE_ALIGN - # define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) - # endif // PAGE_ALIGN +-# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +-# endif // PAGE_ALIGN ++# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) ++# endif + #endif // THROW_AWAY_UNUSED_PAGES + + diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 28233c0680..7e9cc8ea83 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -89,8 +89,7 @@ EXTRA_OECONF_CONFIG = "-qconfig qpe" EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32 \ - -I${STAGING_KERNEL_DIR}/include" + -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" EXTRA_OEMAKE = "-e" # diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index 113d471df6..cb9e5aaceb 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r6" +PR = "r7" EXTRA_OECONF += "-static -thread" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 4c6170ee59..d9ebc7ccfd 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r12" +PR = "r13" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index dbbdd4c0e6..3a21a12ca1 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r50" +PR = "r51" |