commit freerdp for openSUSE:Factory

24 Apr 2012

Hello community,

here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2012-04-23 17:40:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freerdp (Old)
 and      /work/SRC/openSUSE:Factory/.freerdp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "freerdp", Maintainer is "LZWang@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes	2012-04-02 19:52:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.freerdp.new/freerdp.changes	2012-04-23 17:40:03.000000000 +0200
@@ -1,0 +2,14 @@
+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
+
+-------------------------------------------------------------------

New:
----
  freerdp-fix-FindPCSC-macro.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ freerdp.spec ++++++
--- /var/tmp/diff_new_pack.wxFkzK/_old	2012-04-23 17:40:05.000000000 +0200
+++ /var/tmp/diff_new_pack.wxFkzK/_new	2012-04-23 17:40:05.000000000 +0200
@@ -28,6 +28,8 @@
 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 @@
 %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 @@
     -DWITH_FFMPEG=OFF \
     -DWITH_SSE2=OFF \
     ..
-
 make %{?_smp_mflags} VERBOSE=1
 
 %install

++++++ freerdp-fix-FindPCSC-macro.patch ++++++
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)
++++++ freerdp-fix-bitmap-cache.patch ++++++
--- /var/tmp/diff_new_pack.wxFkzK/_old	2012-04-23 17:40:05.000000000 +0200
+++ /var/tmp/diff_new_pack.wxFkzK/_new	2012-04-23 17:40:05.000000000 +0200
@@ -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 @@
  	{
  		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 @@
  	{
  		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++)
  		{

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)