archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
PKGBUILDs/extra/xf86-video-intel-legacy/intel-newserver.patch
root 78023b9bd8 Added new extra vanilla PKGBUILDs
2009-10-09 21:23:22 -05:00

171 lines
7 KiB
Diff
Raw Blame History

diff -ruN xf86-video-intel-2.3.2/configure xf86-video-intel.patched/configure
--- xf86-video-intel-2.3.2/configure 2008-06-18 04:26:05.000000000 +0200
+++ xf86-video-intel.patched/configure 2009-04-06 09:24:57.000000000 +0200
@@ -22530,12 +22530,12 @@
pkg_cv_DRI_MM_CFLAGS="$DRI_MM_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm = 2.3.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm = 2.3.1") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.3.1" 2>/dev/null`
+ pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm = 2.3.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22548,12 +22548,12 @@
pkg_cv_DRI_MM_LIBS="$DRI_MM_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm = 2.3.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm = 2.3.1") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.3.1" 2>/dev/null`
+ pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm = 2.3.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22572,9 +22572,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
+ DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm = 2.3.1"`
else
- DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
+ DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm = 2.3.1"`
fi
# Put the nasty error message in config.log where it belongs
echo "$DRI_MM_PKG_ERRORS" >&5
diff -ruN xf86-video-intel-2.3.2/configure.ac xf86-video-intel.patched/configure.ac
--- xf86-video-intel-2.3.2/configure.ac 2008-06-18 04:25:52.000000000 +0200
+++ xf86-video-intel.patched/configure.ac 2009-04-06 09:24:20.000000000 +0200
@@ -200,7 +200,7 @@
PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no])
+ PKG_CHECK_MODULES(DRI_MM, [libdrm = 2.3.1],[DRI_MM=yes], [DRI_MM=no])
if test "x$DRI_MM" = xyes; then
AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
fi
diff -ruN xf86-video-intel-2.3.2/src/i830_common.h xf86-video-intel.patched/src/i830_common.h
--- xf86-video-intel-2.3.2/src/i830_common.h 2008-03-26 02:15:45.000000000 +0100
+++ xf86-video-intel.patched/src/i830_common.h 2009-04-06 09:12:04.000000000 +0200
@@ -124,14 +124,14 @@
unsigned int rotated_tiled;
unsigned int rotated2_tiled;
- int planeA_x;
- int planeA_y;
- int planeA_w;
- int planeA_h;
- int planeB_x;
- int planeB_y;
- int planeB_w;
- int planeB_h;
+ int pipeA_x;
+ int pipeA_y;
+ int pipeA_w;
+ int pipeA_h;
+ int pipeB_x;
+ int pipeB_y;
+ int pipeB_w;
+ int pipeB_h;
/* Triple buffering */
drm_handle_t third_handle;
diff -ruN xf86-video-intel-2.3.2/src/i830_display.c xf86-video-intel.patched/src/i830_display.c
--- xf86-video-intel-2.3.2/src/i830_display.c 2008-06-17 03:49:16.000000000 +0200
+++ xf86-video-intel.patched/src/i830_display.c 2009-04-06 09:13:59.000000000 +0200
@@ -429,12 +429,12 @@
switch (plane) {
case 0:
- sPriv->planeA_x = x;
- sPriv->planeA_y = y;
+ sPriv->pipeA_x = x;
+ sPriv->pipeA_y = y;
break;
case 1:
- sPriv->planeB_x = x;
- sPriv->planeB_y = y;
+ sPriv->pipeB_x = x;
+ sPriv->pipeB_y = y;
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -863,12 +863,12 @@
switch (plane) {
case 0:
- sPriv->planeA_w = enabled ? crtc->mode.HDisplay : 0;
- sPriv->planeA_h = enabled ? crtc->mode.VDisplay : 0;
+ sPriv->pipeA_w = enabled ? crtc->mode.HDisplay : 0;
+ sPriv->pipeA_h = enabled ? crtc->mode.VDisplay : 0;
break;
case 1:
- sPriv->planeB_w = enabled ? crtc->mode.HDisplay : 0;
- sPriv->planeB_h = enabled ? crtc->mode.VDisplay : 0;
+ sPriv->pipeB_w = enabled ? crtc->mode.HDisplay : 0;
+ sPriv->pipeB_h = enabled ? crtc->mode.VDisplay : 0;
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff -ruN xf86-video-intel-2.3.2/src/i830_dri.c xf86-video-intel.patched/src/i830_dri.c
--- xf86-video-intel-2.3.2/src/i830_dri.c 2008-03-31 04:00:10.000000000 +0200
+++ xf86-video-intel.patched/src/i830_dri.c 2009-04-06 09:13:00.000000000 +0200
@@ -1472,14 +1472,14 @@
unsigned numvisible[2] = { 0, 0 };
int i, j;
- crtcBox[0].x1 = sPriv->planeA_x;
- crtcBox[0].y1 = sPriv->planeA_y;
- crtcBox[0].x2 = crtcBox[0].x1 + sPriv->planeA_w;
- crtcBox[0].y2 = crtcBox[0].y1 + sPriv->planeA_h;
- crtcBox[1].x1 = sPriv->planeB_x;
- crtcBox[1].y1 = sPriv->planeB_y;
- crtcBox[1].x2 = crtcBox[1].x1 + sPriv->planeB_w;
- crtcBox[1].y2 = crtcBox[1].y1 + sPriv->planeB_h;
+ crtcBox[0].x1 = sPriv->pipeA_x;
+ crtcBox[0].y1 = sPriv->pipeA_y;
+ crtcBox[0].x2 = crtcBox[0].x1 + sPriv->pipeA_w;
+ crtcBox[0].y2 = crtcBox[0].y1 + sPriv->pipeA_h;
+ crtcBox[1].x1 = sPriv->pipeB_x;
+ crtcBox[1].y1 = sPriv->pipeB_y;
+ crtcBox[1].x2 = crtcBox[1].x1 + sPriv->pipeB_w;
+ crtcBox[1].y2 = crtcBox[1].y1 + sPriv->pipeB_h;
for (i = 0; i < 2; i++) {
for (j = 0; j < num; j++) {
diff -ruN xf86-video-intel-2.3.2/src/xvmc/Makefile.am xf86-video-intel.patched/src/xvmc/Makefile.am
--- xf86-video-intel-2.3.2/src/xvmc/Makefile.am 2008-06-17 03:49:17.000000000 +0200
+++ xf86-video-intel.patched/src/xvmc/Makefile.am 2009-04-06 10:00:11.000000000 +0200
@@ -7,7 +7,7 @@
libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
-libI810XvMC_la_LIBADD = @DRI_LIBS@
+libI810XvMC_la_LIBADD = @DRI_LIBS@ @XVMCLIB_LIBS@
libIntelXvMC_la_SOURCES = intel_xvmc.c \
intel_xvmc.h \
--- xf86-video-intel-2.3.2/src/xvmc/Makefile.in 2008-06-18 04:36:13.000000000 +0200
+++ xf86-video-intel.patched/src/xvmc/Makefile.in 2009-04-06 09:59:42.000000000 +0200
@@ -256,7 +256,7 @@
@XVMC_TRUE@libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
@XVMC_TRUE@libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-@XVMC_TRUE@libIntelXvMC_la_LIBADD = @DRI_LIBS@
+@XVMC_TRUE@libIntelXvMC_la_LIBADD = @DRI_LIBS@ @XVMCLIB_LIBS@
all: all-am
.SUFFIXES:
Reference in a new issue View git blame Copy permalink