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

Accepting request 149922 from home:kwk:branches:X11:RemoteDesktop

Browse Source 
- update to 1.0.2
  - bugfix release (no changelog posted)
  - drop patches that are upstream

OBS-URL: https://build.opensuse.org/request/show/149922
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=36
This commit is contained in:
Dirk Mueller 2013-01-28 16:36:51 +00:00 committed by Git OBS Bridge
parent f4f4f3dc1f
commit 54346a37fe
7 changed files with 13 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freerdp-1.0.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:144175e46a6bd01eea6f1f4f8fc9f33f802733bb06c1f05b5083d58b11df79e0
size 3502100

3
freerdp-1.0.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1
size 3506618

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

@ -1,51 +0,0 @@
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)
- index = bitmap_cache->cells[id].number - 1;
-
- if (index > bitmap_cache->cells[id].number)
+ {
+ index = bitmap_cache->cells[id].number;
+ }
+ else if (index > bitmap_cache->cells[id].number)
{
printf("get invalid bitmap index %d in cell id: %d\n", index, id);
return NULL;
@@ -184,9 +185,10 @@ void bitmap_cache_put(rdpBitmapCache* bi
}
if (index == BITMAP_CACHE_WAITING_LIST_INDEX)
- index = bitmap_cache->cells[id].number - 1;
-
- if (index > bitmap_cache->cells[id].number)
+ {
+ index = bitmap_cache->cells[id].number;
+ }
+ else if (index > bitmap_cache->cells[id].number)
{
printf("put invalid bitmap index %d in cell id: %d\n", index, id);
return;
@@ -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));
}
}
@@ -260,7 +263,7 @@ void bitmap_cache_free(rdpBitmapCache* b
{
for (i = 0; i < (int) bitmap_cache->maxCells; i++)
{
- for (j = 0; j < (int) bitmap_cache->cells[i].number; j++)
+ for (j = 0; j < (int) bitmap_cache->cells[i].number + 1; j++)
{
bitmap = bitmap_cache->cells[i].entries[j];

12
freerdp-fix-incorrect-numlock-state.patch
View File

@ -1,12 +0,0 @@
--- freerdp-1.0.1.orig/libfreerdp-core/connection.c 2012-02-10 06:01:42.000000000 +0400
+++ freerdp-1.0.1/libfreerdp-core/connection.c 2012-04-29 17:45:40.317494115 +0400
@@ -489,9 +489,6 @@
return false;
if (!rdp_send_client_control_pdu(rdp, CTRLACTION_REQUEST_CONTROL))
return false;
-
- rdp->input->SynchronizeEvent(rdp->input, 0);
-
if (!rdp_send_client_persistent_key_list_pdu(rdp))
return false;
if (!rdp_send_client_font_list_pdu(rdp, FONTLIST_FIRST | FONTLIST_LAST))

53
freerdp-fix-linking-with-libpulse.patch
View File

@ -1,53 +0,0 @@
From c10866db66c0d462ea7c2c38bb01740bcfb4fcb4 Mon Sep 17 00:00:00 2001
From: Slava Dubrovskiy <dubrsl@altlinux.org>
Date: Tue, 14 Feb 2012 13:44:00 -0500
Subject: [PATCH 002/939] Fix not linked with libpulse (issue 418)
Signed-off-by: Slava Dubrovskiy <dubrsl@altlinux.org>
---
channels/drdynvc/audin/pulse/CMakeLists.txt | 2 +-
channels/drdynvc/tsmf/pulse/CMakeLists.txt | 2 +-
channels/rdpsnd/pulse/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/channels/drdynvc/audin/pulse/CMakeLists.txt b/channels/drdynvc/audin/pulse/CMakeLists.txt
index 10d6afe..fd6e25e 100644
--- a/channels/drdynvc/audin/pulse/CMakeLists.txt
+++ b/channels/drdynvc/audin/pulse/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(audin_pulse ${AUDIN_PULSE_SRCS})
set_target_properties(audin_pulse PROPERTIES PREFIX "")
target_link_libraries(audin_pulse freerdp-utils)
-target_link_libraries(audin_pulse ${PULSE_LIBRARIES})
+target_link_libraries(audin_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS audin_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff --git a/channels/drdynvc/tsmf/pulse/CMakeLists.txt b/channels/drdynvc/tsmf/pulse/CMakeLists.txt
index 373d4d3..144b5ff 100644
--- a/channels/drdynvc/tsmf/pulse/CMakeLists.txt
+++ b/channels/drdynvc/tsmf/pulse/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(tsmf_pulse ${TSMF_PULSE_SRCS})
set_target_properties(tsmf_pulse PROPERTIES PREFIX "")
target_link_libraries(tsmf_pulse freerdp-utils)
-target_link_libraries(tsmf_pulse ${PULSE_LIBRARIES})
+target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS tsmf_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff --git a/channels/rdpsnd/pulse/CMakeLists.txt b/channels/rdpsnd/pulse/CMakeLists.txt
index 4460daf..bac3e51 100644
--- a/channels/rdpsnd/pulse/CMakeLists.txt
+++ b/channels/rdpsnd/pulse/CMakeLists.txt
@@ -28,6 +28,6 @@ add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS})
set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_pulse freerdp-utils)
-target_link_libraries(rdpsnd_pulse ${PULSE_LIBRARIES})
+target_link_libraries(rdpsnd_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS rdpsnd_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
--
1.7.10.4

7
freerdp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 24 14:42:37 UTC 2013 - kkaempf@suse.com
- update to 1.0.2
- bugfix release (no changelog posted)
- drop patches that are upstream
-------------------------------------------------------------------
Fri Dec 28 21:59:58 UTC 2012 - dmueller@suse.com

15
freerdp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package freerdp
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,21 +19,15 @@
%define libname libfreerdp-1_0
Name: freerdp
Version: 1.0.1
Version: 1.0.2
Release: 0
Summary: Remote Desktop Viewer Client
License: Apache-2.0
Group: Productivity/Networking/Other
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
# PATCH-FIX-UPSTREAM freerdp-fix-numlock-behavior.patch https://github.com/FreeRDP/FreeRDP/pull/564 zawertun@gmail.com -- Fix incorrect num lock state when connecting
Patch2: freerdp-fix-incorrect-numlock-state.patch
# PATCH-FIX-UPSTREAM freerdp-fix-linking-with-libpulse.patch https://github.com/FreeRDP/FreeRDP/issues/418 gber@opensuse.org -- Link the pulseaudio plugins with libpulse
Patch3: freerdp-fix-linking-with-libpulse.patch
# PATCH-FIX-UPSTREAM freerdp-fix-pulse-no-device-name.patch bnc#785437 gber@opensuse.org -- Fix a segfault in case device name is not provided
Patch4: freerdp-handle-null-device-name.patch
BuildRequires: cmake
@ -82,11 +76,8 @@ This package contains development files necessary for developing applications
based on libfreerdp.
%prep
%setup -q
%patch0 -p1
%setup -q -n FreeRDP-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# use a versioned subdirectory for plugins in order to comply with the shared
# library policy