diff options
| -rw-r--r-- | network/freerdp/freerdp.SlackBuild | 23 | ||||
| -rw-r--r-- | network/freerdp/freerdp.info | 6 | ||||
| -rw-r--r-- | network/freerdp/patches/freerdp-cmake-3.1.patch | 98 |
3 files changed, 8 insertions, 119 deletions
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild index f3ce3deea5..cfdefedd5f 100644 --- a/network/freerdp/freerdp.SlackBuild +++ b/network/freerdp/freerdp.SlackBuild @@ -4,8 +4,8 @@ # free implementation of the Remote Desktop Protocol # Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil -# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands # Copyright 2015 Mario Preksavec <mario@slackware.hr> +# Copyright 2015-2016 Philip van der Hoeven, Almere, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,20 +27,11 @@ PRGNAM=freerdp -VERSION=${VERSION:-1.2.0_beta1_android9} -BUILD=${BUILD:-4} +VERSION=${VERSION:-git20160509} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -TARNAME=${VERSION%_*}+${VERSION##*_} -TARNAME=${TARNAME/_/-}.tar.gz -DIRNAME=FreeRDP-${VERSION//_/-} - -# If the source is downloaded with a browser or content_disposition set the -# filename is different. -ALTTARNAME=FreeRDP-${VERSION//_/-}.tar.gz -if [ -f $ALTTARNAME ]; then - TARNAME=$ALTTARNAME -fi +DIRNAME=FreeRDP-master if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,7 +72,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $DIRNAME -tar xvf $CWD/$TARNAME +tar xvf $CWD/freerdp-$VERSION.tar.gz cd $DIRNAME chown -R root:root . find -L . \ @@ -90,15 +81,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Patch for cmake 3.1. Thanks to Mario Preksavec and Christoph Willing. -patch -p1 <$CWD/patches/freerdp-cmake-3.1.patch - mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0)" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWITH_CUPS=ON \ -DWITH_FFMPEG=$WITH_FFMPEG \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info index dad3a4b913..2fa7e8c7e9 100644 --- a/network/freerdp/freerdp.info +++ b/network/freerdp/freerdp.info @@ -1,8 +1,8 @@ PRGNAM="freerdp" -VERSION="1.2.0_beta1_android9" +VERSION="git20160509" HOMEPAGE="http://www.freerdp.com/" -DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/1.2.0-beta1+android9.tar.gz" -MD5SUM="a4a0a4f6e69c871aeab0600091ca6118" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/freerdp/freerdp-git20160509.tar.gz" +MD5SUM="93c2ee23a95837b00bdc2b94010c684a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" diff --git a/network/freerdp/patches/freerdp-cmake-3.1.patch b/network/freerdp/patches/freerdp-cmake-3.1.patch deleted file mode 100644 index 462fb56396..0000000000 --- a/network/freerdp/patches/freerdp-cmake-3.1.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 -From: Bernhard Miklautz <bernhard.miklautz@shacknet.at> -Date: Fri, 12 Dec 2014 18:26:45 +0100 -Subject: [PATCH] build: cmake 3.1 compatibility - -* fix problem with REMOVE_DUPLICATES on undefined lists -* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as - previously - necessary adoptions for regex and matches done. Should - work with all cmake versions. - -Tested with 3.1.0-rc3 ---- - channels/CMakeLists.txt | 4 ++-- - channels/client/CMakeLists.txt | 2 ++ - client/CMakeLists.txt | 4 ++-- - server/CMakeLists.txt | 4 ++-- - third-party/CMakeLists.txt | 6 +++--- - 5 files changed, 11 insertions(+), 9 deletions(-) - -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 cda14ba..ee9458e 100644 ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -48,8 +48,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) |