From 1cec64dea7f4d13224a1fa35f2ae36421b8bb0fa99ede711dd8244f77eed0b02 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 20 Apr 2012 15:47:44 +0000 Subject: [PATCH 1/2] Accepting request 114877 from home:gberh:branches:X11:RemoteDesktop OBS-URL: https://build.opensuse.org/request/show/114877 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=19 --- freerdp-fix-bitmap-cache.patch | 18 +++++++++--------- freerdp.changes | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/freerdp-fix-bitmap-cache.patch b/freerdp-fix-bitmap-cache.patch index 960f2a3..10dda4e 100644 --- a/freerdp-fix-bitmap-cache.patch +++ b/freerdp-fix-bitmap-cache.patch @@ -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++) { diff --git a/freerdp.changes b/freerdp.changes index 44d0990..34ae2cd 100644 --- a/freerdp.changes +++ b/freerdp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 From 068fd6ece3d21b4620d9b7e0c7ff1c6ebdcb3787ca9992a60af3bc34d73b0b60 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 22 Apr 2012 18:12:52 +0000 Subject: [PATCH 2/2] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=20 --- freerdp-fix-FindPCSC-macro.patch | 14 ++++++++++++++ freerdp.changes | 8 ++++++++ freerdp.spec | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 freerdp-fix-FindPCSC-macro.patch diff --git a/freerdp-fix-FindPCSC-macro.patch b/freerdp-fix-FindPCSC-macro.patch new file mode 100644 index 0000000..186e16f --- /dev/null +++ b/freerdp-fix-FindPCSC-macro.patch @@ -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) diff --git a/freerdp.changes b/freerdp.changes index 34ae2cd..2c207cb 100644 --- a/freerdp.changes +++ b/freerdp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/freerdp.spec b/freerdp.spec index db2fe72..83780e0 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -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