Hi, spice-common contains the common/, python_modules/, spice_codegen.py, spice1.proto, spice.proto history of spice server until "before-split2" tag. On top of that, it includes changes that were only in spice-gtk, and changes to make it compatible with spice-gtk. The main change is the unified logging, that will abort by default for spice-server and critical messages, but it can be tuned at compile & runtime.
In this iteration, the spice-common module includes both client & server marshallers. It makes use of the wip2 branch (which should be renamed "master" after the merge): http://cgit.freedesktop.org/spice/spice-common/log/?h=wip2 Marc-André Lureau (3): Use the spice-common submodule Use the spice-common logging functions Copy common/win/my_getopt-1.5/my_getopt client/windows .gitignore | 1 + .gitmodules | 6 +- Makefile.am | 18 +- autogen.sh | 3 +- client/Makefile.am | 61 +- client/application.cpp | 7 +- client/canvas.h | 10 +- client/cursor.h | 2 +- client/cursor_channel.cpp | 3 +- client/demarshallers.h | 27 - client/display_channel.cpp | 1 - client/display_channel.h | 3 +- client/glz_decoder.h | 2 +- client/glz_decoder_config.h | 4 +- client/jpeg_decoder.h | 5 + client/marshallers.h | 63 - client/monitor.h | 2 +- client/pixels_source.h | 2 +- client/red_canvas_base.h | 2 +- client/red_channel.h | 5 +- client/red_client.cpp | 7 +- client/red_client.h | 2 +- client/red_drawable.h | 2 +- client/red_gdi_canvas.cpp | 18 +- client/red_gdi_canvas.h | 2 +- client/red_gl_canvas.cpp | 15 +- client/red_gl_canvas.h | 4 +- client/red_peer.cpp | 8 +- client/red_peer.h | 7 +- client/red_sw_canvas.cpp | 20 +- client/red_sw_canvas.h | 2 +- client/screen.h | 3 +- client/screen_layer.h | 2 +- client/windows/generate.bat | 2 +- client/windows/generate1.bat | 2 +- client/windows/my_getopt.cpp | 301 +++- client/windows/my_getopt.h | 72 + client/windows/redc.vcproj | 2 +- client/x11/pixels_source_p.h | 3 +- client/x11/platform.cpp | 5 +- client/x11/red_drawable.cpp | 2 +- client/x11/red_pixmap_gl.cpp | 2 +- client/x11/red_window.cpp | 15 +- common/.gitignore | 9 - common/Makefile.am | 76 - common/backtrace.c | 133 -- common/backtrace.h | 34 - common/bitops.h | 91 - common/canvas_base.c | 3394 ------------------------------ common/canvas_base.h | 327 --- common/canvas_utils.c | 299 --- common/canvas_utils.h | 80 - common/draw.h | 281 --- common/gdi_canvas.c | 1858 ---------------- common/gdi_canvas.h | 51 - common/gl_canvas.c | 906 -------- common/gl_canvas.h | 53 - common/gl_utils.h | 61 - common/glc.c | 1513 ------------- common/glc.h | 167 -- common/lines.c | 3613 -------------------------------- common/lines.h | 138 -- common/lz.c | 740 ------- common/lz.h | 82 - common/lz_common.h | 69 - common/lz_compress_tmpl.c | 529 ----- common/lz_config.h | 39 - common/lz_decompress_tmpl.c | 326 --- common/marshaller.c | 615 ------ common/marshaller.h | 74 - common/mem.c | 297 --- common/mem.h | 162 -- common/messages.h | 525 ----- common/mutex.h | 44 - common/ogl_ctx.c | 251 --- common/ogl_ctx.h | 38 - common/pixman_utils.c | 1594 -------------- common/pixman_utils.h | 136 -- common/quic.c | 1699 --------------- common/quic.h | 72 - common/quic_config.h | 48 - common/quic_family_tmpl.c | 117 - common/quic_rgb_tmpl.c | 765 ------- common/quic_tmpl.c | 635 ------ common/rect.h | 122 -- common/region.c | 890 -------- common/region.h | 70 - common/ring.h | 172 -- common/rop3.c | 650 ------ common/rop3.h | 42 - common/spice_common.h | 78 - common/ssl_verify.c | 482 ----- common/ssl_verify.h | 66 - common/sw_canvas.c | 1327 ------------ common/sw_canvas.h | 70 - common/win/Makefile.am | 1 - common/win/my_getopt-1.5/ChangeLog | 22 - common/win/my_getopt-1.5/LICENSE | 22 - common/win/my_getopt-1.5/Makefile.am | 14 - common/win/my_getopt-1.5/Makefile.test | 26 - common/win/my_getopt-1.5/README | 140 -- common/win/my_getopt-1.5/getopt.3 | 288 --- common/win/my_getopt-1.5/getopt.h | 56 - common/win/my_getopt-1.5/getopt.txt | 330 --- common/win/my_getopt-1.5/main.c | 387 ---- common/win/my_getopt-1.5/my_getopt.c | 281 --- common/win/my_getopt-1.5/my_getopt.h | 72 - configure.ac | 10 +- server/Makefile.am | 47 +- server/agent-msg-filter.c | 8 +- server/dispatcher.c | 57 +- server/glz_encoder.h | 2 +- server/glz_encoder_config.h | 2 +- server/inputs_channel.c | 40 +- server/jpeg_encoder.c | 14 +- server/main_channel.c | 77 +- server/mjpeg_encoder.c | 2 +- server/red_channel.c | 102 +- server/red_channel.h | 9 +- server/red_client_cache.h | 4 +- server/red_client_shared_cache.h | 8 +- server/red_common.h | 9 +- server/red_dispatcher.c | 40 +- server/red_memslots.c | 28 +- server/red_parse_qxl.c | 45 +- server/red_tunnel_worker.c | 240 ++-- server/red_worker.c | 628 +++--- server/red_worker.h | 4 +- server/reds.c | 464 ++-- server/reds_gl_canvas.c | 4 +- server/reds_gl_canvas.h | 2 +- server/reds_sw_canvas.c | 4 +- server/reds_sw_canvas.h | 2 +- server/smartcard.c | 34 +- server/smartcard.h | 2 +- server/snd_worker.c | 103 +- server/spicevmc.c | 12 +- server/tests/Makefile.am | 21 +- server/zlib_encoder.c | 16 +- spice-common | 1 + spice-protocol | 1 - 141 files changed, 1512 insertions(+), 28804 deletions(-) delete mode 100644 client/demarshallers.h delete mode 100644 client/marshallers.h create mode 100644 client/windows/my_getopt.h delete mode 100644 common/.gitignore delete mode 100644 common/Makefile.am delete mode 100644 common/backtrace.c delete mode 100644 common/backtrace.h delete mode 100644 common/bitops.h delete mode 100644 common/canvas_base.c delete mode 100644 common/canvas_base.h delete mode 100644 common/canvas_utils.c delete mode 100644 common/canvas_utils.h delete mode 100644 common/draw.h delete mode 100644 common/gdi_canvas.c delete mode 100644 common/gdi_canvas.h delete mode 100644 common/gl_canvas.c delete mode 100644 common/gl_canvas.h delete mode 100644 common/gl_utils.h delete mode 100644 common/glc.c delete mode 100644 common/glc.h delete mode 100644 common/lines.c delete mode 100644 common/lines.h delete mode 100644 common/lz.c delete mode 100644 common/lz.h delete mode 100644 common/lz_common.h delete mode 100644 common/lz_compress_tmpl.c delete mode 100644 common/lz_config.h delete mode 100644 common/lz_decompress_tmpl.c delete mode 100644 common/marshaller.c delete mode 100644 common/marshaller.h delete mode 100644 common/mem.c delete mode 100644 common/mem.h delete mode 100644 common/messages.h delete mode 100644 common/mutex.h delete mode 100644 common/ogl_ctx.c delete mode 100644 common/ogl_ctx.h delete mode 100644 common/pixman_utils.c delete mode 100644 common/pixman_utils.h delete mode 100644 common/quic.c delete mode 100644 common/quic.h delete mode 100644 common/quic_config.h delete mode 100644 common/quic_family_tmpl.c delete mode 100644 common/quic_rgb_tmpl.c delete mode 100644 common/quic_tmpl.c delete mode 100644 common/rect.h delete mode 100644 common/region.c delete mode 100644 common/region.h delete mode 100644 common/ring.h delete mode 100644 common/rop3.c delete mode 100644 common/rop3.h delete mode 100644 common/spice_common.h delete mode 100644 common/ssl_verify.c delete mode 100644 common/ssl_verify.h delete mode 100644 common/sw_canvas.c delete mode 100644 common/sw_canvas.h delete mode 100644 common/win/Makefile.am delete mode 100644 common/win/my_getopt-1.5/ChangeLog delete mode 100644 common/win/my_getopt-1.5/LICENSE delete mode 100644 common/win/my_getopt-1.5/Makefile.am delete mode 100644 common/win/my_getopt-1.5/Makefile.test delete mode 100644 common/win/my_getopt-1.5/README delete mode 100644 common/win/my_getopt-1.5/getopt.3 delete mode 100644 common/win/my_getopt-1.5/getopt.h delete mode 100644 common/win/my_getopt-1.5/getopt.txt delete mode 100644 common/win/my_getopt-1.5/main.c delete mode 100644 common/win/my_getopt-1.5/my_getopt.c delete mode 100644 common/win/my_getopt-1.5/my_getopt.h create mode 160000 spice-common delete mode 160000 spice-protocol -- 1.7.7.6 _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel
