Committer: Martin Vajnar <martin.vajnar@gmail.com>

Podpora TS a OpenGL akcelerace v Qt4 pro Gumstix. Dalsi info v /soft/build/gumstix/INSTALL.

diff --git a/build/gumstix/INSTALL b/build/gumstix/INSTALL
new file mode 100644 (file)
index 0000000..a4e1a65
--- /dev/null
+++ b/build/gumstix/INSTALL
@@ -0,0 +1,11 @@
+Postup pro uspesnou kompilaci (zatim s puvodnim toolchainem od P. Pisy): 
+
+#      1. Nejprve je nutne pridat do PATHu cestu k toolchainu - pro jeho velikost zatim nedavam do gitu, ma totiz 50MB
+2. Je nutne stahnout archiv s Qt: ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz a rozbalit do slozky soft/src/3rdparty/qt a to tak, aby qt byla korenova slozka
+3. Potrebujeme nahradit soubor soft/src/3rdparty/qt/mkspecs/common/linux.conf nasim vlastnim z teto slozky - obsahuje spravnou konfiguraci pro OpenGL
+4. Prekopirovat linux-arm-gumstix-g++ do soft/src/3rdparty/qt/mkspecs/qws/
+#      5. nastavit platformu hosta v qt/Makefile.omk, pro 64bitu -platform qws/linux-x86_64-g++, pro 32bitu -platform qws/linux-x86-g++
+
+TODO
+1. Aplikace patchu pro opravu prace s pismy a s kurzorem - v Qt v rootfs v Gumstixu je opraveno
+2. Zahrnout cely postup do makefilu ?
\ No newline at end of file

diff --git a/build/gumstix/linux.conf b/build/gumstix/linux.conf
new file mode 100644 (file)
index 0000000..307975d
--- /dev/null
+++ b/build/gumstix/linux.conf
@@ -0,0 +1,66 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD    += -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      = /usr/X11R6/include
+QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL      = 
+QMAKE_LIBDIR_EGL      =
+QMAKE_INCDIR_OPENVG   = 
+QMAKE_LIBDIR_OPENVG   =
+
+QMAKE_LIBS            = -Wl,-rpath-link,SEDME/lib -lglib-2.0
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = -lXext -lX11 -lm
+QMAKE_LIBS_X11SM      = -lSM -lICE
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_EGL        = -lEGL -lIMGegl -lsrv_um
+QMAKE_LIBS_OPENGL     = -lEGL -lGLES_CM -lIMGegl -lsrv_um 
+QMAKE_LIBS_OPENGL_QT  = -lEGL -lGLES_CM -lIMGegl -lsrv_um
+QMAKE_LIBS_OPENGL_ES1 = -lEGL -lGLES_CM -lIMGegl -lsrv_um
+QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL
+QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um 
+QMAKE_LIBS_OPENVG     = -lOpenVG
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
+
+QMAKE_AR              = ar cqs
+QMAKE_OBJCOPY         = objcopy
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = strip
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+DEFINES += QT_QWS_CLIENTBLIT
+
+include(unix.conf)

diff --git a/build/gumstix/qt/Makefile.omk b/build/gumstix/qt/Makefile.omk
index 6bb4938c8ef047c6c8a51f3f2b8588b771ed8a6e..a8602e503cd982d893c5e84d50db5cf4bbed30e0 100644 (file)
--- a/build/gumstix/qt/Makefile.omk
+++ b/build/gumstix/qt/Makefile.omk
@@ -3,16 +3,15 @@
 library-pass_HOOKS = install-qt
 
 config.status: $(SOURCES_DIR)/qt-src/configure
-       cp -a $(SOURCES_DIR)/linux-arm-gumstix-g++ $(SOURCES_DIR)/qt-src/mkspecs/qws
-       $< -embedded arm --prefix=$(OUTPUT_DIR)/_compiled/qt -xplatform qws/linux-arm-gumstix-g++ -opensource -confirm-license -little-endian -qt-gfx-linuxfb
+       $< -embedded arm --prefix=$(OUTPUT_DIR)/_compiled/qt -xplatform qws/linux-arm-gumstix-g++ -opensource -confirm-license -little-endian -qt-gfx-linuxfb -qt3support -opengl es2 -depths 16,24,32  -plugin-gfx-powervr -qtlibinfix E -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-linuxinput -qt-kbd-tty -qt-kbd-linuxinput -DQT_KEYPAD_NAVIGATION
 
-lib/libQtCore.so: config.status
+lib/libQtCoreE.so: config.status
        $(MAKE)
 
-$(OUTPUT_DIR)/_compiled/qt/libQtCore.so: lib/libQtCore.so
+$(OUTPUT_DIR)/_compiled/qt/libQtCoreE.so: lib/libQtCoreE.so
        echo $@: $^
        $(MAKE) install
        touch $@
 
 .PHONY: install-qt
-install-qt: $(OUTPUT_DIR)/_compiled/qt/libQtCore.so
+install-qt: $(OUTPUT_DIR)/_compiled/qt/libQtCoreE.so