Xserver-gimp: support for 16bpp color depth, unfinished shared memory support

This commit is contained in:
Sergii Pylypenko
2013-11-15 23:37:53 +02:00
parent b685d5c265
commit 2420ce5caa
7 changed files with 27 additions and 8 deletions

View File

@@ -87,7 +87,7 @@ AppNeedsTwoButtonMouse=y
ShowMouseCursor=n
# Users are complaining that the video output is slow, so screw pen precision
GenerateSubframeTouchEvents=y
GenerateSubframeTouchEvents=n
# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
ForceRelativeMouseMode=n
@@ -175,10 +175,10 @@ MultiABI=armeabi-v7a
AppMinimumRAM=0
# Application version code (integer)
AppVersionCode=28205
AppVersionCode=28206
# Application user-visible version name (string)
AppVersionName="2.8.2.05"
AppVersionName="2.8.2.06"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y

View File

@@ -7,10 +7,21 @@ PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'`
../setEnvironment-armeabi-v7a.sh sh -c '\
$CC $CFLAGS -c main.c gfx.c' || exit 1
[ -e xserver/android ] || git submodule update --init xserver || exit 1
[ -e xserver/android ] || {
CURDIR=`pwd`
cd ../../../..
git submodule update --init project/jni/application/xserver/xserver || exit 1
cd $CURDIR
} || exit 1
cd xserver
[ -e configure ] || autoreconf --force -v --install || exit 1
[ -e android/android-shmem/LICENSE ] || git submodule update --init android/android-shmem || exit 1
cd android
[ -e android-shmem/libancillary/ancillary.h ] || {
cd android-shmem
git submodule update --init libancillary || exit 1
cd ..
} || exit 1
[ -e libfontenc-*/Makefile ] && {
grep "/data/data/$PACKAGE_NAME" libfontenc-*/Makefile || \
git clean -f -d -x .

View File

@@ -394,7 +394,7 @@ void showErrorMessage(const char *msg)
void XSDL_initSDL()
{
SDL_Init(SDL_INIT_VIDEO);
SDL_SetVideoMode(VID_X, VID_Y, 24, SDL_SWSURFACE);
SDL_SetVideoMode(VID_X, VID_Y, 0, SDL_SWSURFACE);
TTF_Init();
sFont = TTF_OpenFont("DroidSansMono.ttf", 12);
if (!sFont)

View File

@@ -130,7 +130,7 @@ int main( int argc, char* argv[] )
XSDL_deinitSDL();
sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, 24 );
sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, SDL_GetVideoInfo()->vfmt->BitsPerPixel );
if( argc > 1 )
{