patches for android-snappy porting

最新推荐文章于 2025-09-15 01:59:53 发布

原创最新推荐文章于 2025-09-15 01:59:53 发布 · 4.1k 阅读

0 ·

本内容遵循CC 4.0 BY-SA版权协议

标签

#recursion #android #playback #thread #object

Android 专栏收录该内容

8 篇文章

订阅专栏

本文介绍了一组针对glib库应用于Android平台的补丁文件。这些补丁主要修改了字符串处理函数中对小数点符号的处理方式，并且为了适应Android平台特性，对DNS解析模块进行了特殊优化。此外，还包含了一些针对Android ARM架构的内存操作优化。

glib-android.patch

--- glib-2.28.1/glib/gstrfuncs.c 2011-02-16 10:55:33.000000000 +0800 +++ aglib-2.28.1/glib/gstrfuncs.c 2011-03-25 13:32:40.000000000 +0800 @@ -442,8 +442,12 @@ g_ascii_strtod (const gchar *nptr, fail_pos = NULL; +#ifdef ANDROID + decimal_point = "."; +#else locale_data = localeconv (); decimal_point = locale_data->decimal_point; +#endif decimal_point_len = strlen (decimal_point); g_assert (decimal_point_len != 0); @@ -656,8 +660,12 @@ g_ascii_formatd (gchar *buffer, _g_snprintf (buffer, buf_len, format, d); +#ifdef ANDROID + decimal_point = "."; +#else locale_data = localeconv (); decimal_point = locale_data->decimal_point; +#endif decimal_point_len = strlen (decimal_point); g_assert (decimal_point_len != 0); --- glib-2.28.1/gio/libasyncns/asyncns.c 2010-04-13 21:33:16.000000000 +0800 +++ aglib-2.28.1/gio/libasyncns/asyncns.c 2011-03-25 13:32:40.000000000 +0800 @@ -18,6 +18,62 @@ <http://www.gnu.org/licenses/>. ***/ +//unsafe and unchecked patch for the arp/*.h definitions in Android. +#ifdef ANDROID +/*% + * Inline versions of get/put short/long. Pointer is advanced. + */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ +#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ +#define NS_GET16(s, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (s) = ((u_int16_t)t_cp[0] << 8) / + | ((u_int16_t)t_cp[1]) / + ; / + (cp) += NS_INT16SZ; / +} while (0) +#define NS_GET32(l, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (l) = ((u_int32_t)t_cp[0] << 24) / + | ((u_int32_t)t_cp[1] << 16) / + | ((u_int32_t)t_cp[2] << 8) / + | ((u_int32_t)t_cp[3]) / + ; / + (cp) += NS_INT32SZ; / +} while (0) + + +#define GETSHORT NS_GET16 +#define GETLONG NS_GET32 + +#define ns_c_in 1 /*%< Internet. */ +#define ns_t_srv 33 /*%< Internet. */ +#define C_IN ns_c_in +#define T_SRV ns_t_srv + +typedef struct { + unsigned id :16; /*%< query identification number */ + /* fields in third byte */ + unsigned rd :1; /*%< recursion desired */ + unsigned tc :1; /*%< truncated message */ + unsigned aa :1; /*%< authoritive answer */ + unsigned opcode :4; /*%< purpose of message */ + unsigned qr :1; /*%< response flag */ + /* fields in fourth byte */ + unsigned rcode :4; /*%< response code */ + unsigned cd: 1; /*%< checking disabled by resolver */ + unsigned ad: 1; /*%< authentic data from named */ + unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ + unsigned ra :1; /*%< recursion available */ + /* remaining bytes */ + unsigned qdcount :16; /*%< number of question entries */ + unsigned ancount :16; /*%< number of answer entries */ + unsigned nscount :16; /*%< number of authority entries */ + unsigned arcount :16; /*%< number of resource entries */ +} HEADER; + +#endif + #ifdef HAVE_CONFIG_H #include "g-asyncns.h" #endif --- glib-2.28.1/gio/gresolver.c 2011-02-11 23:23:11.000000000 +0800 +++ aglib-2.28.1/gio/gresolver.c 2011-03-25 13:32:40.000000000 +0800 @@ -20,6 +20,61 @@ * Boston, MA 02111-1307, USA. */ +#ifdef ANDROID +/*% + * Inline versions of get/put short/long. Pointer is advanced. + */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ +#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ +#define NS_GET16(s, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (s) = ((u_int16_t)t_cp[0] << 8) / + | ((u_int16_t)t_cp[1]) / + ; / + (cp) += NS_INT16SZ; / +} while (0) +#define NS_GET32(l, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (l) = ((u_int32_t)t_cp[0] << 24) / + | ((u_int32_t)t_cp[1] << 16) / + | ((u_int32_t)t_cp[2] << 8) / + | ((u_int32_t)t_cp[3]) / + ; / + (cp) += NS_INT32SZ; / +} while (0) + + +#define GETSHORT NS_GET16 +#define GETLONG NS_GET32 + +#define ns_c_in 1 /*%< Internet. */ +#define ns_t_srv 33 /*%< Internet. */ +#define C_IN ns_c_in +#define T_SRV ns_t_srv + +typedef struct { + unsigned id :16; /*%< query identification number */ + /* fields in third byte */ + unsigned rd :1; /*%< recursion desired */ + unsigned tc :1; /*%< truncated message */ + unsigned aa :1; /*%< authoritive answer */ + unsigned opcode :4; /*%< purpose of message */ + unsigned qr :1; /*%< response flag */ + /* fields in fourth byte */ + unsigned rcode :4; /*%< response code */ + unsigned cd: 1; /*%< checking disabled by resolver */ + unsigned ad: 1; /*%< authentic data from named */ + unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ + unsigned ra :1; /*%< recursion available */ + /* remaining bytes */ + unsigned qdcount :16; /*%< number of question entries */ + unsigned ancount :16; /*%< number of answer entries */ + unsigned nscount :16; /*%< number of authority entries */ + unsigned arcount :16; /*%< number of resource entries */ +} HEADER; +#endif + + #include "config.h" #include <glib.h> #include "glibintl.h" --- glib-2.28.1/gio/gthreadedresolver.c 2011-02-11 23:23:12.000000000 +0800 +++ aglib-2.28.1/gio/gthreadedresolver.c 2011-03-25 13:32:40.000000000 +0800 @@ -20,6 +20,60 @@ * Boston, MA 02111-1307, USA. */ +#ifdef ANDROID +/*% + * Inline versions of get/put short/long. Pointer is advanced. + */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ +#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ +#define NS_GET16(s, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (s) = ((u_int16_t)t_cp[0] << 8) / + | ((u_int16_t)t_cp[1]) / + ; / + (cp) += NS_INT16SZ; / +} while (0) +#define NS_GET32(l, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (l) = ((u_int32_t)t_cp[0] << 24) / + | ((u_int32_t)t_cp[1] << 16) / + | ((u_int32_t)t_cp[2] << 8) / + | ((u_int32_t)t_cp[3]) / + ; / + (cp) += NS_INT32SZ; / +} while (0) + + +#define GETSHORT NS_GET16 +#define GETLONG NS_GET32 + +#define ns_c_in 1 /*%< Internet. */ +#define ns_t_srv 33 /*%< Internet. */ +#define C_IN ns_c_in +#define T_SRV ns_t_srv + + typedef struct { + unsigned id :16; /*%< query identification number */ + /* fields in third byte */ + unsigned rd :1; /*%< recursion desired */ + unsigned tc :1; /*%< truncated message */ + unsigned aa :1; /*%< authoritive answer */ + unsigned opcode :4; /*%< purpose of message */ + unsigned qr :1; /*%< response flag */ + /* fields in fourth byte */ + unsigned rcode :4; /*%< response code */ + unsigned cd: 1; /*%< checking disabled by resolver */ + unsigned ad: 1; /*%< authentic data from named */ + unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ + unsigned ra :1; /*%< recursion available */ + /* remaining bytes */ + unsigned qdcount :16; /*%< number of question entries */ + unsigned ancount :16; /*%< number of answer entries */ + unsigned nscount :16; /*%< number of authority entries */ + unsigned arcount :16; /*%< number of resource entries */ + } HEADER; +#endif + #include "config.h" #include <glib.h> #include "glibintl.h" --- glib-2.28.1/gio/gunixresolver.c 2011-02-11 23:23:12.000000000 +0800 +++ aglib-2.28.1/gio/gunixresolver.c 2011-03-25 13:32:40.000000000 +0800 @@ -20,6 +20,62 @@ * Boston, MA 02111-1307, USA. */ +#ifdef ANDROID +/*% + * Inline versions of get/put short/long. Pointer is advanced. + */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ +#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ +#define NS_GET16(s, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (s) = ((u_int16_t)t_cp[0] << 8) / + | ((u_int16_t)t_cp[1]) / + ; / + (cp) += NS_INT16SZ; / +} while (0) +#define NS_GET32(l, cp) do { / + register const u_char *t_cp = (const u_char *)(cp); / + (l) = ((u_int32_t)t_cp[0] << 24) / + | ((u_int32_t)t_cp[1] << 16) / + | ((u_int32_t)t_cp[2] << 8) / + | ((u_int32_t)t_cp[3]) / + ; / + (cp) += NS_INT32SZ; / +} while (0) + + +#define GETSHORT NS_GET16 +#define GETLONG NS_GET32 + +#define ns_c_in 1 /*%< Internet. */ +#define ns_t_srv 33 /*%< Internet. */ +#define C_IN ns_c_in +#define T_SRV ns_t_srv + + typedef struct { + unsigned id :16; /*%< query identification number */ + /* fields in third byte */ + unsigned rd :1; /*%< recursion desired */ + unsigned tc :1; /*%< truncated message */ + unsigned aa :1; /*%< authoritive answer */ + unsigned opcode :4; /*%< purpose of message */ + unsigned qr :1; /*%< response flag */ + /* fields in fourth byte */ + unsigned rcode :4; /*%< response code */ + unsigned cd: 1; /*%< checking disabled by resolver */ + unsigned ad: 1; /*%< authentic data from named */ + unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ + unsigned ra :1; /*%< recursion available */ + /* remaining bytes */ + unsigned qdcount :16; /*%< number of question entries */ + unsigned ancount :16; /*%< number of answer entries */ + unsigned nscount :16; /*%< number of authority entries */ + unsigned arcount :16; /*%< number of resource entries */ + } HEADER; +#endif + + + #include "config.h" #include <glib.h> #include "glibintl.h" --- glib-2.28.1/gio/glocalfileinfo.c 2011-02-11 23:23:11.000000000 +0800 +++ aglib-2.28.1/gio/glocalfileinfo.c 2011-03-25 13:32:40.000000000 +0800 @@ -42,6 +42,9 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif +#ifdef ANDROID +#include <pwd.h> +#endif #ifdef HAVE_SELINUX #include <selinux/selinux.h> #endif @@ -1096,7 +1099,11 @@ lookup_uid_data (uid_t uid) if (pwbufp->pw_name != NULL && pwbufp->pw_name[0] != 0) data->user_name = convert_pwd_string_to_utf8 (pwbufp->pw_name); +#ifdef ANDROID + gecos = NULL; +#else gecos = pwbufp->pw_gecos; +#endif if (gecos) { --- glib-2.28.1/gio/ginetaddress.c 2011-02-11 23:23:11.000000000 +0800 +++ aglib-2.28.1/gio/ginetaddress.c 2011-03-25 13:32:40.000000000 +0800 @@ -20,6 +20,27 @@ * Authors: Christian Kellner <gicmo@gnome.org> * Samuel Cormier-Iijima <sciyoshi@gmail.com> */ +#ifdef ANDROID +#define IN6_IS_ADDR_MC_NODELOCAL(a) / + (IN6_IS_ADDR_MULTICAST(a) / + && ((((__const uint8_t *) (a))[1] & 0xf) == 0x1)) + +#define IN6_IS_ADDR_MC_LINKLOCAL(a) / + (IN6_IS_ADDR_MULTICAST(a) / + && ((((__const uint8_t *) (a))[1] & 0xf) == 0x2)) + +#define IN6_IS_ADDR_MC_SITELOCAL(a) / + (IN6_IS_ADDR_MULTICAST(a) / + && ((((__const uint8_t *) (a))[1] & 0xf) == 0x5)) + +#define IN6_IS_ADDR_MC_ORGLOCAL(a) / + (IN6_IS_ADDR_MULTICAST(a) / + && ((((__const uint8_t *) (a))[1] & 0xf) == 0x8)) + +#define IN6_IS_ADDR_MC_GLOBAL(a) / + (IN6_IS_ADDR_MULTICAST(a) / + && ((((__const uint8_t *) (a))[1] & 0xf) == 0xe)) +#endif #include <config.h> --- glib-2.28.1/configure.ac 2011-02-18 12:33:11.000000000 +0800 +++ aglib-2.28.1/configure.ac 2011-03-25 13:48:49.000000000 +0800 @@ -852,7 +852,10 @@ fi # check for header files -AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h]) +if test "$ac_cv_android_arm" != "yes"; then + AC_CHECK_HEADERS([pwd.h]) +fi +AC_CHECK_HEADERS([dirent.h float.h limits.h grp.h sys/param.h sys/poll.h sys/resource.h]) AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h]) AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h]) AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h]) @@ -990,8 +993,10 @@ AC_CHECK_HEADERS([netdb.h wspiapi.h]) # For gio/libasyncns if test $glib_native_win32 = no; then - AC_CHECK_FUNCS(strndup setresuid setreuid) - AC_CHECK_HEADERS(sys/prctl.h arpa/nameser_compat.h) + AC_CHECK_FUNCS(strndup setresuid setreuid) + if test "$ac_cv_android_arm" != "yes"; then + AC_CHECK_HEADERS(sys/prctl.h arpa/nameser_compat.h) + fi # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150 AC_MSG_CHECKING([for res_query]) @@ -2329,8 +2334,12 @@ fi # b) FreeBSD doesn't do this either. # case $host in - *-*-freebsd*|*-*-linux*) - G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" + *-*-freebsd*|*-*-linux*) + if test "$ac_cv_android_arm" != "yes"; then + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" + else + CFLAGS="$CFLAGS -mno-thumb" + fi ;; *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" --- glib-2.28.1/m4macros/glib-gettext.m4 2011-02-11 23:23:13.000000000 +0800 +++ aglib-2.28.1/m4macros/glib-gettext.m4 2011-03-25 13:32:40.000000000 +0800 @@ -252,7 +252,7 @@ msgstr "" fi ]) - if test "$gt_cv_have_gettext" = "yes" ; then + if test "$gt_cv_have_gettext" = "yes" && test "$ac_cv_android_arm" != "yes"; then AC_DEFINE(ENABLE_NLS, 1, [always defined to indicate that i18n is enabled]) fi

snappy-android.patch

--- ./spice-gtk-0.5/gtk/spice-channel.c 2011-01-28 03:07:24.000000000 +0800 +++ ./aspice-gtk-0.5/gtk/spice-channel.c 2011-03-25 09:31:47.000000000 +0800 @@ -1124,10 +1124,10 @@ SpiceChannel *spice_channel_new(SpiceSes gtype = SPICE_TYPE_INPUTS_CHANNEL; break; case SPICE_CHANNEL_PLAYBACK: - gtype = SPICE_TYPE_PLAYBACK_CHANNEL; + //gtype = SPICE_TYPE_PLAYBACK_CHANNEL; break; case SPICE_CHANNEL_RECORD: - gtype = SPICE_TYPE_RECORD_CHANNEL; + //gtype = SPICE_TYPE_RECORD_CHANNEL; break; default: return NULL; --- ./spice-gtk-0.5/gtk/spice-session.c 2011-01-27 02:54:53.000000000 +0800 +++ ./aspice-gtk-0.5/gtk/spice-session.c 2011-03-25 09:16:43.000000000 +0800 @@ -984,7 +984,7 @@ int spice_session_get_connection_id(Spic return s->connection_id; } -#if !GLIB_CHECK_VERSION(2,28,0) +//#if !GLIB_CHECK_VERSION(2,28,0) static guint64 g_get_monotonic_clock(void) { GTimeVal tv; @@ -994,7 +994,7 @@ static guint64 g_get_monotonic_clock(voi return (((gint64) tv.tv_sec) * 1000000) + tv.tv_usec; } -#endif +//#endif G_GNUC_INTERNAL guint32 spice_session_get_mm_time(SpiceSession *session) --- ./spice-gtk-0.5/gtk/channel-display.c 2011-01-24 19:47:13.000000000 +0800 +++ ./aspice-gtk-0.5/gtk/channel-display.c 2011-03-25 09:16:09.000000000 +0800 @@ -19,9 +19,11 @@ #include "config.h" #endif +/* #ifdef HAVE_SYS_SHM_H #include <sys/shm.h> #endif +*/ #ifdef HAVE_SYS_IPC_H #include <sys/ipc.h> @@ -518,6 +520,7 @@ static int create_canvas(SpiceChannel *c if (surface->primary) { SPICE_DEBUG("display: create primary canvas"); + /* #ifdef HAVE_SYS_SHM_H surface->shmid = shmget(IPC_PRIVATE, surface->size, IPC_CREAT | 0777); if (surface->shmid >= 0) { @@ -528,8 +531,9 @@ static int create_canvas(SpiceChannel *c } } #else +*/ surface->shmid = -1; -#endif +//#endif } else { surface->shmid = -1; } @@ -581,11 +585,13 @@ static void destroy_canvas(display_surfa if (surface->shmid == -1) { free(surface->data); } + /* #ifdef HAVE_SYS_SHM_H - else { - shmdt(surface->data); - } +else { +shmdt(surface->data); +} #endif +*/ surface->shmid = -1; surface->data = NULL; @@ -700,11 +706,13 @@ static void display_handle_mode(SpiceCha emit_main_context(channel, SPICE_DISPLAY_PRIMARY_CREATE, surface->format, surface->width, surface->height, surface->stride, surface->shmid, surface->data); + /* #ifdef HAVE_SYS_SHM_H if (surface->shmid != -1) { shmctl(surface->shmid, IPC_RMID, 0); } #endif +*/ ring_add(&c->surfaces, &surface->link); } --- ./spice-gtk-0.5/common/marshaller.c 2011-01-26 02:43:41.000000000 +0800 +++ ./aspice-gtk-0.5/common/marshaller.c 2011-03-25 10:59:22.000000000 +0800 @@ -34,6 +34,20 @@ #define write_int64(ptr,v) (*((int64_t)(ptr)) = SPICE_BYTESWAP64((uint63_t)(v))) #define write_uint64(ptr,v) (*((uint64_t)(ptr)) = SPICE_BYTESWAP64((uint63_t)(v))) #else +/* + * dirty and gory hacks for android-arm to avoid SIGBUS + * --shohyanglim@gmail.com + */ +#ifdef ANDROID +#define write_int8(ptr,v) {int8_t val=v;memcpy(ptr,&val,sizeof(int8_t)); } +#define write_uint8(ptr,v) {uint8_t val=v;memcpy(ptr,&val,sizeof(uint8_t));} +#define write_int16(ptr,v) {int16_t val=v;memcpy(ptr,&val,sizeof(int16_t));} +#define write_uint16(ptr,v){uint16_t val=v;memcpy(ptr,&val,sizeof(uint16_t));} +#define write_int32(ptr,v) {int32_t val=v;memcpy(ptr,&val,sizeof(int32_t));} +#define write_uint32(ptr,v){uint32_t val=v;memcpy(ptr,&val,sizeof(uint32_t));} +#define write_int64(ptr,v) {int64_t val=v;memcpy(ptr,&val,sizeof(int64_t));} +#define write_uint64(ptr,v){uint64_t val=v;memcpy(ptr,&val,sizeof(uint64_t));} +#else #define write_int8(ptr,v) (*((int8_t *)(ptr)) = v) #define write_uint8(ptr,v) (*((uint8_t *)(ptr)) = v) #define write_int16(ptr,v) (*((int16_t *)(ptr)) = v) @@ -43,6 +57,7 @@ #define write_int64(ptr,v) (*((int64_t *)(ptr)) = v) #define write_uint64(ptr,v) (*((uint64_t *)(ptr)) = v) #endif +#endif typedef struct { uint8_t *data; --- ./spice-gtk-0.5/gtk/generated_demarshallers.c 2011-01-28 03:13:13.000000000 +0800 +++ ./aspice-gtk-0.5/gtk/generated_demarshallers.c 2011-03-25 10:59:21.000000000 +0800 @@ -31,6 +31,28 @@ #define read_uint64(ptr) ((uint64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr))) #define write_uint64(ptr, val) *(uint64_t *)(ptr) = SPICE_BYTESWAP64((uint64_t)val) #else +/* + * dirty and gory hacks for android-arm to avoid SIGBUS + * --shohyanglim@gmail.com + */ +#ifdef ANDROID + static inline int8_t read_int8(uint8_t* ptr) { int8_t val;memcpy(&val,ptr,sizeof(int8_t));return val;} + static inline uint8_t read_uint8(uint8_t* ptr) { uint8_t val;memcpy(&val,ptr,sizeof(uint8_t));return val;} + static inline int16_t read_int16(uint8_t* ptr) { int16_t val;memcpy(&val,ptr,sizeof(int16_t));return val;} + static inline uint16_t read_uint16(uint8_t* ptr) { uint16_t val;memcpy(&val,ptr,sizeof(uint16_t));return val;} + static inline int32_t read_int32(uint8_t* ptr) { int32_t val;memcpy(&val,ptr,sizeof(int32_t));return val;} + static inline uint32_t read_uint32(uint8_t* ptr) { uint32_t val;memcpy(&val,ptr,sizeof(uint32_t));return val;} + static inline int64_t read_int64(uint8_t* ptr) { int64_t val;memcpy(&val,ptr,sizeof(int64_t));return val;} + static inline uint64_t read_uint64(uint8_t* ptr) { uint64_t val;memcpy(&val,ptr,sizeof(uint64_t));return val;} +#define write_int8(ptr,v) {int8_t val=v;memcpy(ptr,&val,sizeof(int8_t)); } +#define write_uint8(ptr,v) {uint8_t val=v;memcpy(ptr,&val,sizeof(uint8_t));} +#define write_int16(ptr,v) {int16_t val=v;memcpy(ptr,&val,sizeof(int16_t));} +#define write_uint16(ptr,v){uint16_t val=v;memcpy(ptr,&val,sizeof(uint16_t));} +#define write_int32(ptr,v) {int32_t val=v;memcpy(ptr,&val,sizeof(int32_t));} +#define write_uint32(ptr,v){uint32_t val=v;memcpy(ptr,&val,sizeof(uint32_t));} +#define write_int64(ptr,v) {int64_t val=v;memcpy(ptr,&val,sizeof(int64_t));} +#define write_uint64(ptr,v){uint64_t val=v;memcpy(ptr,&val,sizeof(uint64_t));} +#else #define read_int8(ptr) (*((int8_t *)(ptr))) #define write_int8(ptr, val) (*((int8_t *)(ptr))) = val #define read_uint8(ptr) (*((uint8_t *)(ptr))) @@ -48,6 +70,7 @@ #define read_uint64(ptr) (*((uint64_t *)(ptr))) #define write_uint64(ptr, val) (*((uint64_t *)(ptr))) = val #endif +#endif static int8_t SPICE_GNUC_UNUSED consume_int8(uint8_t **ptr) {

Makefile for libspicec.so snappy building

CC=agcc COMMON_DIR=../common libspicec_src=coroutine_gthread.c spice-util.c spice-session.c spice-channel.c spice-marshal.c spice-glib-enums.c generated_demarshallers.c generated_demarshallers1.c generated_marshallers.c generated_marshallers1.c gio-coroutine.c channel-base.c channel-main.c channel-display.c channel-display-mjpeg.c channel-cursor.c channel-inputs.c decode-glz.c decode-jpeg.c decode-zlib.c $(COMMON_DIR)/mem.c $(COMMON_DIR)/marshaller.c $(COMMON_DIR)/canvas_utils.c $(COMMON_DIR)/sw_canvas.c $(COMMON_DIR)/pixman_utils.c $(COMMON_DIR)/lines.c $(COMMON_DIR)/rop3.c $(COMMON_DIR)/quic.c $(COMMON_DIR)/lz.c $(COMMON_DIR)/region.c $(COMMON_DIR)/ssl_verify.c snappy_src=spice-cmdline.c snappy.c libspciec_obj=$(libspicec_src:.c=.o) snappy_obj=$(snappy_src:.c=.o) CPP_FLAGS=-DG_LOG_DOMAIN=/"GSpice/" -DSW_CANVAS_CACHE -DSPICE_GTK_LOCALEDIR=/"/usr/local/share/locale/" -DHAVE_CONFIG_H -UHAVE_SYS_SHM_H -DSW_CANVAS_CACHE -D_REENTRANT -I. -I.. -I../common -I/data/local/include/spice-1 -I/data/local/include/pixman-1 -I/data/local/include -I/data/local/include/glib-2.0 -I/data/local/lib/glib-2.0/include C_FLAGS=-std=gnu99 -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wl,--no-undefined -fPIC -DPIC LD_FLAGS=-L/data/local/lib -lpixman-1 -lm -lssl -lcrypto -ljpeg -lz -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lintl -liconv snappy_ld_flags= -lspicec -L./ $(LD_FLAGS) snappy_exe = snappy libspciec_so = libspicec.so all: $(snappy_exe) $(snappy_exe): $(snappy_obj) $(libspciec_so) $(CC) $(snappy_ld_flags) $^ -o $@ $(libspciec_so): $(libspciec_obj) $(CC) $(LD_FLAGS) $^ -shared -o $@ .c.o: $(CC) $(CPP_FLAGS) $(C_FLAGS) $< -c -o $(<:.c=.o) clean: rm $(libspciec_obj) $(snappy_exe) $(snappy_obj) $(libspciec_so) install: make -f ./amakefile adb push $(snappy_exe) /data/local/ adb push $(libspciec_so) /data/local/lib/

snappy run-time log on Android device:

# LD_LIBRARY_PATH=/system/lib:/data/local/lib ./snappy -h 192.168.1.31 -p 5900 -o ahoo.ppm (snappy:3030): GSpice-DEBUG: spice-session.c:803 session: disconnecting 0 (snappy:3030): GSpice-DEBUG: spice-channel.c:127 main-1:0: spice_channel_constructed (snappy:3030): GSpice-DEBUG: spice-channel.c:1400 Open coroutine starting 0x22018 (snappy:3030): GSpice-DEBUG: spice-channel.c:1257 Started background coroutine 0x22044 (snappy:3030): GSpice-DEBUG: spice-session.c:900 Resolving host 192.168.1.31 5900 (snappy:3030): GSpice-DEBUG: spice-session.c:913 Trying one socket (snappy:3030): GSpice-DEBUG: spice-session.c:864 Socket pending (snappy:3030): GSpice-DEBUG: spice-session.c:879 Finally connected (snappy:3030): GSpice-DEBUG: spice-channel.c:931 main-1:0: spice_channel_recv_link_msg: 0 caps (snappy:3030): GSpice-DEBUG: spice-channel.c:793 main-1:0: channel up, state 5 (snappy:3030): GSpice-DEBUG: spice-session.c:1015 set mm time: 19952671 (snappy:3030): GLib-GObject-CRITICAL **: g_object_new: assertion `G_TYPE_IS_OBJECT (object_type)' failed (snappy:3030): GSpice-WARNING **: (channel-main.c:889):_channel_new: runtime check failed: (channel != NULL) (snappy:3030): GLib-GObject-CRITICAL **: g_object_new: assertion `G_TYPE_IS_OBJECT (object_type)' failed (snappy:3030): GSpice-WARNING **: (channel-main.c:889):_channel_new: runtime check failed: (channel != NULL) (snappy:3030): GSpice-DEBUG: spice-channel.c:127 cursor-4:0: spice_channel_constructed (snappy:3030): GSpice-DEBUG: spice-channel.c:127 display-2:0: spice_channel_constructed (snappy:3030): GSpice-DEBUG: spice-channel.c:127 inputs-3:0: spice_channel_constructed (snappy:3030): GSpice-DEBUG: spice-channel.c:1400 Open coroutine starting 0x2a000 (snappy:3030): GSpice-DEBUG: spice-channel.c:1257 Started background coroutine 0x2a02c (snappy:3030): GSpice-DEBUG: spice-session.c:900 Resolving host 192.168.1.31 5900 (snappy:3030): GSpice-DEBUG: spice-session.c:913 Trying one socket (snappy:3030): GSpice-DEBUG: spice-session.c:864 Socket pending (snappy:3030): GSpice-DEBUG: spice-session.c:879 Finally connected (snappy:3030): GSpice-DEBUG: spice-channel.c:931 display-2:0: spice_channel_recv_link_msg: 0 caps (snappy:3030): GSpice-DEBUG: spice-channel.c:793 display-2:0: channel up, state 5 (snappy:3030): GSpice-DEBUG: channel-display.c:522 display: create primary canvas (snappy:3030): GSpice-DEBUG: snappy.c:44 primary_create: 1024x768, format 32 wrote screen shot to ahoo.ppm