Author: pebender
Date: Sat Aug 30 20:27:09 2008
New Revision: 3679
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-hardware_overlay.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-pkg_config.patch
Removed:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.0-hardware_overlay.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.0-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.0-ticket_16833.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/Makefile
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/checksums
Log:
- Updated package
xorg-7.3/xf86-video-intel
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Aug 30
20:27:09 2008
@@ -103,6 +103,7 @@
Updated utils/which.
Updated X11/xscreensaver.
Updated xorg-7.3/Mesa.
+ Updated xorg-7.3/xf86-video-intel.
--------------------------------------------------------------------------------
Changes since 56 (2008-08-06):
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/Makefile
(original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/Makefile Sat Aug
30
20:27:09 2008
@@ -1,9 +1,9 @@
GARNAME = xf86-video-intel
-GARVERSION = 2.4.0
+GARVERSION = 2.4.2
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-ticket_16833.patch
$(DISTNAME)-hardware_overlay.patch $(DISTNAME)-pkg_config.patch
+PATCHFILES = $(DISTNAME)-hardware_overlay.patch
$(DISTNAME)-pkg_config.patch
LICENSE = $(GARNAME)
$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/checksums
(original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/checksums Sat Aug
30 20:27:09 2008
@@ -1,4 +1,3 @@
-81a84e891c138b713947ed06556ec53c download/xf86-video-intel-2.4.0.tar.bz2
-9d88e09c3bbb425b5eb01af0c1ae39ec
download/xf86-video-intel-2.4.0-ticket_16833.patch
-806ebbe2cf9476bb77fdb883e9a37631
download/xf86-video-intel-2.4.0-hardware_overlay.patch
-f2433fd0eb824b8bfebe2e4559f22067
download/xf86-video-intel-2.4.0-pkg_config.patch
+5cd6b3ed57c7e78ab51e9d9266e73fb6 download/xf86-video-intel-2.4.2.tar.bz2
+d5a3e5e7d769f040e56a58aa2f0fbf55
download/xf86-video-intel-2.4.2-hardware_overlay.patch
+ece7836ef9791deb6b02a870f2242edc
download/xf86-video-intel-2.4.2-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-hardware_overlay.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-hardware_overlay.patch
Sat Aug 30 20:27:09 2008
@@ -0,0 +1,90 @@
+diff -Naur xf86-video-intel-2.4.2-old/man/intel.man
xf86-video-intel-2.4.2-new/man/intel.man
+--- xf86-video-intel-2.4.2-old/man/intel.man 2008-08-14 22:03:29.000000000
-0700
++++ xf86-video-intel-2.4.2-new/man/intel.man 2008-08-30 12:24:22.000000000
-0700
+@@ -125,6 +125,11 @@
+ Disable or enable XVideo support.
+ Default: XVideo is enabled for configurations where it is supported.
+ .TP
++.BI "Option \*qXvPreferOverlay\*q \*q" boolean \*q
++Make hardware overlay be first XV adapter.
++Some applications assume only one XV adapter present thus use first one.
++Default: Textured video adapter is first and overlay second.
++.TP
+ .BI "Option \*qLegacy3D\*q \*q" boolean \*q
+ Enable support for the legacy i915_dri.so 3D driver.
+ This will, among other things, make the 2D driver tell libGL to
+diff -Naur xf86-video-intel-2.4.2-old/src/i830_driver.c
xf86-video-intel-2.4.2-new/src/i830_driver.c
+--- xf86-video-intel-2.4.2-old/src/i830_driver.c 2008-08-25
18:25:53.000000000 -0700
++++ xf86-video-intel-2.4.2-new/src/i830_driver.c 2008-08-30
12:24:22.000000000 -0700
+@@ -317,6 +317,7 @@
+ #ifdef INTEL_XVMC
+ OPTION_XVMC,
+ #endif
++ OPTION_PREFER_OVERLAY
+ } I830Opts;
+
+ static OptionInfoRec I830Options[] = {
+@@ -345,6 +346,7 @@
+ #ifdef INTEL_XVMC
+ {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, TRUE},
+ #endif
++ {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, TRUE},
+ {-1, NULL, OPTV_NONE, {0}, FALSE}
+ };
+ /* *INDENT-ON* */
+@@ -1684,6 +1686,8 @@
+ pI830->XvDisabled =
+ !xf86ReturnOptValBool(pI830->Options, OPTION_XVIDEO, TRUE);
+
++ pI830->XvPreferOverlay = xf86ReturnOptValBool(pI830->Options,
OPTION_PREFER_OVERLAY, FALSE);
++
+ #ifdef I830_XV
+ if (xf86GetOptValInteger(pI830->Options, OPTION_VIDEO_KEY,
+ &(pI830->colorKey))) {
+diff -Naur xf86-video-intel-2.4.2-old/src/i830.h
xf86-video-intel-2.4.2-new/src/i830.h
+--- xf86-video-intel-2.4.2-old/src/i830.h 2008-08-25 18:25:53.000000000
-0700
++++ xf86-video-intel-2.4.2-new/src/i830.h 2008-08-30 12:24:22.000000000
-0700
+@@ -513,6 +513,7 @@
+
+ Bool XvDisabled; /* Xv disabled in PreInit. */
+ Bool XvEnabled; /* Xv enabled for this generation. */
++ Bool XvPreferOverlay;
+
+ #ifdef I830_XV
+ int colorKey;
+diff -Naur xf86-video-intel-2.4.2-old/src/i830_video.c
xf86-video-intel-2.4.2-new/src/i830_video.c
+--- xf86-video-intel-2.4.2-old/src/i830_video.c 2008-08-25
18:25:53.000000000 -0700
++++ xf86-video-intel-2.4.2-new/src/i830_video.c 2008-08-30
12:24:22.000000000 -0700
+@@ -611,7 +611,6 @@
+ {
+ texturedAdaptor = I830SetupImageVideoTextured(pScreen);
+ if (texturedAdaptor != NULL) {
+- adaptors[num_adaptors++] = texturedAdaptor;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -625,7 +624,6 @@
+ {
+ overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
+ if (overlayAdaptor != NULL) {
+- adaptors[num_adaptors++] = overlayAdaptor;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -633,6 +631,16 @@
+ }
+ I830InitOffscreenImages(pScreen);
+ }
++
++ if (overlayAdaptor && pI830->XvPreferOverlay)
++ adaptors[num_adaptors++] = overlayAdaptor;
++
++ if (texturedAdaptor)
++ adaptors[num_adaptors++] = texturedAdaptor;
++
++ if (overlayAdaptor && !pI830->XvPreferOverlay)
++ adaptors[num_adaptors++] = overlayAdaptor;
++
+ #ifdef INTEL_XVMC
+ if (intel_xvmc_probe(pScrn)) {
+ if (texturedAdaptor)
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.4.2-pkg_config.patch
Sat Aug 30 20:27:09 2008
@@ -0,0 +1,21 @@
+diff -Naur xf86-video-intel-2.4.2-old/configure.ac
xf86-video-intel-2.4.2-new/configure.ac
+--- xf86-video-intel-2.4.2-old/configure.ac 2008-08-30 12:24:10.000000000
-0700
++++ xf86-video-intel-2.4.2-new/configure.ac 2008-08-30 12:25:42.000000000
-0700
+@@ -40,6 +40,7 @@
+ DOLT
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++PKG_PROG_PKG_CONFIG
+
+ AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
+ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+@@ -84,7 +85,8 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
+
+ # Checks for libraries.
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
