Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Wulf Krueger (philantrop)" <philantrop@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.0.2-alsa-optional.patch kdelibs-4.0.2-X11-optional.patch
Date: Tue, 11 Mar 2008 02:53:55
Message-Id: E1JYrUa-0001MV-W8@stork.gentoo.org
1 philantrop 08/03/10 23:33:16
2
3 Added: kdelibs-4.0.2-alsa-optional.patch
4 kdelibs-4.0.2-X11-optional.patch
5 Log:
6 Version bump to KDE 4.0.2.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.1 kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch?rev=1.1&content-type=text/plain
14
15 Index: kdelibs-4.0.2-alsa-optional.patch
16 ===================================================================
17 --- a/cmake/modules/FindAlsa.cmake
18 +++ b/cmake/modules/FindAlsa.cmake
19 @@ -13,10 +13,14 @@
20 # Redistribution and use is allowed according to the terms of the BSD license.
21 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
22
23 +OPTION(WITH_Alsa "Support for the ALSA sound system." ON)
24 +
25 include(CheckIncludeFiles)
26 include(CheckIncludeFileCXX)
27 include(CheckLibraryExists)
28
29 +if(WITH_Alsa)
30 +
31 # Already done by toplevel
32 find_library(ASOUND_LIBRARY asound)
33 check_library_exists(asound snd_seq_create_simple_port ${ASOUND_LIBRARY} HAVE_LIBASOUND2)
34 @@ -29,19 +33,22 @@
35
36 find_path(ALSA_INCLUDES alsa/version.h)
37
38 +endif(WITH_Alsa)
39 +
40 macro(ALSA_VERSION_STRING _result)
41 # check for version in alsa/version.h
42 - if(ALSA_INCLUDES)
43 + if(WITH_Alsa AND ALSA_INCLUDES)
44 file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT)
45 string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT})
46 - else(ALSA_INCLUDES)
47 + else(WITH_Alsa AND ALSA_INCLUDES)
48 message(STATUS "ALSA version not known. ALSA output will probably not work correctly.")
49 - endif(ALSA_INCLUDES)
50 + endif(WITH_Alsa AND ALSA_INCLUDES)
51 endmacro(ALSA_VERSION_STRING _result)
52
53
54 get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
55 macro(ALSA_CONFIGURE_FILE _destFile)
56 + if(WITH_Alsa)
57 check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
58 check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H)
59
60 @@ -58,6 +65,7 @@
61 set(HAVE_SND_PCM_RESUME 1)
62 endif(ASOUND_HAS_SND_PCM_RESUME)
63
64 + endif(WITH_Alsa)
65 configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile})
66 endmacro(ALSA_CONFIGURE_FILE _destFile)
67
68
69
70
71 1.1 kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch
72
73 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch?rev=1.1&view=markup
74 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch?rev=1.1&content-type=text/plain
75
76 Index: kdelibs-4.0.2-X11-optional.patch
77 ===================================================================
78 cmake/modules/FindX11.cmake | 44 +++++++++++++++++++++++++++++++++++++-----
79 1 files changed, 38 insertions(+), 6 deletions(-)
80
81 diff --git a/cmake/modules/FindX11.cmake b/cmake/modules/FindX11.cmake
82 index 5fdbe82..b56f594 100644
83 --- a/cmake/modules/FindX11.cmake
84 +++ b/cmake/modules/FindX11.cmake
85 @@ -39,6 +39,34 @@
86 # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
87 # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
88
89 +
90 +# Look for an optional X11 package, and provide a cmake switch to disable searching for it.
91 +#
92 +# Example usage: FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
93 +# which provides: `cmake -DWITH_X11_Xinerama=OFF` to disable the check.
94 +#
95 +# You need to pass a header _and_ a library, in that order.
96 +MACRO (FIND_X11 _name _header _library )
97 + OPTION(WITH_${_name} "Search for X11 package ${_name}" ON)
98 +
99 + IF (WITH_${_name})
100 + FIND_PATH(${_name}_INCLUDE_PATH ${_header} ${X11_INC_SEARCH_PATH})
101 +
102 + FIND_LIBRARY(${_name}_LIB ${_library} ${X11_LIB_SEARCH_PATH})
103 +
104 + IF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
105 + SET(${_name}_FOUND TRUE)
106 + SET(_temp ${${_name}_INCLUDE_PATH})
107 + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${_temp})
108 + ENDIF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
109 +
110 + ELSE (WITH_${_name})
111 + SET(${_name}_FOUND FALSE CACHE BOOL "${_name} found")
112 + SET(${_name}_LIB NOTFOUND CACHE FILEPATH "Path to ${_name} library")
113 + SET(${_name}_INCLUDE_PATH NOTFOUND CACHE PATH "Path to ${_name}")
114 + ENDIF (WITH_${_name})
115 +ENDMACRO (FIND_X11)
116 +
117 IF (UNIX)
118 SET(X11_FOUND 0)
119 # X11 is never a framework and some header files may be
120 @@ -75,7 +103,7 @@ IF (UNIX)
121 FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h ${X11_INC_SEARCH_PATH})
122 FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH})
123 FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h ${X11_INC_SEARCH_PATH})
124 - FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH})
125 + #FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH})
126 FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH})
127 FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH})
128 FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH})
129 @@ -84,7 +112,7 @@ IF (UNIX)
130 FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH})
131 FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH})
132 FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH})
133 - FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH})
134 + #FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH})
135 FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH})
136 FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH})
137 FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h ${X11_INC_SEARCH_PATH})
138 @@ -94,7 +122,7 @@ IF (UNIX)
139 FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH})
140 FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH})
141 FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH})
142 - FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
143 + #FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
144 FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h ${X11_INC_SEARCH_PATH})
145 FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH})
146 FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h ${X11_INC_SEARCH_PATH})
147 @@ -107,25 +135,29 @@ IF (UNIX)
148 # Find additional X libraries. Keep list sorted by library name.
149 FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH})
150 FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH})
151 - FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
152 + #FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
153 FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH})
154 FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH})
155 FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH})
156 FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH})
157 FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH})
158 FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH})
159 - FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH})
160 + #FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH})
161 FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH})
162 FIND_LIBRARY(X11_Xkbfile_LIB xkbfile ${X11_LIB_SEARCH_PATH})
163 FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH})
164 FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH})
165 FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH})
166 - FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH})
167 + #FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH})
168 FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH})
169 FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH})
170 FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH})
171 FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH})
172
173 + FIND_X11(X11_Xcomposite X11/extensions/Xcomposite.h Xcomposite)
174 + FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
175 + FIND_X11(X11_Xscreensaver X11/extensions/scrnsaver.h Xss)
176 +
177 SET(X11_LIBRARY_DIR "")
178 IF(X11_X11_LIB)
179 GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH)
180
181
182
183 --
184 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups