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

Accepting request 205710 from X11:RemoteDesktop

Browse Source 
- Allow build on SLES11:
  * converted pkgconfig() BuildRequires to package names
  * added FindALSA.cmake
  * use 'make install' instead of '%make_install' macro

This is a less intrusive change than the original https://build.opensuse.org/request/show/155396
 (forwarded request 205447 from lnt-sysadmin)

OBS-URL: https://build.opensuse.org/request/show/205710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2013-11-04 13:52:49 +00:00 committed by Git OBS Bridge
commit 41e1692f38
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
FindALSA.cmake Normal file
View File

@ -0,0 +1,46 @@
# - Find alsa
# Find the alsa libraries (asound)
#
# This module defines the following variables:
# ALSA_FOUND - True if ALSA_INCLUDE_DIR & ALSA_LIBRARY are found
# ALSA_LIBRARIES - Set when ALSA_LIBRARY is found
# ALSA_INCLUDE_DIRS - Set when ALSA_INCLUDE_DIR is found
#
# ALSA_INCLUDE_DIR - where to find asoundlib.h, etc.
# ALSA_LIBRARY - the asound library
#
#=============================================================================
# Copyright 2009 Kitware, Inc.
# Copyright 2009 Philip Lowman <philip@yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
find_path(ALSA_INCLUDE_DIR NAMES asoundlib.h
PATH_SUFFIXES alsa
DOC "The ALSA (asound) include directory"
)
find_library(ALSA_LIBRARY NAMES asound
DOC "The ALSA (asound) library"
)
# handle the QUIETLY and REQUIRED arguments and set ALSA_FOUND to TRUE if
# all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALSA DEFAULT_MSG ALSA_LIBRARY ALSA_INCLUDE_DIR)
if(ALSA_FOUND)
set( ALSA_LIBRARIES ${ALSA_LIBRARY} )
set( ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIR} )
endif()
mark_as_advanced(ALSA_INCLUDE_DIR ALSA_LIBRARY)

8
freerdp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 31 17:58:21 UTC 2013 - lnt-sysadmin@lists.lrz.de
- Allow build on SLES11:
* converted pkgconfig() BuildRequires to package names
* added FindALSA.cmake
* use 'make install' instead of '%make_install' macro
-------------------------------------------------------------------
Thu Sep 12 07:03:02 UTC 2013 - crrodriguez@opensuse.org

14
freerdp.spec
View File

@ -26,6 +26,7 @@ License: Apache-2.0
Group: Productivity/Networking/Other
Url: http://www.freerdp.com/
Source0: https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz
Source1: FindALSA.cmake
# 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-pulse-no-device-name.patch bnc#785437 gber@opensuse.org -- Fix a segfault in case device name is not provided
@ -38,10 +39,10 @@ BuildRequires: ed
BuildRequires: xmlto
BuildRequires: xorg-x11-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(libpcsclite)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(openssl)
BuildRequires: alsa-devel
BuildRequires: pcsc-lite-devel
BuildRequires: libpulse-devel
BuildRequires: libopenssl-devel
Recommends: libfreerdp-plugins
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -88,6 +89,9 @@ ed -s CMakeLists.txt 2>/dev/null <<'EOF'
,s/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/freerdp"/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/%{libname}"/
w
EOF
%if 0%{?sles_version} == 11
cp %SOURCE1 cmake/
%endif
%build
mkdir build
@ -110,7 +114,7 @@ make %{?_smp_mflags} VERBOSE=1
%install
cd build
%make_install
make install 'DESTDIR=%{buildroot}'
# remove keymaps as we make use of libxkbfile
# rm -rf $RPM_BUILD_ROOT/usr/share/freerdp/keymaps/