/[gentoo-x86]/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Oct 4 20:33:58 2010 UTC (3 years, 11 months ago) by mgorny
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Replace the tslib build patch with a set of new patches in order to fix bug #318609. The first patch fixes linking with tslib whenever pkg-config fails to find it but fallback check does. The second one fixes overall linking with tslib whenever -Wl,--as-needed is used.

(Portage version: 2.2_rc88_p86/cvs/Linux x86_64)

1 --- configure.ac 2010-03-16 22:24:14.000000000 +0100
2 +++ configure.ac.new 2010-03-16 22:33:10.000000000 +0100
3 @@ -1915,8 +1915,14 @@
4 AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
5 fi
6
7 -
8 - PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
9 +dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
10 + PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
11 + PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
12 + PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
13 + HAVE_TSLIB="no"
14 + ])
15 + ])
16 + ])
17 if test "x$HAVE_TSLIB" = xno; then
18 AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
19 fi

  ViewVC Help
Powered by ViewVC 1.1.20