From 28629aaed03c8d434b4aa636accfc01719380c1b Mon Sep 17 00:00:00 2001 From: Alam Arias Date: Wed, 3 Oct 2012 10:05:20 -0400 Subject: [PATCH 1/3] Revert "build: check libavcodec api version" This reverts commit 06720e2a8dcf986af8ba8f14098afd2af6d0b4b8. --- cmake/FindFFmpeg.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index 3151be906..add7336ed 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -5,9 +5,6 @@ # FFMPEG_INCLUDE_DIRS - combined include directories # FFMPEG_LIBRARIES - combined libraries to link -set(REQUIRED_AVCODEC_VERSION 0.8) -set(REQUIRED_AVCODEC_API_VERSION 53.25.0) - include(FindPkgConfig) if (PKG_CONFIG_FOUND) @@ -34,14 +31,6 @@ endif() FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg DEFAULT_MSG AVUTIL_FOUND AVCODEC_FOUND) -if (AVCODEC_VERSION) - if (${AVCODEC_VERSION} VERSION_LESS ${REQUIRED_AVCODEC_API_VERSION}) - message(FATAL_ERROR "libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required") - endif() -else() - message("Note: To build libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required") -endif() - if(FFMPEG_FOUND) set(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR}) set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY}) From acc7f53188f258f73e5ebfe13ae4b35e417223bf Mon Sep 17 00:00:00 2001 From: Alam Arias Date: Wed, 3 Oct 2012 10:53:54 -0400 Subject: [PATCH 2/3] fix up XEXT miss from 659a90145043bbfe6bc99591b362857ff06692b4 --- client/X11/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index 980579067..63c584f7a 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -66,7 +66,7 @@ endif(WITH_MANPAGES) find_suggested_package(Xinerama) if(WITH_XINERAMA) - add_definitions(-DWITH_XINERAMA -DWITH_XEXT) + add_definitions(-DWITH_XINERAMA) include_directories(${XINERAMA_INCLUDE_DIRS}) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XINERAMA_LIBRARIES}) endif() @@ -75,7 +75,7 @@ find_suggested_package(Xext) if(WITH_XEXT) add_definitions(-DWITH_XEXT) include_directories(${XEXT_INCLUDE_DIRS}) - set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XEXT_LIBRARIES}) + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XEXT_LIBRARIES}) endif() find_suggested_package(Xcursor) From d7ba589b1f528b4cf32d2c1ebfade40b08a58da4 Mon Sep 17 00:00:00 2001 From: Alam Arias Date: Thu, 4 Oct 2012 15:23:21 -0400 Subject: [PATCH 3/3] fixup mismerge of typedef from 90ffa6ea86404cd21f61d8cb918815193d7b6b52 --- winpr/include/winpr/wtypes.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/winpr/include/winpr/wtypes.h b/winpr/include/winpr/wtypes.h index 3b3669123..57c2f6f82 100644 --- a/winpr/include/winpr/wtypes.h +++ b/winpr/include/winpr/wtypes.h @@ -89,15 +89,12 @@ typedef unsigned __int3264 ULONG_PTR, *PULONG_PTR; typedef signed int LONG32; typedef signed __int64 LONG64; -typedef CHAR* PSTR, *LPSTR; +typedef CHAR* PSTR, *LPSTR, *LPCH; typedef const CHAR *LPCSTR,*PCSTR; -typedef WCHAR* LPWSTR, *PWSTR; +typedef WCHAR* LPWSTR, *PWSTR, *LPWCH; typedef const WCHAR *LPCWSTR,*PCWSTR; -typedef CHAR *LPSTR, *LPCH; -typedef WCHAR *LPWSTR, *LPWCH; - typedef unsigned __int64 QWORD; typedef UCHAR* STRING;