Merge branch 'master' of gitorious.org:f-droid/fdroiddata

This commit is contained in:
Ciaran Gultnieks 2012-12-14 12:56:39 +00:00
commit 0777bbe0dd
21 changed files with 747 additions and 27 deletions

View file

@ -9,7 +9,7 @@ Summary:KeePass-compatible password safe
Description:
A password safe, compatible with KeePass. Keepass is available on all the majour desktop platforms:
on GNU/Linux KeePassX is a well-established client. Portable editions are available if you need to use it
on a Windows machine.
on a Windows machine. Supports MIPS and x86 natively.
There are two editions of KeePass, explained at http://keepass.info. There is only read-only support for
.kdbx (Keepass 2) databases as of v1.9 of KeePassDroid. Similarly KeePassX only supports Keepass 1 databases.

View file

@ -0,0 +1,21 @@
Category:Games
License:GPLv3
Web Site:https://code.google.com/p/glesquake/
Source Code:https://code.google.com/p/glesquake/source/checkout
Issue Tracker:https://code.google.com/p/glesquake/issues/list
Summary:Quake 1 for Android
Description:
Port of Quake 1 to Android. Requires hardware keys, no sound. You have to put
your own copy of the pak0.pak and maps Quake game data files under /sdcard/data/quake/id1/.
The best way to obtain those files currently is by using [http://nquake.sourceforge.net/ nQuake].
.
Repo Type:git
Repo:http://code.google.com/p/glesquake/
Build Version:1.0,1,823b728ed3a9,forceversion=yes,forcevercode=yes,buildjni=yes,rm=release/QuakeActivity.apk,target=android-10,novcheck=yes
Auto Update Mode:None
Update Check Mode:RepoManifest

View file

@ -0,0 +1,21 @@
Category:Games
License:GPLv3+
Web Site:http://sites.google.com/site/quake2android/
Source Code:http://code.google.com/p/quake2android/source/checkout
Issue Tracker:http://code.google.com/p/quake2android/issues/list
Summary:Quake 2 for Android
Description:
Port of Quake 2 to Android. Has virtual keyboard, on-screen and sensor controls. You can use built-in
downloader to automatically fetch Quake 2 demo files from number of mirrors or manually copy pak0.pak
and other required files from your installation's baseq2 directory to /sdcard/baseq2.
.
Repo Type:git-svn
Repo:http://quake2android.googlecode.com/svn/trunk/
#Generated by import.py - check this is the right version, and find the right commit!
Build Version:1.91,21,13,buildjni=yes,target=android-15,prebuild=rm release/*
Auto Update Mode:None
Update Check Mode:RepoManifest

View file

@ -18,6 +18,7 @@ Description:
* Built-in user dictionary words editor
* Optional 16-key English keyboard
* Cursor movement soft-keys that can also be mapped to hardware keys
* Supports x86 and MIPS natively
There are many language packs and themes available as apks on the website. There are instructions
on the [https://code.google.com/p/softkeyboard/wiki/HowToCreateLanguagePack wiki] for creating a pack from

View file

@ -0,0 +1,24 @@
Category:Games
License:GPLv3+
Web Site:http://nds4droid.com
Source Code:http://sourceforge.net/p/nds4droid/code/
Issue Tracker:http://sourceforge.net/p/nds4droid/tickets/
Summary:Nintendo DS emulator
Description:
nds4droid is a free, open source Nintendo DS emulator for Android based
on DeSmuME. It is currently in it's infancy but does support most of the
features one would expect in an emulator.
Unlike official version this build does not support support RAR archives,
because of legal reasons.
.
Repo Type:git
Repo:git://git.code.sf.net/p/nds4droid/code
Build Version:13,13,!needs ndk-r8c release13,buildjni=yes,target=android-15,extlibs=acra/acra-4.2.3.jar,patch=fix_stuff.patch
Update Check Mode:Tags
Current Version:13
Current Version Code:13

View file

@ -0,0 +1,141 @@
diff --git a/jni/desmume/src/android/7z/7z.mk b/jni/desmume/src/android/7z/7z.mk
index e8570e4..3503005 100755
--- a/jni/desmume/src/android/7z/7z.mk
+++ b/jni/desmume/src/android/7z/7z.mk
@@ -46,12 +46,6 @@ LOCAL_SRC_FILES := C/Threads.c \
CPP/7zip/Archive/7z/7zRegister.cpp \
CPP/7zip/Archive/7z/7zSpecStream.cpp \
CPP/7zip/Archive/7z/7zUpdate.cpp \
- CPP/7zip/Archive/Rar/RarHandler.cpp \
- CPP/7zip/Archive/Rar/RarHeader.cpp \
- CPP/7zip/Archive/Rar/RarIn.cpp \
- CPP/7zip/Archive/Rar/RarItem.cpp \
- CPP/7zip/Archive/Rar/RarRegister.cpp \
- CPP/7zip/Archive/Rar/RarVolumeInStream.cpp \
CPP/7zip/Archive/Zip/ZipAddCommon.cpp \
CPP/7zip/Archive/Zip/ZipHandler.cpp \
CPP/7zip/Archive/Zip/ZipHandlerOut.cpp \
@@ -113,11 +107,6 @@ LOCAL_SRC_FILES := C/Threads.c \
CPP/7zip/Compress/DeflateEncoder.cpp \
CPP/7zip/Compress/DeflateRegister.cpp \
CPP/7zip/Compress/LzmaRegister.cpp \
- CPP/7zip/Compress/RarCodecsRegister.cpp \
- CPP/7zip/Compress/Rar1Decoder.cpp \
- CPP/7zip/Compress/Rar2Decoder.cpp \
- CPP/7zip/Compress/Rar3Decoder.cpp \
- CPP/7zip/Compress/Rar3Vm.cpp \
CPP/7zip/Compress/BZip2Crc.cpp \
CPP/7zip/Compress/BZip2Decoder.cpp \
CPP/7zip/Compress/BZip2Encoder.cpp \
@@ -129,12 +118,10 @@ LOCAL_SRC_FILES := C/Threads.c \
CPP/7zip/Crypto/MyAes.cpp \
CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
CPP/7zip/Crypto/HmacSha1.cpp \
- CPP/7zip/Crypto/RarAes.cpp \
- CPP/7zip/Crypto/Rar20Crypto.cpp \
CPP/7zip/Crypto/WzAes.cpp
LOCAL_ARM_MODE := thumb
LOCAL_ARM_NEON := false
LOCAL_CFLAGS := -fexceptions -DCOMPRESS_MT
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp b/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
index ee3516b..db51480 100755
--- a/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
+++ b/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
@@ -139,8 +139,6 @@ void RegisterZip();
void RegisterDeflate();
void Register7z();
void RegisterLzma();
-void RegisterRarCodecs();
-void RegisterRar();
void RegisterBZip2();
void RegisterBZip2Codec();
@@ -151,8 +149,6 @@ void Do7ZipRegistration()
RegisterDeflate();
Register7z();
RegisterLzma();
- RegisterRar();
- RegisterRarCodecs();
RegisterBZip2();
RegisterBZip2Codec();
-}
\ No newline at end of file
+}
diff --git a/jni/desmume/src/android/main.cpp b/jni/desmume/src/android/main.cpp
index b674213..0204770 100755
--- a/jni/desmume/src/android/main.cpp
+++ b/jni/desmume/src/android/main.cpp
@@ -33,7 +33,7 @@
#include "../debug.h"
#include "../NDSSystem.h"
#include "../path.h"
-#include "../GPU_OSD.h"
+#include "../GPU_osd.h"
#include "../addons.h"
#include "../slot1.h"
#include "../saves.h"
@@ -937,4 +937,4 @@ unsigned int GetPrivateProfileInt(JNIEnv* env, const char* lpAppName, const char
bool GetPrivateProfileBool(JNIEnv* env, const char* lpAppName, const char* lpKeyName, bool bDefault, const char* lpFileName)
{
return GetPrivateProfileInt(env, lpAppName, lpKeyName, bDefault ? 1 : 0, lpFileName);
-}
\ No newline at end of file
+}
diff --git a/jni/desmume/src/android/math-neon/math_acosf.c b/jni/desmume/src/android/math-neon/math_acosf.c
index 024074f..3c048cd 100755
--- a/jni/desmume/src/android/math-neon/math_acosf.c
+++ b/jni/desmume/src/android/math-neon/math_acosf.c
@@ -43,7 +43,10 @@ float acosf_neon_hfp(float x)
asm volatile (
"vdup.f32 d1, %0 \n\t" //d1 = {pi/2, pi/2};
"vsub.f32 d0, d1, d0 \n\t" //d0 = d1 - d0;
- ::"r"(__acosf_pi_2):
+ :
+ :
+ "r"(__acosf_pi_2)
+ :
);
#endif
}
diff --git a/jni/desmume/src/android/math-neon/math_vec2.c b/jni/desmume/src/android/math-neon/math_vec2.c
index 810d562..3d2a202 100755
--- a/jni/desmume/src/android/math-neon/math_vec2.c
+++ b/jni/desmume/src/android/math-neon/math_vec2.c
@@ -66,9 +66,11 @@ dot2_neon_hfp(float v0[2], float v1[2])
"vld1.32 {d4}, [%1] \n\t" //d4={x1,y1}
"vmul.f32 d0, d2, d4 \n\t" //d0 = d2*d4
"vpadd.f32 d0, d0, d0 \n\t" //d0 = d[0] + d[1]
- :: "r"(v0), "r"(v1)
- :
- );
+ :
+ :
+ "r"(v0), "r"(v1)
+ :
+ );
#endif
}
diff --git a/jni/desmume/src/android/math-neon/math_vec4.c b/jni/desmume/src/android/math-neon/math_vec4.c
index 1fc0b86..cd382f4 100755
--- a/jni/desmume/src/android/math-neon/math_vec4.c
+++ b/jni/desmume/src/android/math-neon/math_vec4.c
@@ -107,8 +107,11 @@ dot4_neon_hfp(float v0[4], float v1[4])
"vmul.f32 d0, d2, d4 \n\t" //d0= d2*d4
"vmla.f32 d0, d3, d5 \n\t" //d0 = d0 + d3*d5
"vpadd.f32 d0, d0 \n\t" //d0 = d[0] + d[1]
- :: "r"(v0), "r"(v1) :
- );
+ :
+ :
+ "r"(v0), "r"(v1)
+ :
+ );
#endif
}

View file

@ -16,7 +16,7 @@ Features:
* Different color schemes for comfortable reading
* Optimizations for eInk
An enhanced version for this is available in [[cx.hell.android.pdfviewpro]], which also
An enhanced version for this is available in cx.hell.android.pdfviewpro, which also
has x86 support, contents table and text reflow.
.

View file

@ -7,7 +7,7 @@ Issue Tracker:http://code.google.com/p/andblock/issues/list
Summary:Ad-blocking HTTP proxy
Description:
Blocks advertisements in the web browser by filtering requests by URL. Root is not required. The app is
still in beta and hasn't been updated in a while so your mileage might vary.
still in beta and hasn't been updated in a while so your mileage might vary.
.
Repo Type:git

View file

@ -0,0 +1,24 @@
Category:Office
License:GPLv3
Web Site:https://github.com/mathbellev/StdAtmosphere
Source Code:https://github.com/mathbellev/StdAtmosphere
Issue Tracker:https://github.com/mathbellev/StdAtmosphere/issues
Summary:Engineering tool
Description:
A small tool for aeronautical engineering, providing a model of the standard atmosphere:
that is to say the temperature and pressure as a function of altitude.
Given a Mach number, you also get the true air speed and conventional air speed.
.
Repo Type:git
Repo:https://github.com/mathbellev/StdAtmosphere.git
Build Version:1.0,1,4d6ba8,target=android-16,prebuild=rm -rf bin gen,extlibs=android/android-support-v4.jar
Auto Update Mode:None
#Not in market
Update Check Mode:RepoManifest
Current Version:1.0
Current Version Code:1

View file

@ -1,16 +1,24 @@
Disabled:Source in zip only, not current and Chinese language website and readme. otherwise good
Category:Internet
License:Apache2
Web Site:http://gorry.haun.org/android/aicia/
Source Code:http://gorry.haun.org/android/aicia/dist/old/
Source Code:https://bitbucket.org/dalb8/aicia
Issue Tracker:
Summary:IRC client
Description:
Internet Relay Chat client with a twin-pane view.
Website is in Japanese.
.
Update Check Mode:None
Current Version:2012.0220.1
Current Version Code:201202201
Repo Type:hg
Repo:https://bitbucket.org/dalb8/aicia
Build Version:2012.1008.1,201210081,d1bfe6a,subdir=AiCia,prebuild=\
sed -i '/debuggable/d' AndroidManifest.xml
Auto Update Mode:None
Update Check Mode:Market
Current Version:2012.1008.1
Current Version Code:201210081

View file

@ -0,0 +1,24 @@
Category:Office
License:Apache2
Web Site:http://gorry.haun.org/android/nicownng
Source Code:https://bitbucket.org/dalb8/nicownng
Issue Tracker:
Summary:Keyboard for ja
Description:
IME based on OpenWnn with full qwerty and a variety of Japanese layouts.
Website is in Japanese.
.
Repo Type:hg
Repo:https://bitbucket.org/dalb8/nicownng
Build Version:2012.1125.1.1305,201211251,97349c3,target=android-10,prebuild=\
sed -i '/debuggable/d' AndroidManifest.xml,buildjni=yes
Auto Update Mode:None
Update Check Mode:Market
Current Version:2012.1125.1.1305
Current Version Code:201211251

View file

@ -6,16 +6,16 @@ Issue Tracker:http://code.google.com/p/android-comicsreader/issues/list
Summary:Comic and image viewer
Description:
*Optimized for Android tablets.
*Comics browser with thumbnails.
*Bookmarks manager to download albums from remote sites.
*Fast pages switcher with pages previews.
*Double pages mode.
*Fling gesture to change page with smooth animation.
*Fullscreen for devices with physical buttons.
*Can be used to open application/x-cbz, application/x-cbr, image/jpeg and image/png from any file manager.
*Use lower quality images (resolution is decreased) if any out of memory exception occurs.
*Available in English and French languages (any translators are welcome to contribute ^^)
* Comics browser with thumbnails.
* Bookmarks manager to download albums from remote sites.
* Fast pages switcher with pages previews.
* Double pages mode.
* Fling gesture to change page with smooth animation.
* Fullscreen for devices with physical buttons.
* Can be used to open application/x-cbz, application/x-cbr, image/jpeg and image/png from any file manager.
* Use lower quality images (resolution is decreased) if any out of memory exception occurs.
* Available in English and French languages (any translators are welcome to contribute ^^)
* Supports x86 and MIPS natively.
.
Repo Type:hg

View file

@ -16,7 +16,7 @@ desktop application for creating your own. Donations by way of PayPal or BidforF
Osmand~ is the generic name for builds of Osmand not done by the developers, though
f-droid.org of course tries to be as faithful as possible to the releases. Prior to v0.8.2 native
code isn't used, meaning the apk is smaller.
code isn't used, meaning the apk is smaller. x86 and MIPS modules are included in the apk.
.
#Don't use master branch

View file

@ -7,9 +7,11 @@ Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wseemann%40
Summary:Audio stream player
Description:
N.B ffmpeg is now being used, so all features should work correctly: on both arm and x86.
N.B ffmpeg is being used in 0.5.0, so all features should work correctly: on both arm and x86.
Version 0.4.12 doesn't have ffmpeg and will not have all the features listed below.
HTTP media server browser and stream player. Ideal for playing internet radio or streaming podcasts
in the background. For use with any streaming media servers such as GNUMP3d.
in the background. For use with any streaming media servers such as GNUMP3d.
* Supports http, https, mms (beta), mmsh (beta)
* Plays mp3/3gp/mp4/m4a/ogg/wav/mid/xmf/mxmf/rtttl/rtx/ota/imy

View file

@ -9,7 +9,7 @@ Summary:An e-book reader
Description:
N.B There are three different apks to cover the different versions of Android. Donut covers 1.5-1.6;
Froyo covers 2.0-2.3 and Honeycomb covers 3.0+. (v1.6.4 covers Honeycomb). In other words disregard
the star next to the version.
the star next to the version. x86 and MIPS are supported natively in all apks.
An e-book reader. Features include the ability to stock up on books from online libraries like Project
Gutenberg straight from the app. F-Droid.org has two other apps that provide text-to-speech functionality.

View file

@ -0,0 +1,22 @@
Category:Games
License:GPLv2+
Web Site:http://code.google.com/p/kwaak3/
Source Code:http://code.google.com/p/kwaak3/source/checkout
Issue Tracker:http://code.google.com/p/kwaak3/issues/list
Summary:Quake 3 for Android
Description:
Port of ioquake3 engine to Android. Place original pak0.pk3 file from Quake 3 and
[http://ioquake3.org/extras/patch-data/ patch files] in /sdcard/quake3/baseq3. Touch controls
do not work in this version, so you need hardware keys to play.
.
Repo Type:git-svn
Repo:http://kwaak3.googlecode.com/svn/trunk/
Build Version:1.0,1,37,subdir=kwaak/project,buildjni=yes,target=android-10,novcheck=yes,patch=common.patch,prebuild=\
pushd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && popd
Auto Update Mode:None
Update Check Mode:RepoManifest

View file

@ -0,0 +1,406 @@
From 6c8a42f869b1a5a01989aa307fcd49c80af0a4cd Mon Sep 17 00:00:00 2001
From: Tasssadar <vbocek@gmail.com>
Date: Thu, 17 Mar 2011 22:02:55 +0100
Subject: [PATCH] add Q3 icon
---
kwaak/project/AndroidManifest.xml | 2 +-
kwaak/project/bin/classes.dex | Bin 16844 -> 16872 bytes
kwaak/project/bin/kwaak3.apk | Bin 100679 -> 196767 bytes
kwaak/project/bin/org/kwaak3/R$drawable.class | Bin 376 -> 405 bytes
kwaak/project/bin/org/kwaak3/R$id.class | Bin 636 -> 636 bytes
kwaak/project/bin/org/kwaak3/R$layout.class | Bin 370 -> 370 bytes
kwaak/project/bin/org/kwaak3/R$string.class | Bin 374 -> 374 bytes
kwaak/project/bin/resources.ap_ | Bin 11652 -> 107594 bytes
kwaak/project/gen/org/kwaak3/R.java | 1 +
kwaak/project/res/drawable-hdpi/icon2.png | Bin 0 -> 33053 bytes
kwaak/project/res/drawable-ldpi/icon2.png | Bin 0 -> 33053 bytes
kwaak/project/res/drawable-mdpi/icon2.png | Bin 0 -> 33053 bytes
12 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 kwaak/project/res/drawable-hdpi/icon2.png
create mode 100644 kwaak/project/res/drawable-ldpi/icon2.png
create mode 100644 kwaak/project/res/drawable-mdpi/icon2.png
diff --git a/ioquake3/Makefile.local b/ioquake3/Makefile.local
index 7b7bafa..b50868d 100644
--- a/ioquake3/Makefile.local
+++ b/ioquake3/Makefile.local
@@ -1,11 +1,13 @@
COMPILE_ARCH=arm
COMPILE_PLATFORM=linux
-ANDROID_NDK_DIR=/home/roderick/android/android-ndk-1.6_r1
-CC=/home/roderick/android/arm-eabi-4.4.0/bin/arm-eabi-gcc
+ANDROID_NDK_DIR= /home/tassadar/android-ndk-r5b
+CC=/home/tassadar/arm-eabi-4.4.0/bin/arm-eabi-gcc
#ANDROID_CFLAGS=-mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon -fpic -fno-short-enums -ffunction-sections -funwind-tables -fstack-protector -ftree-vectorize -fsingle-precision-constant
+#ANDROID_CFLAGS=-march=armv6 -mtune=xscale -msoft-float -fpic -mthumb-interwork -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -D__ARM_ARCH_6__
+#ANDROID_CFLAGS=-march=armv5te -mtune=xscale -msoft-float -fpic -mthumb-interwork -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
ANDROID_CFLAGS=-march=armv5te -mtune=xscale -msoft-float -fpic -mthumb-interwork -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
-CFLAGS=$(ANDROID_CFLAGS) -I$(ANDROID_NDK_DIR)/build/platforms/android-4/arch-arm/usr/include -DANDROID -D__linux__ -D__MATH_NEON
-LDFLAGS=-nostdlib -L$(ANDROID_NDK_DIR)/build/platforms/android-4/arch-arm/usr/lib
+CFLAGS=$(ANDROID_CFLAGS) -I$(ANDROID_NDK_DIR)/platforms/android-8/arch-arm/usr/include -DANDROID -D__linux__ -D__MATH_NEON
+LDFLAGS=-nostdlib -L$(ANDROID_NDK_DIR)/platforms/android-8/arch-arm/usr/lib
BUILD_CLIENT=1
BUILD_CLIENT_SMP=0
BUILD_GAME_QVM=0
diff --git a/ioquake3/code/qcommon/common.c b/ioquake3/code/qcommon/common.c
index ac91a64..11671f1 100644
--- a/ioquake3/code/qcommon/common.c
+++ b/ioquake3/code/qcommon/common.c
@@ -244,7 +244,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
static int lastErrorTime;
static int errorCount;
int currentTime;
-
+ Com_Printf("Com_Error");
Cvar_Set( "com_errorCode", va( "%i", code ) );
// when we are running automated scripts, make sure we
@@ -316,7 +316,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
}
Com_Shutdown ();
-
+ Com_Printf("%s", com_errorMessage);
Sys_Error ("%s", com_errorMessage);
}
diff --git a/ioquake3/code/renderer/qgl.h b/ioquake3/code/renderer/qgl.h
index 4d9e076..c78afdd 100644
--- a/ioquake3/code/renderer/qgl.h
+++ b/ioquake3/code/renderer/qgl.h
@@ -46,7 +46,7 @@
#include "macosx_glimp.h"
#elif defined( __linux__ )
-
+#include <GLES/glplatform.h>
#include <GLES/gl.h>
#include "../android/android_glimp.h"
diff --git a/ioquake3/code/sys/con_tty.c b/ioquake3/code/sys/con_tty.c
index 0c87a0e..e69fa86 100644
--- a/ioquake3/code/sys/con_tty.c
+++ b/ioquake3/code/sys/con_tty.c
@@ -271,8 +271,8 @@ void CON_Init( void )
|| (term && (!strcmp(term, "raw") || !strcmp(term, "dumb"))))
{
Com_Printf("tty console mode disabled\n");
- ttycon_on = qfalse;
- stdin_active = qtrue;
+ ttycon_on = qtrue;
+ stdin_active = qfalse;
return;
}
diff --git a/ioquake3/code/sys/sys_main.c b/ioquake3/code/sys/sys_main.c
index fa3ca71..9053c83 100644
--- a/ioquake3/code/sys/sys_main.c
+++ b/ioquake3/code/sys/sys_main.c
@@ -42,6 +42,10 @@
#endif
#endif
#endif
+//#include "../SDL12/include/SDL_active.h"
+//#define SDL_APPMOUSEFOCUS 0x01 /* The app has mouse coverage */
+//#define SDL_APPINPUTFOCUS 0x02 /* The app has input focus */
+//#define SDL_APPACTIVE 0x04 /* The application is active */
#include "sys_local.h"
#include "sys_loadlib.h"
@@ -164,6 +168,7 @@ void Sys_Exit( int ex )
*/
void Sys_Quit( void )
{
+ Com_Printf("sys_quit");
CL_Shutdown( );
Sys_Exit( 0 );
}
@@ -294,7 +299,7 @@ void Sys_Error( const char *error, ... )
{
va_list argptr;
char string[1024];
-
+Com_Printf("sys_error");
CL_Shutdown ();
va_start (argptr,error);
@@ -503,6 +508,8 @@ void Sys_SigHandler( int signal )
signalcaught = qtrue;
fprintf( stderr, "Received signal %d, exiting...\n", signal );
#ifndef DEDICATED
+Com_Printf("sighandler %d", signal);
+
CL_Shutdown();
#endif
SV_Shutdown( "Signal caught" );
@@ -574,20 +581,15 @@ int main( int argc, char **argv )
signal( SIGSEGV, Sys_SigHandler );
signal( SIGTERM, Sys_SigHandler );
-#if 0
- while( 1 )
+/* while( 1 )
{
-#if !defined(NOKIA)
-#ifndef DEDICATED
- int appState = SDL_GetAppState( );
- Cvar_SetValue( "com_unfocused", !( appState & SDL_APPINPUTFOCUS ) );
- Cvar_SetValue( "com_minimized", !( appState & SDL_APPACTIVE ) );
-#endif
-#endif
+// int appState = SDL_GetAppState( );
- }
-#endif
+ Cvar_SetValue( "com_unfocused", qfalse );
+ Cvar_SetValue( "com_minimized", qfalse );
+
+ }*/
return 0;
}
--- a/kwaak/project/jni/kwaakjni.c
+++ b/kwaak/project/jni/kwaakjni.c
@@ -42,7 +42,7 @@
jmethodID android_setMenuState;
/* Contains the game directory e.g. /mnt/sdcard/quake3 */
-static char* game_dir=NULL;
+static char* game_dir="";
/* Containts the path to /data/data/(package_name)/libs */
static char* lib_dir=NULL;
@@ -58,7 +58,7 @@
static void *libdl;
static int init=0;
-//#define DEBUG
+#define DEBUG
typedef enum fp_type
{
FP_TYPE_NONE = 0,
@@ -201,7 +201,7 @@ void setMenuState(int state)
__android_log_print(ANDROID_LOG_DEBUG, "Quake_JNI", "setMenuState state=%d", state);
#endif
- (*env)->CallVoidMethod(env, kwaakRendererObj, android_setMenuState, state);
+ // (*env)->CallVoidMethod(env, kwaakRendererObj, android_setMenuState, state);
}
int JNI_OnLoad(JavaVM* vm, void* reserved)
diff --git a/kwaak/project/src/org/kwaak3/KwaakJNI.java b/kwaak/project/src/org/kwaak3/KwaakJNI.java
index 6610890..3163de7 100644
--- a/kwaak/project/src/org/kwaak3/KwaakJNI.java
+++ b/kwaak/project/src/org/kwaak3/KwaakJNI.java
@@ -29,11 +29,13 @@
public static native void enableLightmaps(boolean enable);
public static native void setAudio(KwaakAudio audio);
public static native void showFramerate(boolean enable);
+
/* Initialize the game engine */
public static native void initGame(int width, int height);
public static native void setLibraryDirectory(String path);
+ public static native void setGameDirectory(String path);
/* Compute and draw a new frame */
public static native void drawFrame();
diff --git a/kwaak/project/src/org/kwaak3/KwaakRenderer.java b/kwaak/project/src/org/kwaak3/KwaakRenderer.java
index 9b35afe..6b3072f 100644
--- a/kwaak/project/src/org/kwaak3/KwaakRenderer.java
+++ b/kwaak/project/src/org/kwaak3/KwaakRenderer.java
@@ -32,9 +32,11 @@ public KwaakRenderer() {
super();
}
+
public void onDrawFrame(GL10 gl) {
/* Compute a new frame. After this call completes, Android will perform a eglSwapBuffers */
- KwaakJNI.drawFrame();
+ if(mInit)
+ KwaakJNI.drawFrame();
}
public void onSurfaceChanged(GL10 gl, int width, int height) {
diff --git a/kwaak/project/src/org/kwaak3/KwaakView.java b/kwaak/project/src/org/kwaak3/KwaakView.java
index b65a717..02b500f 100644
--- a/kwaak/project/src/org/kwaak3/KwaakView.java
+++ b/kwaak/project/src/org/kwaak3/KwaakView.java
@@ -32,19 +32,24 @@
public KwaakView(Context context){
super(context);
-
- /* We need the path to the library directory for dlopen in our JNI library */
+
+
+
+ /* We need the path to the library directory for dlopen in our JNI library */
String cache_dir, lib_dir;
try {
cache_dir = context.getCacheDir().getCanonicalPath();
+
lib_dir = cache_dir.replace("cache", "lib");
} catch (IOException e) {
e.printStackTrace();
lib_dir = "/data/data/org.kwaak3/lib";
}
+ KwaakJNI.setGameDirectory(android.os.Environment.getExternalStorageDirectory().getPath() + "/quake3");
KwaakJNI.setLibraryDirectory(lib_dir);
+
mKwaakRenderer = new KwaakRenderer();
setRenderer(mKwaakRenderer);
diff -Ndaur org.kwaak3.ext.old/mkjni.sh org.kwaak3.ext/mkjni.sh
--- org.kwaak3.ext.old/mkjni.sh 1970-01-01 10:00:00.000000000 +1000
+++ org.kwaak3.ext/mkjni.sh 2012-12-13 13:16:34.319760324 +1100
@@ -0,0 +1,88 @@
+#!/bin/bash -e
+
+NDK="$ANDROID_NDK"
+
+if [ "$NDK_DEBUG" == "1" ]; then
+ MODE=debug
+else
+ MODE=release
+fi
+
+function mkjni()
+{
+ if [ "$NDK_DEBUG" == "1" ]; then
+ ANDROID_CFLAGS="$ANDROID_CFLAGS"
+ else
+ ANDROID_CFLAGS="$ANDROID_CFLAGS -ffunction-sections"
+ fi
+
+ pushd ioquake3
+
+ # XXX: ioquake3 assumes, that NOKIA="OpenGL ES"
+ CC="$CC --sysroot=$SYSROOT" ANDROID_NDK_DIR="$NDK" LDFLAGS="$LDFLAGS" \
+ CFLAGS="$ANDROID_CFLAGS -fno-short-enums -fpic -fstack-protector -DANDROID -DNOKIA" \
+ COMPILE_ARCH=$(uname -m | sed -e s/i.86/i386/) ARCH=$ARCH make -e $MODE
+
+ popd
+}
+
+# build ARM
+ARCH=arm
+TRIPLEX=arm-linux-androideabi
+# API 4 is needed by native GLES
+SYSROOT="$NDK/platforms/android-4/arch-arm/"
+CC="$NDK/toolchains/$TRIPLEX-4.6/prebuilt/*/bin/$TRIPLEX-gcc"
+
+mkdir -p kwaak/project/jni/prebuilt/armeabi/
+mkdir -p kwaak/project/jni/prebuilt/armeabi-v7a/
+
+# ARMv6
+ANDROID_CFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb-interwork -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
+mkjni
+
+# ARMv6 with VFP support, sorry
+cp ioquake3/build/$MODE-linux-arm/libquake3.so kwaak/project/jni/prebuilt/armeabi/libquake3.so
+cp ioquake3/build/$MODE-linux-arm/libquake3.so kwaak/project/jni/prebuilt/armeabi/libquake3_vfp.so
+cp ioquake3/build/$MODE-linux-arm/baseq3/{libcgamearm.so,libuiarm.so,libqagamearm.so} \
+ kwaak/project/jni/prebuilt/armeabi/
+
+rm -rf ioquake3/build/$MODE-linux-arm/*
+
+# ARMv7
+ANDROID_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -funwind-tables"
+mkjni
+
+cp ioquake3/build/$MODE-linux-arm/libquake3.so kwaak/project/jni/prebuilt/armeabi-v7a/libquake3_vfp.so
+cp ioquake3/build/$MODE-linux-arm/baseq3/{libcgamearm.so,libuiarm.so,libqagamearm.so} \
+ kwaak/project/jni/prebuilt/armeabi-v7a/
+
+rm -rf ioquake3/build/$MODE-linux-arm/*
+
+# ARMv7 - Neon
+ANDROID_CFLAGS="-mtune=cortex-a8 -mfloat-abi=softfp -mfpu=neon -funwind-tables -ftree-vectorize -fsingle-precision-constant -D__MATH_NEON"
+LDFLAGS='-march=armv7-a -Wl,--fix-cortex-a8'
+mkjni
+
+# only libquake3.so is Neon-specific, rest are same for all ARM versions
+cp ioquake3/build/$MODE-linux-arm/libquake3.so kwaak/project/jni/prebuilt/armeabi-v7a/libquake3_neon.so
+
+LDFLAGS=""
+
+# these platforms aren't yet supported by upstream
+
+# build MIPS
+ARCH=mips
+TRIPLEX=mipsel-linux-android
+SYSROOT="$NDK/platforms/android-9/arch-mips/"
+ANDROID_CFLAGS="-march=mips32 -mhard-float"
+CC="$NDK/toolchains/$TRIPLEX-4.6/prebuilt/*/bin/$TRIPLEX-gcc"
+#mkjni
+
+# build i686
+ARCH=x86
+TRIPLEX=i686-linux-android
+SYSROOT="$NDK/platforms/android-9/arch-x86/"
+# NDK docs suggest -mtune=atom, but my ancient notebook, used for testing, disagrees
+ANDROID_CFLAGS="-march=i686 -mtune=pentium4 -mstackrealign -msse2 -mfpmath=sse -m32"
+CC="$NDK/toolchains/$ARCH-4.6/prebuilt/*/bin/$TRIPLEX-gcc"
+#mkjni
diff -Ndaur org.kwaak3.ext.old/kwaak/Application.mk org.kwaak3.ext/kwaak/Application.mk
--- org.kwaak3.ext.old/kwaak/Application.mk 2012-12-12 20:51:18.389663008 +1100
+++ org.kwaak3.ext/kwaak/Application.mk 1970-01-01 10:00:00.000000000 +1000
@@ -1,2 +0,0 @@
-APP_MODULES := kwaakjni
-APP_PROJECT_PATH := $(call my-dir)/project
diff -Ndaur org.kwaak3.ext.old/kwaak/project/jni/Android.mk org.kwaak3.ext/kwaak/project/jni/Android.mk
--- org.kwaak3.ext.old/kwaak/project/jni/Android.mk 2012-12-12 20:51:18.419663483 +1100
+++ org.kwaak3.ext/kwaak/project/jni/Android.mk 2012-12-13 14:08:50.212529088 +1100
@@ -21,3 +21,5 @@
LOCAL_SRC_FILES := kwaakjni.c
include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/prebuilt.mk
diff -Ndaur org.kwaak3.ext.old/kwaak/project/jni/Application.mk org.kwaak3.ext/kwaak/project/jni/Application.mk
--- org.kwaak3.ext.old/kwaak/project/jni/Application.mk 1970-01-01 10:00:00.000000000 +1000
+++ org.kwaak3.ext/kwaak/project/jni/Application.mk 2012-12-13 13:56:58.207971364 +1100
@@ -0,0 +1,3 @@
+APP_PROJECT_PATH := $(call my-dir)/..
+
+APP_ABI := armeabi armeabi-v7a
diff -Ndaur org.kwaak3.ext.old/kwaak/project/jni/prebuilt.mk org.kwaak3.ext/kwaak/project/jni/prebuilt.mk
--- org.kwaak3.ext.old/kwaak/project/jni/prebuilt.mk 1970-01-01 10:00:00.000000000 +1000
+++ org.kwaak3.ext/kwaak/project/jni/prebuilt.mk 2012-12-13 13:18:02.831155648 +1100
@@ -0,0 +1,31 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libquake3
+LOCAL_SRC_FILES := prebuilt/armeabi/libquake3.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libquake3_vfp
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH_ABI)/libquake3_vfp.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libquake3_neon
+LOCAL_SRC_FILES := prebuilt/armeabi-v7a/libquake3_neon.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcgamearm
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH_ABI)/libcgamearm.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libuiarm
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH_ABI)/libuiarm.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libqagamearm
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH_ABI)/libqagamearm.so
+include $(PREBUILT_SHARED_LIBRARY)

View file

@ -14,6 +14,10 @@ SIP softphone with a comprehensive range of features:
* ICE/STUN/TURN algorithms for NAT traversal in virtually any network (based on ice4j from Jitsi)
* Push-to-talk (PTT) walkie-talkie mode allows free group chat on wifi (as long as the router supports multicast)
* Built in Ganglia agent provides an enterprise-grade monitoring solution to map wifi coverage and it's relationship with call quality
N.B Modules are present for arm-v7a only. This
[http://smart4u.org/forum/Thread-List-of-devices-ARMv7-ARMv6-ARMv5 list] may help if you are unsure about
which CPU architecture you have.
.
Repo Type:git

View file

@ -0,0 +1,21 @@
Category:Internet
License:GPLv3
Web Site:https://github.com/qii/weiciyuan/wiki
Source Code:https://github.com/qii/weiciyuan
Issue Tracker:https://github.com/qii/weiciyuan/issues
Summary:Sina Weibo client
Description:
Chinese social networking.
.
Repo Type:git
Repo:https://github.com/qii/weiciyuan.git
Build Version:0.481,23,95a0e2e9aa88,rm=libs/android-support-v4.jar,extlibs=android/android-support-v4.jar
Auto Update Mode:None
Update Check Mode:Market
Current Version:0.481
Current Version Code:23

View file

@ -1,4 +1,4 @@
AntiFeature:Tracking
AntiFeatures:Tracking
Category:Internet
License:LGPL
Web Site:http://code.google.com/p/transdroid-search/

View file

@ -13,9 +13,10 @@ searched with the keyboard.
Repo Type:git
Repo:git://git.busydoingnothing.co.uk/prevo-android.git
Build Version:0.2,2,!build errors 5bbaab6852978e,target=android-14
Build Version:0.3,3,!source incomplete 5bbaab6852978e,target=android-14
Update Check Mode:Tags
Current Version:0.2
Current Version Code:2
#Tags/Repo can't find version info and no reviews on market
Update Check Mode:None
Current Version:0.3
Current Version Code:3