diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-13 14:16:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-13 14:16:32 +0000 |
| commit | fe430eb80736e934fd81d92e385c15fe5a312ce0 (patch) | |
| tree | d869bee83a4b35629a6e7b8a997f69c02cf7c4b4 /main/freerdp | |
| parent | e340ee3324d582f9d7c97faf08d39551b0f29349 (diff) | |
| download | aports-fe430eb80736e934fd81d92e385c15fe5a312ce0.tar.bz2 aports-fe430eb80736e934fd81d92e385c15fe5a312ce0.tar.xz | |
main/freerdp: build fix for x86_64
we want use /usr/lib instead of /usr/lib64 but at the same time we
don't want install the plugins in /usr/usr/lib
Diffstat (limited to 'main/freerdp')
| -rw-r--r-- | main/freerdp/APKBUILD | 19 | ||||
| -rw-r--r-- | main/freerdp/pluginpath.patch | 11 |
2 files changed, 27 insertions, 3 deletions
diff --git a/main/freerdp/APKBUILD b/main/freerdp/APKBUILD index fa317b818..8c6d169ee 100644 --- a/main/freerdp/APKBUILD +++ b/main/freerdp/APKBUILD @@ -11,11 +11,23 @@ subpackages="$pkgname-dev $pkgname-plugins $pkgname-libs" makedepends="openssl-dev libxcursor-dev cups-dev alsa-lib-dev ffmpeg-dev cups-dev libxkbfile-dev libxinerama-dev libxv-dev libxdamage-dev wget cmake" -source="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz" +source="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz + pluginpath.patch" + +prepare() { + cd "$srcdir"/FreeRDP-FreeRDP-* + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$srcdir"/FreeRDP-FreeRDP-* - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ || return 1 make } @@ -39,4 +51,5 @@ plugins() { mv "$pkgdir"/usr/lib/freerdp "$subpkgdir"/usr/lib/ } -md5sums="1282189a87893bf196da20382e45f6c1 FreeRDP-1.0.1.tar.gz" +md5sums="1282189a87893bf196da20382e45f6c1 FreeRDP-1.0.1.tar.gz +f18b6a675341d8e9755941afd4fc8d82 pluginpath.patch" diff --git a/main/freerdp/pluginpath.patch b/main/freerdp/pluginpath.patch new file mode 100644 index 000000000..4a9349b2c --- /dev/null +++ b/main/freerdp/pluginpath.patch @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt.orig ++++ ./CMakeLists.txt +@@ -127,7 +127,7 @@ + set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps") + + # Path to put plugins +-set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp") ++set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp") + + # Include directories + include_directories(${CMAKE_CURRENT_BINARY_DIR}) |