diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-07 16:00:45 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-08 14:34:37 +0200 |
| commit | 03717096632d983e96b00d949409798017aca3cd (patch) | |
| tree | 6d8d67fbf1cc02885e945d7e32e9c018a43f7066 /patches | |
| parent | a8a97ed6f44f622eeaa9ad89ccb4b985aeb6f209 (diff) | |
| download | ptxdist-03717096632d983e96b00d949409798017aca3cd.tar.gz ptxdist-03717096632d983e96b00d949409798017aca3cd.tar.xz | |
[xorg-driver-video-ati] version bump 6.12.4 -> 6.13.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| l--------- | patches/xf86-video-ati-6.12.4/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff | 56 | ||||
| -rw-r--r-- | patches/xf86-video-ati-6.12.4/series | 1 |
3 files changed, 0 insertions, 58 deletions
diff --git a/patches/xf86-video-ati-6.12.4/autogen.sh b/patches/xf86-video-ati-6.12.4/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/xf86-video-ati-6.12.4/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff b/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff deleted file mode 100644 index 07f139271..000000000 --- a/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff +++ /dev/null @@ -1,56 +0,0 @@ -commit 97a4e747bfac14f34646c55ddf639e8fe22f2f55 -Author: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sun Sep 20 14:19:41 2009 +0200 - - use AC_CHECK_HEADER instead of AC_CHECK_FILE - - AC_CHECK_FILE is not possible when cross-compiling. Use AC_CHECK_HEADER / - AC_PREPROC_IFELSE instead. - - [ Michel Dänzer: Shuffled things around slightly to make it work on my setup ] - - Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - Signed-off-by: Michel Dänzer <daenzer@vmware.com> - -diff --git a/configure.ac b/configure.ac -index 9d769ea..162c839 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,14 +102,21 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) - AC_HEADER_STDC - - if test "$DRI" != no; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -- [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -- [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -- [have_dristruct_h="yes"], [have_dristruct_h="no"]) -- AC_CHECK_FILE([${sdkdir}/damage.h], -- [have_damage_h="yes"], [have_damage_h="no"]) -+ PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS" -+ AC_CHECK_HEADER([dri.h], -+ [have_dri_h="yes"], [have_dri_h="no"],[-]) -+ AC_CHECK_HEADER([sarea.h], -+ [have_sarea_h="yes"], [have_sarea_h="no"],[-]) -+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -+#include <xorg-server.h> -+#include <dristruct.h> -+ ]])], -+ [have_dristruct_h="yes"], [have_dristruct_h="no"],[-]) -+ AC_CHECK_HEADER([damage.h], -+ [have_damage_h="yes"], [have_damage_h="no"],[-]) -+ CPPFLAGS="$save_CPPFLAGS" - fi - - AC_MSG_CHECKING([whether to include DRI support]) -@@ -126,7 +133,6 @@ AC_MSG_RESULT([$DRI]) - - AM_CONDITIONAL(DRI, test x$DRI = xyes) - if test "$DRI" = yes; then -- PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) - AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) - if test "$have_damage_h" = yes; then diff --git a/patches/xf86-video-ati-6.12.4/series b/patches/xf86-video-ati-6.12.4/series deleted file mode 100644 index e247c86cc..000000000 --- a/patches/xf86-video-ati-6.12.4/series +++ /dev/null @@ -1 +0,0 @@ -fix-cross-compiling.diff |