Author: pebender
Date: Fri Mar 27 17:42:58 2009
New Revision: 4521
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch
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
Removed:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-737-composite.patch
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-737-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-737-composite.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-737-pkg_config.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/Makefile
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/checksums
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums
Log:
- Reverted packages xorg-7.3/xf86-video-openchrome
xorg-7.4/xf86-video-openchrome
because the newer version breaks some modelines.
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 Fri Mar 27
17:42:58 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 65 (2009-03-26):
+Changes since 65 (2009-03-27):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -22,6 +22,8 @@
Updated packages
Updated lib/openssl.
+ Reverted xorg-7.3/xf86-video-openchrome (breaks some modelines).
+ Reverted xorg-7.4/xf86-video-openchrome (breaks some modelines).
--------------------------------------------------------------------------------
Changes since 64 (2009-03-24):
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/Makefile
(original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/Makefile Fri
Mar 27 17:42:58 2009
@@ -1,10 +1,10 @@
GARNAME = xf86-video-openchrome
-GARVERSION = 737
+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,9 +13,9 @@
DEPENDS = lang/c \
$(CATEGORY)/fontsproto \
+ $(CATEGORY)/glproto \
$(CATEGORY)/libdrm \
$(CATEGORY)/libX11 \
- $(CATEGORY)/libXext \
$(CATEGORY)/libXvMC \
$(CATEGORY)/randrproto \
$(CATEGORY)/renderproto \
@@ -38,8 +38,6 @@
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
--cache-file=config.cache \
--enable-dri \
- --disable-debug \
- --disable-xv-debug \
--with-gnu-ld
include ../../gar.mk
@@ -48,7 +46,7 @@
@$(call FETCH_SVN, http://$*, $(GARVERSION), $(DISTNAME))
@$(MAKECOOKIE)
-checksum-$(DISTNAME).tar.bz2:
+x-checksum-$(DISTNAME).tar.bz2:
@$(MAKECOOKIE)
pre-configure:
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/checksums
(original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/checksums Fri
Mar 27 17:42:58 2009
@@ -1,2 +1,4 @@
-eca363af1b98f09fb48d65f3f0e742df
download/xf86-video-openchrome-737-composite.patch
-4f6f48477e0649457bb0d0d67bbdfb29
download/xf86-video-openchrome-737-pkg_config.patch
+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
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch
Fri Mar 27 17:42:58 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);
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch
Fri Mar 27 17:42:58 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;
+ }
+
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch
Fri Mar 27 17:42:58 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.
+
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile
(original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/Makefile Fri
Mar 27 17:42:58 2009
@@ -1,10 +1,10 @@
GARNAME = xf86-video-openchrome
-GARVERSION = 737
+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,9 @@
DEPENDS = lang/c \
$(CATEGORY)/fontsproto \
+ $(CATEGORY)/glproto \
$(CATEGORY)/libdrm \
- $(CATEGORY)/libpciaccess \
$(CATEGORY)/libX11 \
- $(CATEGORY)/libXext \
$(CATEGORY)/libXvMC \
$(CATEGORY)/randrproto \
$(CATEGORY)/renderproto \
@@ -39,8 +38,6 @@
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
--cache-file=config.cache \
--enable-dri \
- --disable-debug \
- --disable-xv-debug \
--with-gnu-ld
include ../../gar.mk
@@ -49,7 +46,7 @@
@$(call FETCH_SVN, http://$*, $(GARVERSION), $(DISTNAME))
@$(MAKECOOKIE)
-checksum-$(DISTNAME).tar.bz2:
+x-checksum-$(DISTNAME).tar.bz2:
@$(MAKECOOKIE)
pre-configure:
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums
(original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/checksums Fri
Mar 27 17:42:58 2009
@@ -1,2 +1,4 @@
-eca363af1b98f09fb48d65f3f0e742df
download/xf86-video-openchrome-737-composite.patch
-4f6f48477e0649457bb0d0d67bbdfb29
download/xf86-video-openchrome-737-pkg_config.patch
+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
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-composite.patch
Fri Mar 27 17:42:58 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);
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-ioctl.patch
Fri Mar 27 17:42:58 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;
+ }
+
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-openchrome/files/xf86-video-openchrome-0.2.903-pkg_config.patch
Fri Mar 27 17:42:58 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.
+
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
