qte 2.3.10: Fix lack of PAGE_* in latest linux-headers properly: use getpagesize()

* Closes #2201.

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 cbbd114..bad2d95 100644 (file)
--- 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 28233c0..7e9cc8e 100644 (file)
--- 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 113d471..cb9e5aa 100644 (file)
--- 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 4c6170e..d9ebc7c 100644 (file)
--- 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 dbbdd4c..3a21a12 100644 (file)
--- 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"