Revision: 5661 Author: pebender Date: Sun Oct 11 16:26:24 2009 Log: - Reverted xf86-video-openchrome.
http://code.google.com/p/minimyth/source/detail?r=5661 Added: /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile.0.2.904 /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/document-todo.txt /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile.0.2.904 Sun Oct 11 16:26:24 2009 @@ -0,0 +1,71 @@ +GARNAME = xf86-video-openchrome +GARVERSION = 0.2.904 +CATEGORIES = $(CATEGORY) +MASTER_SITES = http://www.openchrome.org/releases/ +MASTER_SITES += svn://svn.openchrome.org/svn/trunk/ +DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES = $(DISTNAME)-composite.patch $(DISTNAME)-pkg_config.patch +LICENSE = MIT + +DESCRIPTION = +define BLURB +endef + +DEPENDS = lang/c \ + $(CATEGORY)/fontsproto \ + $(CATEGORY)/libdrm \ + $(CATEGORY)/libpciaccess \ + $(CATEGORY)/libX11 \ + $(CATEGORY)/libXext \ + $(CATEGORY)/libXvMC \ + $(CATEGORY)/randrproto \ + $(CATEGORY)/renderproto \ + $(CATEGORY)/videoproto \ + $(CATEGORY)/xextproto \ + $(CATEGORY)/xf86driproto \ + $(CATEGORY)/xorg-server \ + $(CATEGORY)/xproto +BUILDDEPS = \ + $(CATEGORY)/util-macros \ + $(CATEGORY)/xorg-server \ + $(CATEGORY)/xorg-sgml-doctools + +CATEGORY := $(shell basename $(shell dirname $(shell pwd))) + +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +BUILD_SCRIPTS = $(WORKSRC)/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/Makefile + +CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \ + --cache-file=config.cache \ + --disable-static \ + --enable-shared \ + --enable-dri \ + --disable-debug \ + --disable-xv-debug \ + --with-gnu-ld + +include ../../gar.mk + +svn//%/$(DISTNAME).tar.bz2: + @$(call FETCH_SVN, http://$*, $(GARVERSION), $(DISTNAME)) + @$(MAKECOOKIE) + +x-checksum-$(DISTNAME).tar.bz2: + @$(MAKECOOKIE) + +pre-configure: + @rm -f $(WORKSRC)/acinclude.m4 + @cd $(WORKSRC) ; autoreconf --verbose --install --force + @$(call FIX_LIBTOOL,$(WORKSRC)/configure) + @rm -f $(WORKSRC)/config.cache + @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/dri.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache + @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/dristruct.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache + @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/sarea.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache + @$(MAKECOOKIE) + +post-install: + @rm -f $(DESTDIR)$(libdir)/xorg/modules/drivers/openchrome_drv.la + @rm -f $(DESTDIR)$(libdir)/libchromeXvMC.la + @rm -f $(DESTDIR)$(libdir)/libchromeXvMCPro.la + @$(MAKECOOKIE) ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch Sun Oct 11 16:26:24 2009 @@ -0,0 +1,17 @@ +diff -Naur xf86-video-openchrome-0.2.903-old/src/via_video.c xf86-video-openchrome-0.2.903-new/src/via_video.c +--- xf86-video-openchrome-0.2.903-old/src/via_video.c 2008-08-10 04:06:37.000000000 -0700 ++++ xf86-video-openchrome-0.2.903-new/src/via_video.c 2008-08-30 12:17:20.000000000 -0700 +@@ -723,8 +723,13 @@ + BoxPtr pBox; + int nBox; + ++#ifdef COMPOSITE + REGION_TRANSLATE(pScrn->pScreen, clipBoxes, - pPix->screen_x, + - pPix->screen_y); ++#else ++ REGION_TRANSLATE(pScrn->pScreen, clipBoxes, 0, ++ 0); ++#endif + + nBox = REGION_NUM_RECTS(clipBoxes); + pBox = REGION_RECTS(clipBoxes); ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch Sun Oct 11 16:26:24 2009 @@ -0,0 +1,28 @@ +diff -Naur xf86-video-openchrome-0.2.903-old/libxvmc/viaLowLevelPro.c xf86-video-openchrome-0.2.903-new/libxvmc/viaLowLevelPro.c +--- xf86-video-openchrome-0.2.903-old/libxvmc/viaLowLevelPro.c 2008-06-07 10:28:37.000000000 -0700 ++++ xf86-video-openchrome-0.2.903-new/libxvmc/viaLowLevelPro.c 2008-11-28 22:56:55.000000000 -0800 +@@ -1460,13 +1460,13 @@ + + if (size != mem->size) { + if (mem->size) +- drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem)); ++ drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem)); + mem->context = *(xl->drmcontext); + mem->size = size; + mem->type = VIA_MEM_VIDEO; + + if (((ret = drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, mem, +- sizeof(mem))) < 0) || mem->size != size) { ++ sizeof(*mem))) < 0) || mem->size != size) { + mem->size = 0; + return -1; + } +@@ -1484,7 +1484,7 @@ + drm_via_mem_t *mem = &buf->mem; + + if (mem->size) +- drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem)); ++ drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem)); + mem->size = 0; + } + ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch Sun Oct 11 16:26:24 2009 @@ -0,0 +1,21 @@ +diff -Naur xf86-video-openchrome-0.2.903-old/configure.ac xf86-video-openchrome-0.2.903-new/configure.ac +--- xf86-video-openchrome-0.2.903-old/configure.ac 2008-08-30 12:17:06.000000000 -0700 ++++ xf86-video-openchrome-0.2.903-new/configure.ac 2008-08-30 12:18:02.000000000 -0700 +@@ -38,6 +38,7 @@ + AC_DISABLE_STATIC + AC_PROG_LIBTOOL + AC_PROG_CC ++PKG_PROG_PKG_CONFIG + + AH_TOP([#include "xorg-server.h"]) + +@@ -71,7 +72,8 @@ + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $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. + ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Oct 11 12:14:05 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Oct 11 16:26:24 2009 @@ -264,7 +264,6 @@ Updated xorg-7.4/xf86-video-ati. Updated xorg-7.4/xf86-video-intel. Updated xorg-7.4/xf86-video-nv. - Updated xorg-7.4/xf86-video-openchrome. Updated xorg-7.4/xf86-video-radeonhd. Updated xorg-7.4/xf86-video-vmware. Updated xorg-7.4/xf86vidmodeproto. ======================================= --- /trunk/gar-minimyth/html/minimyth/document-todo.txt Sat Oct 10 21:55:55 2009 +++ /trunk/gar-minimyth/html/minimyth/document-todo.txt Sun Oct 11 16:26:24 2009 @@ -1,14 +1,16 @@ Packages we will not update: - 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 xextproto 7.1. - Xorg-7.4/libXext - 1.1 - requires xextproto 7.1. - Xorg-7.4/libXi - 1.3 - requires libXext 1.1. - xorg-7.4/recordproto - 1.14 - not compatible with libXtst 1.0.3. - xorg-7.4/xextproto - 7.1 - not compatible with xorg-server 1.6.3. - xorg-7.4/xineramaproto - 1.2 - not compatible with libXinerama 1.0.3. - xorg-7.4/xorg-server - 1.6.4 - its removal of DGA framebuffer removal breaks video drivers. - <http://www.minimyth.org/forum/viewtopic.php?t=2210>. + 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 xextproto 7.1. + Xorg-7.4/libXext - 1.1 - requires xextproto 7.1. + Xorg-7.4/libXi - 1.3 - requires libXext 1.1. + xorg-7.4/recordproto - 1.14 - not compatible with libXtst 1.0.3. + xorg-7.4/xextproto - 7.1 - not compatible with xorg-server 1.6.3. + xorg-7.4/xf86-video-openchrome - 0.2.204 - causes suttering for some on VIA hardware. + <http://www.minimyth.org/forum/viewtopic.php?t=2442>. + xorg-7.4/xineramaproto - 1.2 - not compatible with libXinerama 1.0.3. + xorg-7.4/xorg-server - 1.6.4 - its removal of DGA framebuffer removal breaks video drivers. + <http://www.minimyth.org/forum/viewtopic.php?t=2210>. Packages we may update: - emulators/fceu - 2.x. - requires SCons to build. + emulators/fceu - 2.x. - requires SCons to build. ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile Thu Oct 8 18:25:39 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile Sun Oct 11 16:26:24 2009 @@ -1,10 +1,10 @@ GARNAME = xf86-video-openchrome -GARVERSION = 0.2.904 +GARVERSION = 0.2.903 CATEGORIES = $(CATEGORY) MASTER_SITES = http://www.openchrome.org/releases/ MASTER_SITES += svn://svn.openchrome.org/svn/trunk/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = $(DISTNAME)-composite.patch $(DISTNAME)-pkg_config.patch +PATCHFILES = $(DISTNAME)-ioctl.patch $(DISTNAME)-composite.patch $(DISTNAME)-pkg_config.patch LICENSE = MIT DESCRIPTION = @@ -13,10 +13,10 @@ DEPENDS = lang/c \ $(CATEGORY)/fontsproto \ + $(CATEGORY)/glproto \ $(CATEGORY)/libdrm \ $(CATEGORY)/libpciaccess \ $(CATEGORY)/libX11 \ - $(CATEGORY)/libXext \ $(CATEGORY)/libXvMC \ $(CATEGORY)/randrproto \ $(CATEGORY)/renderproto \ @@ -62,6 +62,7 @@ @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/dri.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/dristruct.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/sarea.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache + @echo "`echo ac_cv_file_$(DESTDIR)$(includedir)/xorg/xf86Module.h | sed -e 's%[^a-zA-Z0-9]%_%g'`=yes" >> $(WORKSRC)/config.cache @$(MAKECOOKIE) post-install: ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums Thu Oct 8 18:25:39 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums Sun Oct 11 16:26:24 2009 @@ -1,3 +1,8 @@ +c0820787e89958c9114d359b6a3cd464 download/xf86-video-openchrome-0.2.903.tar.bz2 +c47a95452576655c3e4d789790a1f50e download/xf86-video-openchrome-0.2.903-ioctl.patch +93deac7c44bb2ca5acf0ab7ff0856533 download/xf86-video-openchrome-0.2.903-composite.patch +43779c5f36525e1bba88ca3c13668261 download/xf86-video-openchrome-0.2.903-pkg_config.patch + f2481d98ef54febf5bffbb88a2a2426d download/xf86-video-openchrome-0.2.904.tar.bz2 d80a25c3523ecba97339b2bb997ba81d download/xf86-video-openchrome-0.2.904-composite.patch 7be1eac6cbf6b390a4dcb085d5fafad6 download/xf86-video-openchrome-0.2.904-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 -~----------~----~----~----~------~----~------~--~---
