Here we go Pawel,
The developer documentation I was looking at yesterday when I started
trying to build FreeRDS said to get the server source from a different
repo. I have just successfully built freerds using the source that's in
the FreeRDP repo. I'm pretty sure that source is a little behind, but at
least it built.
Attached is a small diff to fix some cc errors. Please review it to see if
my changes are appropriate (stdlib.h replacing malloc.h for example).
Thanks again!
On Tue, Nov 12, 2013 at 5:29 PM, Chris Lee <labmonke...@gmail.com> wrote:
> Hi again Pawel,
>
> Please disregard that patch, I think it's missing some things. I'm trying
> again to build the project but without getting the FreeRDS server source
> from the different repo. This will give me a clean git-diff regardless of
> whether it works or not.
>
> I should have that patch for you in a few minutes.
>
>
> On Tue, Nov 12, 2013 at 5:10 PM, Chris Lee <labmonke...@gmail.com> wrote:
>
>> Hi Pawel,
>>
>> Here is a 'diff git' under the FreeRDP directory, ignoring everything
>> under server/ since that came from a different repo. I'm not absolutely
>> certain that all changes are completely correct, but they build.
>>
>> Note that I'm pasting from PuTTY to Notepad++, so if there's a problem
>> with the patch I do apologize.
>>
>> --
>>
>> Thank you,
>> Chris Lee
>>
>>
>> On Tue, Nov 12, 2013 at 4:23 PM, Pawel Jakub Dawidek <p...@freebsd.org>wrote:
>>
>>> In the meantime, Chris, could you post the patches to fix compilation on
>>> FreeBSD, so they can be integrated upstream?
>>>
>>> On Tue, Nov 12, 2013 at 04:34:46PM -0500, Marc-André Moreau wrote:
>>> > Hi,
>>> >
>>> > FreeRDS is currently in very active development, and I haven't yet had
>>> the
>>> > time to update the building instructions.
>>> >
>>> > We should be able to get some sort of intermediate version which will
>>> be
>>> > functional enough for very early on testing by the end of this month.
>>> I can
>>> > keep you posted on that. Right now we're integrating a lot of
>>> components
>>> > which we've been working on for the past months, and it's a moving
>>> target.
>>> >
>>> > Best regards,
>>> > - Marc-Andre
>>> >
>>> >
>>> > On Tue, Nov 12, 2013 at 4:28 PM, Chris Lee <labmonke...@gmail.com>
>>> wrote:
>>> >
>>> > > Hello All,
>>> > >
>>> > > I am trying to build FreeRDS on FreeBSD 9.2-RELEASE.
>>> > >
>>> > > It took a few small changes to compile so far, but should be ok with
>>> a
>>> > > small patch.
>>> > >
>>> > > The problem right now is that I get stuck at:
>>> > > Linking C executable freerds
>>> > > /usr/bin/ld: cannot find -lfreerdp-server
>>> > > *** [server/freerds/core/freerds] Error code 1
>>> > >
>>> > > I get that the freerds target depends on freerdp-server; I just
>>> don't see
>>> > > where that lib is defined as a target.
>>> > >
>>> > > Could someone please assist me in resolving this linker error?
>>> > >
>>> > > I think I might like to help get the package working on FreeBSD and
>>> perhaps
>>> > > contibute to the project or at least help get a port into the tree.
>>> I'm
>>> > > just stumped as to where this lib is supposed to come from.
>>> > >
>>> > > --
>>> > >
>>> > > Thank you,
>>> > > Chris Lee
>>> > >
>>> > >
>>> ------------------------------------------------------------------------------
>>> > > DreamFactory - Open Source REST & JSON Services for HTML5 & Native
>>> Apps
>>> > > OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
>>> > > Free app hosting. Or install the open source package on any LAMP
>>> server.
>>> > > Sign up and see examples for AngularJS, jQuery, Sencha Touch and
>>> Native!
>>> > >
>>> http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
>>> > > _______________________________________________
>>> > > Freerdp-devel mailing list
>>> > > Freerdp-devel@lists.sourceforge.net
>>> > > https://lists.sourceforge.net/lists/listinfo/freerdp-devel
>>> > >
>>> >
>>> ------------------------------------------------------------------------------
>>> > DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
>>> > OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
>>> > Free app hosting. Or install the open source package on any LAMP
>>> server.
>>> > Sign up and see examples for AngularJS, jQuery, Sencha Touch and
>>> Native!
>>> >
>>> http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
>>> > _______________________________________________
>>> > Freerdp-devel mailing list
>>> > Freerdp-devel@lists.sourceforge.net
>>> > https://lists.sourceforge.net/lists/listinfo/freerdp-devel
>>>
>>> --
>>> Pawel Jakub Dawidek http://www.wheelsystems.com
>>> FreeBSD committer http://www.FreeBSD.org
>>> Am I Evil? Yes, I Am! http://mobter.com
>>>
>>
>>
>>
>
>
> --
>
> Thank you,
> Chris Lee
>
--
Thank you,
Chris Lee
diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
index adf8e04..8091dd0 100644
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@@ -48,7 +48,7 @@ typedef struct _TSMFFFmpegDecoder
ITSMFDecoder iface;
int media_type;
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
AVCodecContext* codec_context;
AVCodec* codec;
AVFrame* frame;
@@ -98,6 +98,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder*
decoder, const TS_AM_MED
mdecoder->codec_context->channels = media_type->Channels;
mdecoder->codec_context->block_align = media_type->BlockAlign;
+/*
#ifdef AV_CPU_FLAG_SSE2
mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
#else
@@ -107,6 +108,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder*
decoder, const TS_AM_MED
mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
#endif
#endif
+ */
return TRUE;
}
@@ -350,6 +352,10 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder*
decoder, const BYTE* data, UI
LLOG(0, ("\n"));
#endif
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+#endif
+
if (mdecoder->decoded_size_max == 0)
mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
mdecoder->decoded_data = malloc(mdecoder->decoded_size_max);
diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c
index 3070f1f..552b24f 100644
--- a/libfreerdp/locale/timezone.c
+++ b/libfreerdp/locale/timezone.c
@@ -1663,7 +1663,7 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO*
clientTimeZone)
local_time = localtime(&t);
#ifdef HAVE_TM_GMTOFF
- clientTimeZone->bias = timezone / 60;
+ clientTimeZone->bias = (UINT32) (tz->Bias / 60);
DEBUG_TIMEZONE("tzname[std]: %s, tzname[dst]: %s, timezone: %ld,
Daylight: %d", tzname[0], tzname[1], timezone, daylight);
#elif defined(sun)
if (local_time->tm_isdst > 0)
diff --git a/winpr/libwinpr/crt/alignment.c b/winpr/libwinpr/crt/alignment.c
index bf01e6b..1556d6f 100644
--- a/winpr/libwinpr/crt/alignment.c
+++ b/winpr/libwinpr/crt/alignment.c
@@ -32,7 +32,7 @@
#ifdef __APPLE__
#include <malloc/malloc.h>
#else
-#include <malloc.h>
+#include <stdlib.h>
#endif
struct _aligned_meminfo
diff --git a/winpr/libwinpr/synch/wait.c b/winpr/libwinpr/synch/wait.c
index 47ca366..9cdb185 100644
--- a/winpr/libwinpr/synch/wait.c
+++ b/winpr/libwinpr/synch/wait.c
@@ -115,7 +115,7 @@ static int pthread_timedjoin_np(pthread_t td, void **res,
return ETIMEDOUT;
}
-static int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct
timespec *timeout)
+int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec
*timeout)
{
struct timeval timenow;
struct timespec sleepytime;
diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c
index 9091c5e..4366411 100644
--- a/winpr/libwinpr/sysinfo/sysinfo.c
+++ b/winpr/libwinpr/sysinfo/sysinfo.c
@@ -129,7 +129,7 @@ static DWORD GetNumberOfProcessors()
size_t length = sizeof(numCPUs);
mib[0] = CTL_HW;
- mib[1] = HW_AVAILCPU;
+ mib[1] = HW_NCPU;
sysctl(mib, 2, &numCPUs, &length, NULL, 0);
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
Freerdp-devel mailing list
Freerdp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freerdp-devel
