diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-12-19 13:20:47 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-12-19 13:20:47 +0000 |
| commit | 986dc4841dad978c18a8b908e9244e013b753c55 (patch) | |
| tree | 39d5896c653e92e091d4801eb086594fe663a7bd /patches | |
| parent | 1b6d4c46408679914a310094ef8ed46224538dc6 (diff) | |
| download | ptxdist-986dc4841dad978c18a8b908e9244e013b753c55.tar.gz ptxdist-986dc4841dad978c18a8b908e9244e013b753c55.tar.xz | |
* generic/vesa.diff, generic/series:
removed pkg-config --variable hacks
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6531 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series | 1 | ||||
| -rw-r--r-- | patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff | 47 |
2 files changed, 13 insertions, 35 deletions
diff --git a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series b/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series new file mode 100644 index 000000000..3549e2472 --- /dev/null +++ b/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series @@ -0,0 +1 @@ +vesa.diff diff --git a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff b/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff index bb85bf4b4..fc2d912bc 100644 --- a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff +++ b/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff @@ -16,52 +16,29 @@ # not mentioned upstream # ---- xf86-video-vesa-X11R7.1-1.2.0.orig/configure.ac 2006-05-19 21:10:12.000000000 +0200 -+++ xf86-video-vesa-X11R7.1-1.2.0/configure.ac 2006-06-21 11:02:32.160781855 +0200 -@@ -57,7 +57,7 @@ +Index: xf86-video-vesa-X11R7.1-1.2.0/configure.ac +=================================================================== +--- xf86-video-vesa-X11R7.1-1.2.0.orig/configure.ac ++++ xf86-video-vesa-X11R7.1-1.2.0/configure.ac +@@ -57,7 +57,7 @@ PKG_CHECK_MODULES(XORG, xorg-server >= 1 sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' -+INCLUDES="$XORG_INCS -I${SYSROOT}${sdkdir} "'-I$(top_srcdir)/src '"-I${SYSROOT}$(prefix)/include" ++INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) ---- xf86-video-vesa-X11R7.1-1.2.0.orig/configure 2006-05-22 15:59:51.000000000 +0200 -+++ xf86-video-vesa-X11R7.1-1.2.0/configure 2006-06-21 11:00:27.279117106 +0200 -@@ -19502,7 +19502,7 @@ - # Checks for extensions - - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I${SYSROOT}`pkg-config --variable=sdkdir xorg-server`" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19564,7 +19564,7 @@ - - - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I${SYSROOT}`pkg-config --variable=sdkdir xorg-server`" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19626,7 +19626,7 @@ - - - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I${SYSROOT}`pkg-config --variable=sdkdir xorg-server`" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19907,7 +19907,7 @@ +Index: xf86-video-vesa-X11R7.1-1.2.0/configure +=================================================================== +--- xf86-video-vesa-X11R7.1-1.2.0.orig/configure ++++ xf86-video-vesa-X11R7.1-1.2.0/configure +@@ -19907,7 +19907,7 @@ fi sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' -+INCLUDES="$XORG_INCS -I${SYSROOT}${sdkdir} "'-I$(top_srcdir)/src '"-I${SYSROOT}$(prefix)/include" ++INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include' |