aboutsummaryrefslogtreecommitdiffstats
path: root/packages/libsdl
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-05-14 06:28:14 +0000
committerRod Whitby <rod@whitby.id.au>2005-05-14 06:28:14 +0000
commit0d3338bed5a3159dbf55d890adcd633e68d0cfc4 (patch)
tree488eccf7066c5e1cc50c8e393a8278c5eb3b4ba8 /packages/libsdl
parentdb46ea3e8a55359a0f95ed1c02e5b02e1a831cfd (diff)
downloadopenembedded-0d3338bed5a3159dbf55d890adcd633e68d0cfc4.tar.gz
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitkeeper/openembedded 2005/05/13 23:24:15-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/13 23:11:16+02:00 handhelds.org!zecke libsdl-qpe: Patch by Gints Polis to fix the rotation for h38xx iPAQ models. 2005/05/13 22:38:41+02:00 handhelds.org!zecke Qt 2.3.10: Patch Qt to support Right To Left scripting of text. Patch is courtsey ALynch, the Makefile.in changes are done by myself 2005/05/13 12:27:57+02:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded 2005/05/13 12:27:36+02:00 hrw.one.pl!hrw added opie-icon-reload to opie-image - it is small and usefull 2005/05/13 12:13:04+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/13 12:12:52+02:00 uni-frankfurt.de!mickeyl apply the libqpe fix-titleheight patch for the cvs version as well, since I feel uncomfortable pushing it upstream 2005/05/13 11:36:47+02:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded 2005/05/13 11:33:38+02:00 hrw.one.pl!hrw opie-calculator: add files from etc/ to get unit conversations work - patch by Gints Polis 2005/05/13 10:25:00+01:00 rpsys.net!RP bump 2005/05/13 10:22:43+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/13 10:12:15+01:00 rpsys.net!RP linux-oz-2.6: Fix suspend/resume issue + add mmc timeout fix 2005/05/13 01:12:31+02:00 uni-frankfurt.de!mickeyl add pcmciautils 003 2005/05/13 00:45:29+02:00 uni-frankfurt.de!mickeyl add infrared and ppp modules to c7x0 bootstrap image (kernel 2.6) 2005/05/13 00:23:22+02:00 uni-frankfurt.de!mickeyl remove meta-grant and gpe-image-grant: please don't commit private .bb files 2005/05/13 00:11:21+02:00 uni-frankfurt.de!mickeyl spectrum_cs: catch up with linux 2.6.12 2005/05/12 23:54:13+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/12 23:45:30+02:00 uni-frankfurt.de!mickeyl remove opie-mobilemsg, it has been removed upstream also 2005/05/12 23:09:32+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/05/12 23:08:58+02:00 utwente.nl!koen Add kanatest_0.3.6.bb, kanatest.inc, kanatest.desktop, courtesy Robert Marcano 2005/05/12 20:32:38+01:00 nexus.co.uk!pb new xinerama snapshot 2005/05/12 20:30:35+01:00 nexus.co.uk!pb use linux-core directory instead of linux 2005/05/12 20:29:34+01:00 nexus.co.uk!pb update xserver-xorg to 6.8.99.5 2005/05/12 20:27:09+01:00 nexus.co.uk!pb update mythtv to 0.17 2005/05/12 20:26:18+01:00 nexus.co.uk!pb correct "--enablee" typo in mythtv_0.16 2005/05/12 20:20:30+01:00 nexus.co.uk!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.nexus.co.uk:/nexus/home/pb/oe/oe 2005/05/09 09:10:48+01:00 nexus.co.uk!pb add CELF busybox patch for more ash builtins BKrev: 42859a7e_yqKTfUGEQQRWFA_fBpqQQ
Diffstat (limited to 'packages/libsdl')
-rw-r--r--packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch27
1 files changed, 15 insertions, 12 deletions
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
index 912301b352..1c4245db76 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
@@ -1,16 +1,15 @@
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/Makefile.am SDL-1.2.7/src/video/qtopia/Makefile.am
---- SDL-1.2.7_old/src/video/qtopia/Makefile.am 2005-03-08 15:13:16.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-08 15:16:17.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-13 22:36:41.000000000 -0200
@@ -22,4 +22,4 @@
# overwrite USER variables
CXXLD = $(CC)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@
- $(TAGS_FILES) $(LISP)
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
---- SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc 2005-03-08 15:13:16.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-03-08 15:16:17.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-13 22:36:41.000000000 -0200
@@ -29,8 +29,11 @@
#include "SDL_QWin.h"
#include <qapplication.h>
@@ -73,9 +72,9 @@ diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtopia
default:
scancode = SDLK_UNKNOWN;
break;
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
---- SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc 2005-03-08 15:13:15.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-03-08 15:43:30.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-13 22:42:03.000000000 -0200
@@ -45,6 +45,7 @@
#include <qapplication.h>
#include <qpe/qpeapplication.h>
@@ -123,13 +122,17 @@ diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.7/src/video/qt
}
fclose(fp);
} else {
-@@ -679,6 +691,11 @@
+@@ -679,6 +691,15 @@
if (machine == MACHINE_SHARP_SL5500)
qteRotation = 3;
+ // HP IPaq
-+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ )
++ if ( ODevice::inst( )-> series ( ) == Model_iPAQ ) {
+ qteRotation = 3;
++ }
++ if ( ODevice::inst ( )-> model ( ) == Model_iPAQ_H38xx ) {
++ qteRotation = 1;
++ }
+
+
// SL-B500 用ハック(とりあえず、ね)