pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-28 16:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build on Debian

Browse Source
This commit is contained in:
Yaniv Kamay 2009-10-26 23:30:41 +02:00
parent 48535714bf
commit c12c3facbd
9 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/display_channel.cpp
View File

@ -40,10 +40,7 @@
#include "red_gdi_canvas.h"
#endif
#include "platform_utils.h"
extern "C" {
#include "libavcodec/avcodec.h"
}
#include "ffmpeg_inc.h"
static Mutex avcodec_mutex;

4
client/windows/redc.vcproj
View File

@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;&quot;..\..\common\win\my_getopt-1.5&quot;;..\..\common;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\qcairo&quot;;&quot;$(SPICE_LIBS)\include\ffmpeg&quot;"
AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;&quot;..\..\common\win\my_getopt-1.5&quot;;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\qcairo&quot;;&quot;$(SPICE_LIBS)\include\ffmpeg&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_CACH_IS_SHARED;RED_DEBUG;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..;&quot;..\..\common\win\my_getopt-1.5&quot;;..\..\common;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\qcairo&quot;;&quot;$(SPICE_LIBS)\include\ffmpeg&quot;"
AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;&quot;..\..\common\win\my_getopt-1.5&quot;;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\qcairo&quot;;&quot;$(SPICE_LIBS)\include\ffmpeg&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_NO_CHUNKS;CAIRO_CANVAS_CACH_IS_SHARED;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"

1
client/x11/Makefile.am
View File

@ -12,6 +12,7 @@ INCLUDES = \
-I. \
-I.. \
-I$(top_srcdir)/common \
-I$(top_srcdir)/common/linux \
-I$(top_srcdir)/client \
$(GL_CFLAGS) \
$(ALSA_CFLAGS) \

12
common/linux/ffmpeg_inc.h.in Normal file
View File

@ -0,0 +1,12 @@
#ifdef __GNUG__
extern "C" {
#endif
#include "@AVCODEC_PREFIX@avcodec.h"
#ifdef __GNUG__
}
#endif

4
common/win/ffmpeg_inc.h Normal file
View File

@ -0,0 +1,4 @@
extern "C" {
#include "libavcodec/avcodec.h"
}

7
configure.ac
View File

@ -130,6 +130,12 @@ FFMPEG_LIBDIR=`pkg-config --variable=libdir libavutil`
AC_SUBST(FFMPEG_LIBDIR)
SPICE_REQUIRES+=" libavcodec libavutil"
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
AC_CHECK_HEADER(avcodec.h, AVCODEC_PREFIX="", AVCODEC_PREFIX="libavcodec/")
CPPFLAGS="$saved_CPPFLAGS"
AC_SUBST([AVCODEC_PREFIX])
PKG_CHECK_MODULES(ALSA, alsa)
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
@ -302,6 +308,7 @@ AC_OUTPUT([
Makefile
spice.pc
common/Makefile
common/linux/ffmpeg_inc.h
server/Makefile
client/Makefile
client/x11/Makefile

1
server/Makefile.am
View File

@ -3,6 +3,7 @@ NULL =
INCLUDES = \
-I. \
-I$(top_srcdir)/common \
-I$(top_srcdir)/common/linux \
$(FFMPEG_CFLAGS) \
$(QCAIRO_CFLAGS) \
$(GL_CFLAGS) \

2
server/red_worker.c
View File

@ -39,7 +39,7 @@
#include "cairo_canvas.h"
#include "gl_canvas.h"
#include "ogl_ctx.h"
#include "libavcodec/avcodec.h"
#include "ffmpeg_inc.h"
#include "quic.h"
#include "lz.h"
#include "glz_encoder_dictionary.h"

8
server/reds.c
View File

@ -27,7 +27,6 @@
#include <time.h>
#include <pthread.h>
#include <sys/mman.h>
#include <sys/user.h>
#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
@ -356,7 +355,10 @@ typedef struct PingItem {
int size;
} PingItem;
static uint8_t zero_page[PAGE_SIZE] = {0};
#define ZERO_BUF_SIZE 4096
static uint8_t zero_page[ZERO_BUF_SIZE] = {0};
static void reds_main_write(void *data);
static void reds_push();
@ -1085,7 +1087,7 @@ static void reds_prepare_ping_item(RedsOutItem *in_item, struct iovec* vec, int
int pos = 2;
while (size) {
ASSERT(pos < REDS_MAX_SEND_IOVEC);
int now = MIN(PAGE_SIZE, size);
int now = MIN(ZERO_BUF_SIZE, size);
size -= now;
vec[pos].iov_base = zero_page;
vec[pos].iov_len = now;