Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=da6d963914f4e898d0ec813ee8b31e288a354d4d
commit da6d963914f4e898d0ec813ee8b31e288a354d4d Author: Krisztian VASAS <[email protected]> Date: Fri Jan 2 23:29:32 2009 +0100 xf86-video-intel-2.5.99.1-1-i686 - version bump - added some small fixes diff --git a/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 b/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 new file mode 100644 index 0000000..ac3eec6 --- /dev/null +++ b/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index dbde22f..c197e35 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -757,7 +757,7 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface, + } + intel_surf->last_draw = draw; + /* fill intel_surf->data */ +- if (0) ++ if (1) + { + drmVBlank vbl; + vbl.request.type = DRM_VBLANK_RELATIVE; diff --git a/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 b/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 new file mode 100644 index 0000000..49a8c5b --- /dev/null +++ b/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 @@ -0,0 +1,34 @@ +diff --git a/configure.ac b/configure.ac +index 31c14a8..7dbcd47 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,6 +248,7 @@ if test "$XVMC" = yes && test "$DRI" = no; then + fi + if test "$XVMC" = yes; then + PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no]) ++ PKG_CHECK_MODULES(XEXT, [xext]) + fi + AC_MSG_CHECKING([whether to include XvMC support]) + AC_MSG_RESULT([$XVMC]) +diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am +index 0060190..9e62683 100644 +--- a/src/xvmc/Makefile.am ++++ b/src/xvmc/Makefile.am +@@ -7,7 +7,7 @@ libI810XvMC_la_SOURCES = I810XvMC.c \ + libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_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@ @DRM_LIBS@ @XVMCLIB_LIBS@ + + libIntelXvMC_la_SOURCES = intel_xvmc.c \ + intel_xvmc.h \ +@@ -27,7 +27,7 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \ + libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ + @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 + libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 +-libIntelXvMC_la_LIBADD = @DRI_LIBS@ ++libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread + + INTEL_G4A = \ + dual_prime_igd.g4a \ diff --git a/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 b/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 new file mode 100644 index 0000000..9900aaa --- /dev/null +++ b/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 @@ -0,0 +1,36 @@ +diff --git a/src/i830_exa.c b/src/i830_exa.c +index 3e3487e..df2a5ab 100644 +--- a/src/i830_exa.c ++++ b/src/i830_exa.c +@@ -785,17 +785,11 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access) + i830->need_sync = FALSE; + } + +- /* For tiled front buffer, short-circuit to the GTT mapping. */ +- if (i830_pixmap_tiled(pixmap)) { +- drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); +- +- pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; +- } else { +- if (dri_bo_map (bo, access == UXA_ACCESS_RW) != 0) +- return FALSE; ++ if (drm_intel_bo_pin(bo, 4096) != 0) ++ return FALSE; + +- pixmap->devPrivate.ptr = bo->virtual; +- } ++ drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); ++ pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; + } + return TRUE; + } +@@ -810,8 +804,7 @@ i830_uxa_finish_access (PixmapPtr pixmap) + ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + I830Ptr i830 = I830PTR(scrn); + +- if (!i830_pixmap_tiled(pixmap)) +- dri_bo_unmap(bo); ++ drm_intel_bo_unpin(bo); + + pixmap->devPrivate.ptr = NULL; + if (bo == i830->front_buffer->bo) diff --git a/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 b/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 new file mode 100644 index 0000000..0a3bc92 --- /dev/null +++ b/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index c197e35..4b73caa 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -757,13 +757,6 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface, + } + intel_surf->last_draw = draw; + /* fill intel_surf->data */ +- if (1) +- { +- drmVBlank vbl; +- vbl.request.type = DRM_VBLANK_RELATIVE; +- vbl.request.sequence = 1; +- drmWaitVBlank(xvmc_driver->fd, &vbl); +- } + ret = (xvmc_driver->put_surface)(display, surface, draw, srcx, srcy, + srcw, srch, destx, desty, destw, desth, flags, &intel_surf->data); + if (ret) { diff --git a/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 b/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 new file mode 100644 index 0000000..b9defc0 --- /dev/null +++ b/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 @@ -0,0 +1,12 @@ +diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c +index 256d16d..6d2d8b1 100644 +--- a/src/i830_sdvo.c ++++ b/src/i830_sdvo.c +@@ -947,7 +947,6 @@ static void i830_sdvo_set_avi_infoframe(xf86OutputPtr output, + .len = DIP_LEN_AVI, + }; + +- avi_if.u.avi.PR = i830_sdvo_get_pixel_multiplier(mode) - 1; + avi_if.checksum = i830_sdvo_calc_hbuf_csum((uint8_t *)&avi_if, + 4 + avi_if.len); + i830_sdvo_set_hdmi_buf(output, 1, (uint8_t *)&avi_if, 4 + avi_if.len, diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild index 2b25bc7..04a8393 100644 --- a/source/x11/xf86-video-intel/FrugalBuild +++ b/source/x11/xf86-video-intel/FrugalBuild @@ -2,18 +2,29 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-video-intel -pkgver=2.2.1 +pkgver=2.5.99.1 pkgrel=1 pkgdesc="X.Org driver for Intel cards (opensource)" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90' 'libxvmc') +depends=('xorg-server>=1.5.99.3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ 'xf86dgaproto' 'glproto' 'xineramaproto' 'util-macros') Finclude xorg +source=(${sour...@]} \ + '01-wait_vblank_before_renderto_fix_tearing.patch1' \ + '02-xvmc_fix_up_needed_libs.patch1' \ + '03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1' \ + '04-remove_vblank_wait_code_drm_doesnt_support.patch1' \ + '05-sdvo_reset_pixel_repeat_in_avi_frame.patch1') replaces=('xf86-video-i810') conflicts=('xf86-video-i810') provides=('xf86-video-i810') Fconfopts="$Fconfopts --enable-dri" -sha1sums=('7180c7ab83e3334053bd1bec1cdd1755b529e19c') +sha1sums=('16406db34bf58e4743b9db2619aca1508cf86f62' \ + '2190754ddfdf4a1e7def5365e53ffdf69120cdd0' \ + 'f0858028917c129260bf849d6b700d5c87309590' \ + 'b278335491af572e6e3e0680f1b1edb478c48712' \ + '6fcc7e259b64c07777122d5dcde220740267c089' \ + '1ac30477eb0556309150c746f83be52c9e062e85') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
