Author: pebender
Date: Tue May 12 18:22:44 2009
New Revision: 4755
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
Removed:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.0-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.0-ticket-21371.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.0-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.0-ticket-21371.patch
Modified:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/Makefile
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/checksums
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums
Log:
- Updated packages xorg-7.3/xf86-video-intel and xorg-7.4/xf86-video-intel.
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 Tue May
12
18:22:44 2009
@@ -1,5 +1,5 @@
GARNAME = xf86-video-intel
-GARVERSION = 2.7.0
+GARVERSION = 2.7.1
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
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 Tue May
12 18:22:44 2009
@@ -1,3 +1,3 @@
-5832172ac69b9a066a202e1578a5d3c8 download/xf86-video-intel-2.7.0.tar.bz2
-b1b105994d42140e6b0be9778b3309d3
download/xf86-video-intel-2.7.0-ticket-21371.patch
-949c2da74a995d00857bae47015644a6
download/xf86-video-intel-2.7.0-pkg_config.patch
+0eed17138da18ff1fb2b8ab0f076d957 download/xf86-video-intel-2.7.1.tar.bz2
+82e3971a7cd8f8c8496be9f2407e824f
download/xf86-video-intel-2.7.1-ticket-21371.patch
+656fb45922698d61af749004d1f4f682
download/xf86-video-intel-2.7.1-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
Tue May 12 18:22:44 2009
@@ -0,0 +1,23 @@
+diff -Naur xf86-video-intel-2.7.1-old/configure.ac
xf86-video-intel-2.7.1-new/configure.ac
+--- xf86-video-intel-2.7.1-old/configure.ac 2009-05-12 17:54:57.000000000
-0700
++++ xf86-video-intel-2.7.1-new/configure.ac 2009-05-12 17:55:41.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)
+@@ -92,8 +93,9 @@
+ AC_DEFINE(SERVER_1_5, 1, [Building against server 1.5])
+ fi
+
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+-drm_cflags=$(pkg-config --cflags libdrm)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
++drm_cflags=$($PKG_CONFIG --cflags libdrm)
+
+ # Checks for libraries.
+
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
Tue May 12 18:22:44 2009
@@ -0,0 +1,27 @@
+diff -Naur xf86-video-intel-2.7.1-old/src/i830_hdmi.c
xf86-video-intel-2.7.1-new/src/i830_hdmi.c
+--- xf86-video-intel-2.7.1-old/src/i830_hdmi.c 2009-04-13
13:41:53.000000000 -0700
++++ xf86-video-intel-2.7.1-new/src/i830_hdmi.c 2009-05-12
17:55:05.000000000 -0700
+@@ -166,11 +166,18 @@
+
+ temp = INREG(PORT_HOTPLUG_EN);
+
+- OUTREG(PORT_HOTPLUG_EN,
+- temp |
+- HDMIB_HOTPLUG_INT_EN |
+- HDMIC_HOTPLUG_INT_EN |
+- HDMID_HOTPLUG_INT_EN);
++ switch (dev_priv->output_reg) {
++ case SDVOB:
++ temp |= HDMIB_HOTPLUG_INT_EN;
++ break;
++ case SDVOC:
++ temp |= HDMIC_HOTPLUG_INT_EN;
++ break;
++ default:
++ return XF86OutputStatusUnknown;
++ }
++
++ OUTREG(PORT_HOTPLUG_EN, temp);
+
+ POSTING_READ(PORT_HOTPLUG_EN);
+
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile
(original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile Tue May
12
18:22:44 2009
@@ -1,5 +1,5 @@
GARNAME = xf86-video-intel
-GARVERSION = 2.7.0
+GARVERSION = 2.7.1
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums
(original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums Tue May
12 18:22:44 2009
@@ -1,3 +1,3 @@
-5832172ac69b9a066a202e1578a5d3c8 download/xf86-video-intel-2.7.0.tar.bz2
-b1b105994d42140e6b0be9778b3309d3
download/xf86-video-intel-2.7.0-ticket-21371.patch
-949c2da74a995d00857bae47015644a6
download/xf86-video-intel-2.7.0-pkg_config.patch
+0eed17138da18ff1fb2b8ab0f076d957 download/xf86-video-intel-2.7.1.tar.bz2
+82e3971a7cd8f8c8496be9f2407e824f
download/xf86-video-intel-2.7.1-ticket-21371.patch
+656fb45922698d61af749004d1f4f682
download/xf86-video-intel-2.7.1-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch
Tue May 12 18:22:44 2009
@@ -0,0 +1,23 @@
+diff -Naur xf86-video-intel-2.7.1-old/configure.ac
xf86-video-intel-2.7.1-new/configure.ac
+--- xf86-video-intel-2.7.1-old/configure.ac 2009-05-12 17:54:57.000000000
-0700
++++ xf86-video-intel-2.7.1-new/configure.ac 2009-05-12 17:55:41.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)
+@@ -92,8 +93,9 @@
+ AC_DEFINE(SERVER_1_5, 1, [Building against server 1.5])
+ fi
+
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+-drm_cflags=$(pkg-config --cflags libdrm)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
++drm_cflags=$($PKG_CONFIG --cflags libdrm)
+
+ # Checks for libraries.
+
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch
Tue May 12 18:22:44 2009
@@ -0,0 +1,27 @@
+diff -Naur xf86-video-intel-2.7.1-old/src/i830_hdmi.c
xf86-video-intel-2.7.1-new/src/i830_hdmi.c
+--- xf86-video-intel-2.7.1-old/src/i830_hdmi.c 2009-04-13
13:41:53.000000000 -0700
++++ xf86-video-intel-2.7.1-new/src/i830_hdmi.c 2009-05-12
17:55:05.000000000 -0700
+@@ -166,11 +166,18 @@
+
+ temp = INREG(PORT_HOTPLUG_EN);
+
+- OUTREG(PORT_HOTPLUG_EN,
+- temp |
+- HDMIB_HOTPLUG_INT_EN |
+- HDMIC_HOTPLUG_INT_EN |
+- HDMID_HOTPLUG_INT_EN);
++ switch (dev_priv->output_reg) {
++ case SDVOB:
++ temp |= HDMIB_HOTPLUG_INT_EN;
++ break;
++ case SDVOC:
++ temp |= HDMIC_HOTPLUG_INT_EN;
++ break;
++ default:
++ return XF86OutputStatusUnknown;
++ }
++
++ OUTREG(PORT_HOTPLUG_EN, temp);
+
+ POSTING_READ(PORT_HOTPLUG_EN);
+
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
