spaced30/freerdp
SHA256
1
0
Fork 0
forked from pool/freerdp
Code Pull Requests Activity

Accepting request 114977 from X11:RemoteDesktop

Browse Source 
- added freerdp-fix-FindPCSC-macro.patch which fixes the build by
  setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly
  which are otherwise empty
  (https://github.com/FreeRDP/FreeRDP/issues/562)

- applied fix for a bug in freerdp-fix-bitmap-cache.patch from
  upstream git

OBS-URL: https://build.opensuse.org/request/show/114977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2012-04-23 15:40:02 +00:00 committed by Git OBS Bridge
commit 0920fb4022
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freerdp-fix-FindPCSC-macro.patch Normal file
View File

@ -0,0 +1,14 @@
Index: freerdp-1.0.1/cmake/FindPCSC.cmake
===================================================================
--- freerdp-1.0.1.orig/cmake/FindPCSC.cmake
+++ freerdp-1.0.1/cmake/FindPCSC.cmake
@@ -8,6 +8,9 @@ find_path(PCSC_INCLUDE_DIR pcsclite.h PA
PATH_SUFFIXES PCSC )
find_library(PCSC_LIBRARY pcsclite PATHS ${PCSC_LIBRARY_DIRS})
+set(PCSC_LIBRARIES ${PCSC_LIBRARY} )
+set(PCSC_INCLUDE_DIRS ${PCSC_INCLUDE_DIR} )
+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSC DEFAULT_MSG PCSC_INCLUDE_DIR PCSC_LIBRARY)
mark_as_advanced(PCSC_INCLUDE_DIR PCSC_LIBRARY)

18
freerdp-fix-bitmap-cache.patch
View File

@ -1,8 +1,8 @@
diff --git a/libfreerdp-cache/bitmap.c b/libfreerdp-cache/bitmap.c
index 99c1005..e3e2303 100644
--- a/libfreerdp-cache/bitmap.c
+++ b/libfreerdp-cache/bitmap.c
@@ -173,9 +173,10 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 inde
Index: freerdp-1.0.1/libfreerdp-cache/bitmap.c
===================================================================
--- freerdp-1.0.1.orig/libfreerdp-cache/bitmap.c
+++ freerdp-1.0.1/libfreerdp-cache/bitmap.c
@@ -162,9 +162,10 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCac
}
if (index == BITMAP_CACHE_WAITING_LIST_INDEX)
@ -16,7 +16,7 @@ index 99c1005..e3e2303 100644
{
printf("get invalid bitmap index %d in cell id: %d\n", index, id);
return NULL;
@@ -195,9 +196,10 @@ void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdp
@@ -184,9 +185,10 @@ void bitmap_cache_put(rdpBitmapCache* bi
}
if (index == BITMAP_CACHE_WAITING_LIST_INDEX)
@ -30,17 +30,17 @@ index 99c1005..e3e2303 100644
{
printf("put invalid bitmap index %d in cell id: %d\n", index, id);
return;
@@ -255,7 +257,8 @@ rdpBitmapCache* bitmap_cache_new(rdpSettings* settings)
@@ -244,7 +246,8 @@ rdpBitmapCache* bitmap_cache_new(rdpSett
for (i = 0; i < (int) bitmap_cache->maxCells; i++)
{
bitmap_cache->cells[i].number = settings->bitmapCacheV2CellInfo[i].numEntries;
- bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * bitmap_cache->cells[i].number);
+ /* allocate an extra entry for BITMAP_CACHE_WAITING_LIST_INDEX */
+ bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * bitmap_cache->cells[i].number + 1);
+ bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * (bitmap_cache->cells[i].number + 1));
}
}
@@ -271,7 +274,7 @@ void bitmap_cache_free(rdpBitmapCache* bitmap_cache)
@@ -260,7 +263,7 @@ void bitmap_cache_free(rdpBitmapCache* b
{
for (i = 0; i < (int) bitmap_cache->maxCells; i++)
{

14
freerdp.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Apr 22 18:07:53 UTC 2012 - gber@opensuse.org
- added freerdp-fix-FindPCSC-macro.patch which fixes the build by
setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly
which are otherwise empty
(https://github.com/FreeRDP/FreeRDP/issues/562)
-------------------------------------------------------------------
Thu Apr 19 15:31:06 UTC 2012 - gber@opensuse.org
- applied fix for a bug in freerdp-fix-bitmap-cache.patch from
upstream git
-------------------------------------------------------------------
Fri Mar 30 12:23:29 UTC 2012 - zawertun@gmail.com

4
freerdp.spec
View File

@ -28,6 +28,8 @@ Url: http://www.freerdp.com/
Source0: https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM freerdp-fix-bitmap-cache.patch zawertun@gmail.com -- Fix a problem with the bitmap cache resulting in garbled images (backported from upstream git)
Patch0: freerdp-fix-bitmap-cache.patch
# PATCH-FIX-UPSTREAM freerdp-fix-FindPCSC-macro.patch https://github.com/FreeRDP/FreeRDP/issues/562 gberh@opensuse.org -- Fix the build by setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly which are otherwise empty
Patch1: freerdp-fix-FindPCSC-macro.patch
BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: ed
@ -76,6 +78,7 @@ based on libfreerdp.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# use a versioned subdirectory for plugins in order to comply with the shared
# library policy
ed -s CMakeLists.txt 2>/dev/null <<'EOF'
@ -98,7 +101,6 @@ cmake \
-DWITH_FFMPEG=OFF \
-DWITH_SSE2=OFF \
..
make %{?_smp_mflags} VERBOSE=1
%install