freerdp: bump to 2.0.0-rc0
PATCH 1/1 freerdp: bump to 2.0.0-rc0
Remove patches that has been merged/updated upstream
0001-fix-building-shared-libs.patch:
CmakeLists packages are rewritten.
0002-add-support-for-tz-package:
https://github.com/FreeRDP/FreeRDP/commit/dd93fd2b3de7bef3f4faebfe04448344a0a5ab88
0003-add-missing-define.patch:
https://github.com/FreeRDP/FreeRDP/commit/656b3be02d22a52957903e3c89660ffb0247307b
0004-ffmpeg30.patch:
https://github.com/FreeRDP/FreeRDP/commit/b7b66968f93f6ce75dd06d12638e14029bf3717b
Also add sha256sum for license file.
--- .../freerdp/0001-fix-building-shared-libs.patch | 26 -------- .../freerdp/0002-add-support-for-tz-package.patch | 30 --------- package/freerdp/0003-add-missing-define.patch | 44 ------------- package/freerdp/0004-ffmpeg30.patch | 74 ---------------------- package/freerdp/freerdp.hash | 3 +- package/freerdp/freerdp.mk | 2 +- 6 files changed, 3 insertions(+), 176 deletions(-) delete mode 100644 package/freerdp/0001-fix-building-shared-libs.patch delete mode 100644 package/freerdp/0002-add-support-for-tz-package.patch delete mode 100644 package/freerdp/0003-add-missing-define.patch delete mode 100644 package/freerdp/0004-ffmpeg30.patch
package/freerdp/0001-fix-building-shared-libs.patch deleted +0 -26
@@ -1,26 +0,0 @@ -winpr/tools: fix building shared libs - -libwinpr-makecert-tool.a is used to build libxfreerdp-server.so, so even -if we are building a static libwinpr-makecert-tool.a library, we need to -build it with -fPIC. - -Patch and commit log suggested by Samuel MARTIN. - -Signed-off-by: "Yann E. MORIN" <[email protected]> -Cc: Samuel Martin <[email protected]> - -diff -durN freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt ---- freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt 2014-08-25 06:52:43.000000000 -0700 -+++ freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt 2014-10-24 15:39:39.600319523 -0700 -@@ -37,4 +37,11 @@ - add_subdirectory(cli) - - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") -+ -+if(BUILD_SHARED_LIBS) -+ # build libwinpr-makecert-tool.a with PIC because it is used to build -+ # the shared library libxfreerdp-server.so. -+ set_property(TARGET ${MODULE_NAME} PROPERTY POSITION_INDEPENDENT_CODE TRUE) -+endif() -+ - export_complex_library(LIBNAME ${MODULE_NAME})
package/freerdp/0002-add-support-for-tz-package.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 605d0a85183d2f9d5b0da5629cbadf01173bbb2f Mon Sep 17 00:00:00 2001 -From: Scott Fan <[email protected]> -Date: Mon, 13 Jul 2015 15:01:17 +0800 -Subject: [PATCH] Add support for tz package - -Fixes error message while freerdp connected the remote desktop: -Unable to detect time zone - -Signed-off-by: Scott Fan <[email protected]> ---- - libfreerdp/locale/timezone.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c -index 3070f1f..4a06786 100644 ---- a/libfreerdp/locale/timezone.c -+++ b/libfreerdp/locale/timezone.c -@@ -1539,7 +1539,8 @@ char* freerdp_get_unix_timezone_identifier() - * America/Montreal for example. - */ - -- if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1) -+ if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1 || -+ (len = readlink("/etc/TZ", buf, sizeof(buf) - 1)) != -1) - { - int num = 0; - int pos = len; --- -2.4.5 -
package/freerdp/0003-add-missing-define.patch deleted +0 -44
44 lines not on this page · raw message
package/freerdp/0004-ffmpeg30.patch deleted +0 -74
74 lines not on this page · raw message
package/freerdp/freerdp.hash +2 -1
@@ -1,2 +1,3 @@ # Locally calculated -sha256 1db496cca391f76382ef284db2d0306d5c15bf515ee2c964319c22272d969a32 freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.tar.gz +sha256 68e0e3db638a9cc00b978815d9eabedffc23f4410dcaa7a7548bb751766d5b3e freerdp-2.0.0-rc0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
package/freerdp/freerdp.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ # Changeset on the master branch -FREERDP_VERSION = 17834af7bb378f85a3b3cc4dcadaa5125a337e16 +FREERDP_VERSION = 2.0.0-rc0 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION)) FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0
Signature · 1 line
2.13.6
Thomas Petazzoni
AppliedPATCH 1/1 freerdp: bump to 2.0.0-rc0
Hello,
Quoted 17 lines · Adam Duskett
Remove patches that has been merged/updated upstream
0001-fix-building-shared-libs.patch:
CmakeLists packages are rewritten.0002-add-support-for-tz-package:
https://github.com/FreeRDP/FreeRDP/commit/dd93fd2b3de7bef3f4faebfe04448344a0a5ab880003-add-missing-define.patch:
https://github.com/FreeRDP/FreeRDP/commit/656b3be02d22a52957903e3c89660ffb0247307b0004-ffmpeg30.patch:
https://github.com/FreeRDP/FreeRDP/commit/b7b66968f93f6ce75dd06d12638e14029bf3717bAlso add sha256sum for license file.
Signed-off-by Adam Duskett <[email protected]>
Quoted 12 lines
--- .../freerdp/0001-fix-building-shared-libs.patch | 26 -------- .../freerdp/0002-add-support-for-tz-package.patch | 30 --------- package/freerdp/0003-add-missing-define.patch | 44 ------------- package/freerdp/0004-ffmpeg30.patch | 74 ---------------------- package/freerdp/freerdp.hash | 3 +- package/freerdp/freerdp.mk | 2 +- 6 files changed, 3 insertions(+), 176 deletions(-) delete mode 100644 package/freerdp/0001-fix-building-shared-libs.patch delete mode 100644 package/freerdp/0002-add-support-for-tz-package.patch delete mode 100644 package/freerdp/0003-add-missing-define.patch delete mode 100644 package/freerdp/0004-ffmpeg30.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com