diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index b7fa3b36ac..c94684c6e0 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -9,6 +9,9 @@ BUILD_DIR=`ls -d $PKG_BUILD` CFLAGS="$CFLAGS -I$BUILD_DIR/src/xvmc" cd $PKG_BUILD + +xorg_drv_configure_prepend + ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-intel/install b/packages/x11/driver/xf86-video-intel/install index eed68030ff..cd0c1937bf 100755 --- a/packages/x11/driver/xf86-video-intel/install +++ b/packages/x11/driver/xf86-video-intel/install @@ -9,3 +9,6 @@ cp $PKG_BUILD/src/ch7xxx/.libs/ch7xxx.so $INSTALL/$XORG_PATH_MODULES/drivers cp $PKG_BUILD/src/ivch/.libs/ivch.so $INSTALL/$XORG_PATH_MODULES/drivers cp $PKG_BUILD/src/sil164/.libs/sil164.so $INSTALL/$XORG_PATH_MODULES/drivers cp $PKG_BUILD/src/tfp410/.libs/tfp410.so $INSTALL/$XORG_PATH_MODULES/drivers + +mkdir -p $INSTALL/usr/lib +cp $PKG_BUILD/src/xvmc/.libs/*.so* $INSTALL/usr/lib \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-intel/patches/110_quirk-hp-mini.diff b/packages/x11/driver/xf86-video-intel/patches/110_quirk-hp-mini.diff deleted file mode 100644 index b58c23468e..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/110_quirk-hp-mini.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp patched/src/i830_quirks.c working/src/i830_quirks.c ---- patched/src/i830_quirks.c 2009-03-02 15:49:37.000000000 -0800 -+++ working/src/i830_quirks.c 2009-03-02 15:52:51.000000000 -0800 -@@ -290,6 +290,8 @@ static i830_quirk i830_quirk_list[] = { - { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv }, - /* HP Compaq 2730p needs pipe A force quirk (LP: #291555) */ - { PCI_CHIP_GM45_GM, 0x103c, 0x30eb, quirk_pipea_force }, -+ /* HP Mini needs pipe A force quirk (LP: #322104) */ -+ { PCI_CHIP_I945_GME,0x103c, 0x361a, quirk_pipea_force }, - - /* Thinkpad R31 needs pipe A force quirk */ - { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force }, diff --git a/packages/x11/driver/xf86-video-intel/patches/116_865g-disable-dri.diff b/packages/x11/driver/xf86-video-intel/patches/116_865g-disable-dri.diff deleted file mode 100644 index 1071d971f1..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/116_865g-disable-dri.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp patched/src/i830_driver.c working/src/i830_driver.c ---- patched/src/i830_driver.c 2009-03-27 16:48:16.000000000 -0700 -+++ working/src/i830_driver.c 2009-03-27 17:40:57.000000000 -0700 -@@ -1659,7 +1659,12 @@ I830AccelMethodInit(ScrnInfoPtr pScrn) - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it " - "runs only at depths 16 and 24.\n"); - pI830->directRenderingType = DRI_DISABLED; -+ } else if (IS_845G(pI830) || IS_I865G(pI830)) { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it " -+ "fails to run on 845G and 865G chips. (See LP 304871)\n"); -+ pI830->directRenderingType = DRI_DISABLED; - } -+ - #endif /* XF86DRI */ - - I830MapMMIO(pScrn); diff --git a/packages/x11/driver/xf86-video-intel/patches/117_quirk-thinkpad-x30.diff b/packages/x11/driver/xf86-video-intel/patches/117_quirk-thinkpad-x30.diff deleted file mode 100644 index dc564088e8..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/117_quirk-thinkpad-x30.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp patched/src/i830_quirks.c working/src/i830_quirks.c ---- patched/src/i830_quirks.c 2009-04-01 01:13:31.000000000 -0700 -+++ working/src/i830_quirks.c 2009-04-01 01:15:01.000000000 -0700 -@@ -341,6 +341,8 @@ static i830_quirk i830_quirk_list[] = { - - { PCI_CHIP_I855_GM, 0x161f, 0x2030, quirk_pfit_safe }, - -+ /* ThinkPad X30 needs pipe A force quirk (LP: #304614) */ -+ { PCI_CHIP_I830_M, 0x1014, 0x0513, quirk_pipea_force }, - /* ThinkPad X40 needs pipe A force quirk */ - { PCI_CHIP_I855_GM, 0x1014, 0x0557, quirk_pipea_force }, - diff --git a/packages/x11/driver/xf86-video-intel/patches/52_cross-damage.diff b/packages/x11/driver/xf86-video-intel/patches/52_cross-damage.diff deleted file mode 100644 index 82cfd28504..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/52_cross-damage.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xf86-video-intel-2.6.99.901/configure.old xf86-video-intel-2.6.99.901/configure ---- xf86-video-intel-2.6.99.901/configure.org 2009-03-10 08:28:45.000000000 +0100 -+++ xf86-video-intel-2.6.99.901/configure 2009-03-10 08:31:17.000000000 +0100 -@@ -22330,7 +22330,7 @@ - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = dummy && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - $as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } diff --git a/packages/x11/driver/xf86-video-intel/patches/70_rgbbroadcast_for_flatscreen.diff b/packages/x11/driver/xf86-video-intel/patches/70_rgbbroadcast_for_flatscreen.diff new file mode 100644 index 0000000000..031bb20fad --- /dev/null +++ b/packages/x11/driver/xf86-video-intel/patches/70_rgbbroadcast_for_flatscreen.diff @@ -0,0 +1,28 @@ +diff -Naur xf86-video-intel-2.7.0.901/src/i830_hdmi.c.org xf86-video-intel-2.7.0.901/src/i830_hdmi.c +--- xf86-video-intel-2.7.0.901/src/i830_hdmi.c.org 2009-05-11 20:34:54.000000000 +0200 ++++ xf86-video-intel-2.7.0.901/src/i830_hdmi.c 2009-05-11 20:35:50.000000000 +0200 +@@ -248,8 +248,8 @@ + "RRConfigureOutputProperty error, %d\n", err); + return; + } +- /* Set the current value of the broadcast property as full range */ +- dev_priv->broadcast_rgb = 0; ++ /* Set the current value of the broadcast property as limited range */ ++ dev_priv->broadcast_rgb = 1; + err = RRChangeOutputProperty(output->randr_output, + broadcast_atom, + XA_INTEGER, 32, PropModeReplace, +diff -Naur xf86-video-intel-2.7.0.901/src/i830_sdvo.c.org xf86-video-intel-2.7.0.901/src/i830_sdvo.c +--- xf86-video-intel-2.7.0.901/src/i830_sdvo.c.org 2009-05-11 20:35:02.000000000 +0200 ++++ xf86-video-intel-2.7.0.901/src/i830_sdvo.c 2009-05-11 20:43:47.000000000 +0200 +@@ -1963,8 +1963,8 @@ + "RRConfigureOutputProperty error, %d\n", err); + return; + } +- /* Set the current value of the broadcast property as full range */ +- dev_priv->broadcast_rgb = 0; ++ /* Set the current value of the broadcast property as limited range */ ++ dev_priv->broadcast_rgb = 1; + err = RRChangeOutputProperty(output->randr_output, + broadcast_atom, + XA_INTEGER, 32, PropModeReplace, diff --git a/packages/x11/driver/xf86-video-intel/patches/71_enable_XvMC.diff b/packages/x11/driver/xf86-video-intel/patches/71_enable_XvMC.diff new file mode 100644 index 0000000000..d055a2322e --- /dev/null +++ b/packages/x11/driver/xf86-video-intel/patches/71_enable_XvMC.diff @@ -0,0 +1,15 @@ +--- xf86-video-intel-2.7.0.901/src/i830_driver.c.org 2009-05-11 21:57:27.000000000 +0200 ++++ xf86-video-intel-2.7.0.901/src/i830_driver.c 2009-05-11 21:58:30.000000000 +0200 +@@ -2836,10 +2836,8 @@ + xf86DPMSInit(pScreen, xf86DPMSSet, 0); + + #ifdef INTEL_XVMC +- pI830->XvMCEnabled = FALSE; +- from = ((pI830->directRenderingType == DRI_DRI2) && +- xf86GetOptValBool(pI830->Options, OPTION_XVMC, +- &pI830->XvMCEnabled) ? X_CONFIG : X_DEFAULT); ++ pI830->XvMCEnabled = TRUE; ++ from = X_CONFIG; + xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n", + pI830->XvMCEnabled ? "en" : "dis"); + #endif diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 09f7efead2..f6aedbb97d 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.7.1.tar.bz2 +http://sources.openelec.tv/svn/xf86-video-intel-20090718.tar.bz2