OLD | NEW |
1 # Copyright 1999-2010 Gentoo Foundation | 1 # Copyright 1999-2010 Gentoo Foundation |
2 # Distributed under the terms of the GNU General Public License v2 | 2 # Distributed under the terms of the GNU General Public License v2 |
3 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild
,v 1.1 2010/03/17 15:35:54 scarabeus Exp $ | 3 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild
,v 1.1 2010/03/17 15:35:54 scarabeus Exp $ |
4 | 4 |
5 EAPI="2" | 5 EAPI="2" |
6 | 6 |
7 # Must be before x-modular eclass is inherited | 7 # Must be before x-modular eclass is inherited |
8 SNAPSHOT="yes" | 8 SNAPSHOT="yes" |
9 | 9 |
10 inherit x-modular multilib versionator | 10 inherit x-modular multilib versionator |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 EPATCH_SUFFIX="patch" | 119 EPATCH_SUFFIX="patch" |
120 | 120 |
121 # These have been sent upstream | 121 # These have been sent upstream |
122 UPSTREAMED_PATCHES=( | 122 UPSTREAMED_PATCHES=( |
123 #"${WORKDIR}/patches/" | 123 #"${WORKDIR}/patches/" |
124 | 124 |
125 # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400 | 125 # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400 |
126 "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grab
s-add-th.patch" | 126 "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grab
s-add-th.patch" |
127 # Fix for bug #304067 | 127 # Fix for bug #304067 |
128 "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch" | 128 "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch" |
129 # coming from 1.8 branch | 129 » # coming from 1.8 branch |
130 "${FILESDIR}/1.7.6-glx-1.4.patch" | 130 "${FILESDIR}/1.7.6-glx-1.4.patch" |
| 131 # merged upstream; see |
| 132 # http://www.mail-archive.com/xorg-devel@lists.x.org/msg11717.html |
| 133 "${FILESDIR}/1.7.6-fix-xkb-redirect-key.patch" |
131 ) | 134 ) |
132 | 135 |
133 PATCHES=( | 136 PATCHES=( |
134 "${UPSTREAMED_PATCHES[@]}" | 137 "${UPSTREAMED_PATCHES[@]}" |
135 # Fix for bug http://bugs.freedesktop.org/show_bug.cgi?id=27023 | 138 # Fix for bug http://bugs.freedesktop.org/show_bug.cgi?id=27023 |
136 "${FILESDIR}/1.7.6-fix-wrong-bracket-values.patch" | 139 "${FILESDIR}/1.7.6-fix-wrong-bracket-values.patch" |
137 # Allow usage of monotonic clock while cross-compiling | 140 # Allow usage of monotonic clock while cross-compiling |
138 "${FILESDIR}/monotonic-clock-fix.patch" | 141 "${FILESDIR}/monotonic-clock-fix.patch" |
139 "${FILESDIR}/1.7.6-cache-xkbcomp-for-fast-start-up.patch" | 142 "${FILESDIR}/1.7.6-cache-xkbcomp-for-fast-start-up.patch" |
140 # Make the root window get created without a background so we can get | 143 # Make the root window get created without a background so we can get |
141 # seamless transitions when X starts. This looks like it may be upstrea
med | 144 # seamless transitions when X starts. This looks like it may be upstrea
med |
142 # soon (as a -nr flag; we just enable it by default so we can use the sa
me | 145 # soon (as a -nr flag; we just enable it by default so we can use the sa
me |
143 # command line for older X servers): | 146 # command line for older X servers): |
144 # http://www.mail-archive.com/xorg-devel@lists.x.org/msg09360.html | 147 # http://www.mail-archive.com/xorg-devel@lists.x.org/msg09360.html |
145 "${FILESDIR}/1.7.6-xserver-bg-none-root.patch" | 148 "${FILESDIR}/1.7.6-xserver-bg-none-root.patch" |
146 "${FILESDIR}/1.7.6-skip-vendor-and-device-names.patch" | 149 "${FILESDIR}/1.7.6-skip-vendor-and-device-names.patch" |
147 "${FILESDIR}/1.7.6-export-Xi-to-core.patch" | 150 "${FILESDIR}/1.7.6-export-Xi-to-core.patch" |
148 "${FILESDIR}/1.7.6-composite-redirect-events.patch" | 151 "${FILESDIR}/1.7.6-composite-redirect-events.patch" |
149 "${FILESDIR}/1.7.6-no-exposure-for-redirect.patch" | 152 "${FILESDIR}/1.7.6-no-exposure-for-redirect.patch" |
150 "${FILESDIR}/1.7.6-always-send-visibility.patch" | 153 "${FILESDIR}/1.7.6-always-send-visibility.patch" |
| 154 "${FILESDIR}/1.7.6-fix-xkb-autorepeat.patch" |
151 ) | 155 ) |
152 | 156 |
153 pkg_setup() { | 157 pkg_setup() { |
154 use minimal || ensure_a_server_is_building | 158 use minimal || ensure_a_server_is_building |
155 | 159 |
156 # SDL only available in kdrive build | 160 # SDL only available in kdrive build |
157 if use kdrive && use sdl; then | 161 if use kdrive && use sdl; then |
158 conf_opts="${conf_opts} --enable-xsdl" | 162 conf_opts="${conf_opts} --enable-xsdl" |
159 else | 163 else |
160 conf_opts="${conf_opts} --disable-xsdl" | 164 conf_opts="${conf_opts} --disable-xsdl" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 } | 279 } |
276 | 280 |
277 ensure_a_server_is_building() { | 281 ensure_a_server_is_building() { |
278 for server in ${IUSE_SERVERS}; do | 282 for server in ${IUSE_SERVERS}; do |
279 use ${server} && return; | 283 use ${server} && return; |
280 done | 284 done |
281 eerror "You need to specify at least one server to build." | 285 eerror "You need to specify at least one server to build." |
282 eerror "Valid servers are: ${IUSE_SERVERS}." | 286 eerror "Valid servers are: ${IUSE_SERVERS}." |
283 die "No servers were specified to build." | 287 die "No servers were specified to build." |
284 } | 288 } |
OLD | NEW |