Revision: 5248 Author: pebender Date: Wed Jul 29 08:36:43 2009 Log: - Reverted xorg-7.4/xf86-video-intel as it causes segfault on vt switch.
http://code.google.com/p/minimyth/source/detail?r=5248 Added: /trunk/gar-minimyth/script/nvidia/nvidia-185.18.29 /trunk/gar-minimyth/script/nvidia/nvidia-185.18.29/Makefile /trunk/gar-minimyth/script/nvidia/nvidia-185.18.29/checksums /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 Deleted: /trunk/gar-minimyth/script/nvidia/nvidia-185.18.14 Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/document-todo.txt /trunk/gar-minimyth/html/minimyth/index.html /trunk/gar-minimyth/script/X11/vdpau/Makefile /trunk/gar-minimyth/script/X11/vdpau/checksums /trunk/gar-minimyth/script/meta/minimyth/files/check.mk /trunk/gar-minimyth/script/minimyth.conf.mk /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/nvidia/nvidia-185.18.29/Makefile Wed Jul 29 08:36:43 2009 @@ -0,0 +1,12 @@ +NVIDIA_MAJOR_VERSION = 185 +NVIDIA_MINOR_VERSION = 18 +NVIDIA_TEENY_VERSION = 29 + +BUILD_SCRIPTS = nvidia +INSTALL_SCRIPTS = nvidia + +BUILD_ARGS = $(NVIDIA_MAKE_ARGS) +BUILD_ENV = $(NVIDIA_MAKE_ENV) + +GAR_EXTRA_CONF += kernel-$(mm_KERNEL_VERSION)/linux/package-api.mk nvidia/nvidia/package-api.mk +include ../../gar.mk ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/nvidia/nvidia-185.18.29/checksums Wed Jul 29 08:36:43 2009 @@ -0,0 +1,2 @@ +ecafd5b6a8e4b9f8795618b2c4a7205f download/NVIDIA-Linux-x86-185.18.29-pkg1.run +d3cbf685c8da59f1eeaddfd71440e66c download/NVIDIA-Linux-x86_64-185.18.29-pkg2.run ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-pkg_config.patch Wed Jul 29 08:36:43 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. + ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/files/xf86-video-intel-2.7.1-ticket-21371.patch Wed Jul 29 08:36:43 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); + ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Jul 28 03:40:43 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Jul 29 08:36:43 2009 @@ -66,11 +66,13 @@ Removed packages Removed disk/e2fsprogs (replaced by utils/util-linux-ng). Removed lib/libuuid (replaced by utils/util-linux-ng). + Removed nvidia/nvidia-185.18.14. Added packages Added kernel-2.6.31/*. Added kernel-headers/linux-headers-2.6.31. Added lib/libusb-compat. + Added nvidia/nvidia-185.18.29. Added nvidia/nvidia-190.18. Updated packages @@ -112,7 +114,6 @@ Updated xorg-7.4/Mesa. Updated xorg-7.4/pixman. Updated xorg-7.4/renderproto. - Updated xorg-7.4/xf86-video-intel. Updated xorg-7.4/xf86-video-vmware. -------------------------------------------------------------------------------- ======================================= --- /trunk/gar-minimyth/html/minimyth/document-todo.txt Mon Jul 27 14:56:07 2009 +++ /trunk/gar-minimyth/html/minimyth/document-todo.txt Wed Jul 29 08:36:43 2009 @@ -2,6 +2,7 @@ devel/autoconf - 2.64 - fails to compile xorg-7.4/xf86-video-radeonhd. kde/kdelibs - 4.x.x - not compatible with Qt 3.3.x (requires Qt 4.3.x). xorg-7.4/fixesproto - 4.1 - requires the unstable xextproto 7.0.99.x. + xorg-7.4/xf86-video-intel - 2.8.0 - causes segfaults on vt switch. xorg-7.4/xf86-video-openchrome - SVN 737 - breaks some composite modelines: <http://www.minimyth.org/forum/viewtopic.php?t=2210>. ======================================= --- /trunk/gar-minimyth/html/minimyth/index.html Tue Jul 28 03:40:43 2009 +++ /trunk/gar-minimyth/html/minimyth/index.html Wed Jul 29 08:36:43 2009 @@ -103,7 +103,7 @@ </li> <li><a href="http://xorg.freedesktop.org/wiki/";>Xorg</a> <strong>7.4+</strong></li> <li><a href="http://www.openchrome.org/";>openChrome Xorg graphics driver</a> <strong>0.2.903</strong></li> - <li><a href="http://www.nvidia.com/";>NVIDIA Xorg graphics driver</a> <strong>185.18.14</strong></li> + <li><a href="http://www.nvidia.com/";>NVIDIA Xorg graphics driver</a> <strong>185.18.29</strong></li> <li><a href="http://www.lirc.org/";>LIRC</a> <strong>CVS 20090725Z</strong></li> <li><a href="http://www.lcdproc.org/";>LCDproc</a> <strong>0.5.3</strong></li> <li> ======================================= --- /trunk/gar-minimyth/script/X11/vdpau/Makefile Thu Jul 23 18:57:47 2009 +++ /trunk/gar-minimyth/script/X11/vdpau/Makefile Wed Jul 29 08:36:43 2009 @@ -1,6 +1,6 @@ -NVIDIA_MAJOR_VERSION = 190 +NVIDIA_MAJOR_VERSION = 185 NVIDIA_MINOR_VERSION = 18 -NVIDIA_TEENY_VERSION = +NVIDIA_TEENY_VERSION = 29 INSTALL_SCRIPTS = includes libs ======================================= --- /trunk/gar-minimyth/script/X11/vdpau/checksums Thu Jul 23 18:57:47 2009 +++ /trunk/gar-minimyth/script/X11/vdpau/checksums Wed Jul 29 08:36:43 2009 @@ -1,2 +1,2 @@ -c7ef8a4d485a0774d35b8458c4cc3b7d download/NVIDIA-Linux-x86-190.18-pkg1.run -ce59902f1398a918b88e1c8fef4eff72 download/NVIDIA-Linux-x86_64-190.18-pkg2.run +ecafd5b6a8e4b9f8795618b2c4a7205f download/NVIDIA-Linux-x86-185.18.29-pkg1.run +d3cbf685c8da59f1eeaddfd71440e66c download/NVIDIA-Linux-x86_64-185.18.29-pkg2.run ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/check.mk Thu Jul 23 18:57:47 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/check.mk Wed Jul 29 08:36:43 2009 @@ -204,7 +204,7 @@ @echo " mm_NVIDIA_VERSION" @if [ ! "$(mm_NVIDIA_VERSION)" = "96.43.13" ] && \ [ ! "$(mm_NVIDIA_VERSION)" = "173.14.20" ] && \ - [ ! "$(mm_NVIDIA_VERSION)" = "185.18.14" ] && \ + [ ! "$(mm_NVIDIA_VERSION)" = "185.18.29" ] && \ [ ! "$(mm_NVIDIA_VERSION)" = "190.18" ] ; then \ echo "error: mm_NVIDIA_VERSION=\"$(mm_NVIDIA_VERSION)\" is an invalid value." ; \ exit 1 ; \ ======================================= --- /trunk/gar-minimyth/script/minimyth.conf.mk Sat Jul 25 10:45:41 2009 +++ /trunk/gar-minimyth/script/minimyth.conf.mk Wed Jul 29 08:36:43 2009 @@ -114,9 +114,9 @@ # Valid values are '0.20', '0.20-softpad', '0.21', and 'trunk'. mm_MYTH_VERSION ?= 0.21 # The version of the NVIDIA driver. -# Valid values are '96.43.13' (legacy), '173.14.20' (legacy), 185.18.14, +# Valid values are '96.43.13' (legacy), '173.14.20' (legacy), 185.18.29, # 190.18 (beta). -mm_NVIDIA_VERSION ?= 185.18.14 +mm_NVIDIA_VERSION ?= 185.18.29 # The version of xorg to use. # Valid values are '7.4'. mm_XORG_VERSION ?= 7.4 ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile Tue Jul 21 14:37:13 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/Makefile Wed Jul 29 08:36:43 2009 @@ -1,9 +1,12 @@ GARNAME = xf86-video-intel -GARVERSION = 2.8.0 +GARVERSION = 2.7.1 CATEGORIES = $(CATEGORY) MASTER_SITES = $(XORG_MASTER_SITES) DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = $(DISTNAME)-pkg_config.patch +ifeq ("$(GARVERSION)","2.7.1") +PATCHFILES += $(DISTNAME)-ticket-21371.patch +endif LICENSE = $(GARNAME) $(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING @@ -12,14 +15,12 @@ endef DEPENDS = lang/c \ - $(CATEGORY)/dri2proto \ $(CATEGORY)/fontsproto \ $(CATEGORY)/glproto \ $(CATEGORY)/libdrm \ $(CATEGORY)/libpciaccess \ $(CATEGORY)/libX11 \ $(CATEGORY)/libXext \ - $(CATEGORY)/libXfixes \ $(CATEGORY)/libXvMC \ $(CATEGORY)/randrproto \ $(CATEGORY)/renderproto \ @@ -28,6 +29,11 @@ $(CATEGORY)/xineramaproto \ $(CATEGORY)/xorg-server \ $(CATEGORY)/xproto +ifneq ("$(GARVERSION)","2.7.1") +DEPENDS += \ + $(CATEGORY)/dri2proto \ + $(CATEGORY)/libXfixes +endif BUILDDEPS = \ $(CATEGORY)/util-macros \ $(CATEGORY)/xorg-server \ @@ -43,12 +49,15 @@ --cache-file=config.cache \ --enable-dri \ --disable-video-debug \ - --disable-debug \ --enable-xvmc \ - --disable-shave \ --with-gnu-ld - -x_CONFIGURE_ENV = \ +ifneq ("$(GARVERSION)","2.7.1") +CONFIGURE_ARGS += \ + --disable-debug \ + --disable-shave +endif + +CONFIGURE_ENV = \ XORG_SGML_PATH="$(DESTDIR)$(includedir)/xorg" GAR_EXTRA_CONF += $(CATEGORY)/xorg/package-api.mk ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums Tue Jul 21 14:37:13 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-intel/checksums Wed Jul 29 08:36:43 2009 @@ -1,2 +1,6 @@ +0eed17138da18ff1fb2b8ab0f076d957 download/xf86-video-intel-2.7.1.tar.bz2 +656fb45922698d61af749004d1f4f682 download/xf86-video-intel-2.7.1-pkg_config.patch +82e3971a7cd8f8c8496be9f2407e824f download/xf86-video-intel-2.7.1-ticket-21371.patch + 15a390fe3e126e954ed95aeb8bc02196 download/xf86-video-intel-2.8.0.tar.bz2 d099bb6e18e6e87e7e68fc9d625d6648 download/xf86-video-intel-2.8.0-pkg_config.patch --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
