Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed0c3702a77b1f1bec457c52480c60d1a2930dc1

commit ed0c3702a77b1f1bec457c52480c60d1a2930dc1
Author: Baste <[email protected]>
Date:   Fri Jun 5 09:25:59 2015 +0200

freerdp-1.2.0-1-x86_64
- 0.8.2 -> 1.2.0
- Change m8r

diff --git a/source/xapps/freerdp/FrugalBuild b/source/xapps/freerdp/FrugalBuild
index 037992d..04d9d90 100644
--- a/source/xapps/freerdp/FrugalBuild
+++ b/source/xapps/freerdp/FrugalBuild
@@ -1,17 +1,27 @@
# Compiling Time: 0.05 SBU
-# Maintainer: bouleetbil <[email protected]>
+# Maintainer: Baste <[email protected]>
+# Contributor: bouleetbil <[email protected]>

options+=('asneeded')

pkgname=freerdp
-pkgver=0.8.2
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
pkgdesc="Remote Desktop Protocol cliente"
-depends=('cups' 'openssl' 'libx11' 'libxcursor')
+depends=('cups' 'openssl' 'libx11' 'libxcursor' 'alsa-lib' 'libpulse' \
+       'ffmpeg' 'gst1-plugins-base' 'libxkbfile' 'libxinerama' 'libxrandr')
+makedepends=('xmlto' 'docbook-xsl')
groups=('xapps')
archs=('i686' 'x86_64')
options+=('scriptlet')
-Finclude sourceforge
-sha1sums=('32ea0876357c9906784bd6d8ce6d0a8e7c10ebc4')
+_F_github_name="FreeRDP"
+_F_github_ver="1.2.0-beta1+android9"
+_F_github_tag="yes"
+Finclude github cmake
+_F_cd_path="FreeRDP-1.2.0-beta1-android9"
+_F_cmake_confopts+=" -DWITH_PULSE=ON -DWITH_CUPS=ON -DWITH_JPEG=ON"
+source=($source cmake-list.patch)
+sha1sums=('6b5eff0d0c389a0644c5e473083588ad53d669fe' \
+          '7760611ab12b7d543bb55fef11123d945057ceba')

# optimization OK
diff --git a/source/xapps/freerdp/cmake-list.patch 
b/source/xapps/freerdp/cmake-list.patch
new file mode 100644
index 0000000..46cd55e
--- /dev/null
+++ b/source/xapps/freerdp/cmake-list.patch
@@ -0,0 +1,80 @@
+diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
+index c4e6048..540b1ac 100644
+--- a/channels/CMakeLists.txt
++++ b/channels/CMakeLists.txt
+@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
+ file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
+
+ foreach(FILEPATH ${FILEPATHS})
+-      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
+-              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR 
${FILEPATH})
++      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
++              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR 
${FILEPATH})
+               set(CHANNEL_OPTION)
+               include(${FILEPATH})
+               if(${CHANNEL_OPTION})
+diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
+index 049bc7b..2db18e8 100644
+--- a/channels/client/CMakeLists.txt
++++ b/channels/client/CMakeLists.txt
+@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
+
++if(CHANNEL_STATIC_CLIENT_ENTRIES)
+ list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
++endif()
+
+ foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
+       foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 14ed363..b8b7699 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -63,8 +63,8 @@ set(FILENAME "ModuleOptions.cmake")
+ file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
+
+ foreach(FILEPATH ${FILEPATHS})
+-      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
+-              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" 
FREERDP_CLIENT ${FILEPATH})
++      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
++              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" 
FREERDP_CLIENT ${FILEPATH})
+               set(FREERDP_CLIENT_ENABLED 0)
+               include(${FILEPATH})
+               if(FREERDP_CLIENT_ENABLED)
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 75acf25..f82b6fe 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -44,8 +44,8 @@ set(FILENAME "ModuleOptions.cmake")
+ file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
+
+ foreach(FILEPATH ${FILEPATHS})
+-      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
+-              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" 
FREERDP_SERVER ${FILEPATH})
++      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
++              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" 
FREERDP_SERVER ${FILEPATH})
+               set(FREERDP_SERVER_ENABLED 0)
+               include(${FILEPATH})
+               if(FREERDP_SERVER_ENABLED)
+diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
+index 09b1fd4..610f35e 100644
+--- a/third-party/CMakeLists.txt
++++ b/third-party/CMakeLists.txt
+@@ -22,11 +22,11 @@
+ file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
"*/CMakeLists.txt")
+
+ foreach(dir ${all_valid_subdirs})
+-      if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
+-              string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" 
dir_trimmed ${dir})
++      if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
++              string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" 
dir_trimmed ${dir})
+               message(STATUS "Adding third-party component ${dir_trimmed}")
+               add_subdirectory(${dir_trimmed})
+       endif()
+ endforeach(dir)
+
+-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
+\ No newline at end of file
++set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to