+++ /dev/null
-Index: xf86-video-openchrome-0.2.904/src/via_drm.h\r
-===================================================================\r
---- xf86-video-openchrome-0.2.904/src/via_drm.h (revision 415)\r
-+++ xf86-video-openchrome-0.2.904/src/via_drm.h (revision 839)\r
-@@ -17,5 +17,5 @@\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL\r
-- * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR\r
-+ * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR\r
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\r
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\r
-@@ -25,4 +25,6 @@\r
- #define _VIA_DRM_H_\r
- \r
-+#include "drm.h"\r
-+\r
- /* WARNING: These defines must be the same as what the Xserver uses.\r
- * if you change them, you must change the defines in the Xserver.\r
-@@ -32,14 +34,12 @@\r
- #define _VIA_DEFINES_\r
- \r
--#if !defined(__KERNEL__) && !defined(_KERNEL)\r
- #include "via_drmclient.h"\r
--#endif\r
--\r
--#define VIA_NR_SAREA_CLIPRECTS 8\r
-+\r
-+#define VIA_NR_SAREA_CLIPRECTS 8\r
- #define VIA_NR_XVMC_PORTS 10\r
- #define VIA_NR_XVMC_LOCKS 5\r
- #define VIA_MAX_CACHELINE_SIZE 64\r
- #define XVMCLOCKPTR(saPriv,lockNo) \\r
-- ((volatile drm_hw_lock_t *)(((((unsigned long) (saPriv)->XvMCLockArea) + \\r
-+ ((__volatile__ struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \\r
- (VIA_MAX_CACHELINE_SIZE - 1)) & \\r
- ~(VIA_MAX_CACHELINE_SIZE - 1)) + \\r
-@@ -108,25 +108,24 @@\r
- #define VIA_DEPTH 0x4\r
- #define VIA_STENCIL 0x8\r
--\r
- #define VIA_MEM_VIDEO 0 /* matches drm constant */\r
- #define VIA_MEM_AGP 1 /* matches drm constant */\r
--#define VIA_MEM_SYSTEM 2 \r
-+#define VIA_MEM_SYSTEM 2\r
- #define VIA_MEM_MIXED 3\r
- #define VIA_MEM_UNKNOWN 4\r
- \r
- typedef struct {\r
-- uint32_t offset;\r
-- uint32_t size;\r
-+ __u32 offset;\r
-+ __u32 size;\r
- } drm_via_agp_t;\r
- \r
- typedef struct {\r
-- uint32_t offset;\r
-- uint32_t size;\r
-+ __u32 offset;\r
-+ __u32 size;\r
- } drm_via_fb_t;\r
- \r
- typedef struct {\r
-- uint32_t context;\r
-- uint32_t type;\r
-- uint32_t size;\r
-+ __u32 context;\r
-+ __u32 type;\r
-+ __u32 size;\r
- unsigned long index;\r
- unsigned long offset;\r
-@@ -150,7 +149,7 @@\r
- VIA_FUTEX_WAKE = 0X01\r
- } func;\r
-- uint32_t ms;\r
-- uint32_t lock;\r
-- uint32_t val;\r
-+ __u32 ms;\r
-+ __u32 lock;\r
-+ __u32 val;\r
- } drm_via_futex_t;\r
- \r
-@@ -159,5 +158,5 @@\r
- VIA_INIT_DMA = 0x01,\r
- VIA_CLEANUP_DMA = 0x02,\r
-- VIA_DMA_INITIALIZED = 0x03\r
-+ VIA_DMA_INITIALIZED = 0x03\r
- } func;\r
- \r
-@@ -168,5 +167,5 @@\r
- \r
- typedef struct _drm_via_cmdbuffer {\r
-- char __user *buf;\r
-+ char *buf;\r
- unsigned long size;\r
- } drm_via_cmdbuffer_t;\r
-@@ -184,5 +183,5 @@\r
- unsigned int dirty;\r
- unsigned int nbox;\r
-- drm_clip_rect_t boxes[VIA_NR_SAREA_CLIPRECTS];\r
-+ struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS];\r
- drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1];\r
- int texAge; /* last time texture was uploaded */\r
-@@ -200,10 +199,9 @@\r
- unsigned int XvMCDisplaying[VIA_NR_XVMC_PORTS];\r
- unsigned int XvMCSubPicOn[VIA_NR_XVMC_PORTS];\r
-- unsigned int XvMCCtxNoGrabbed; /* Last context to hold decoder */ \r
-+ unsigned int XvMCCtxNoGrabbed; /* Last context to hold decoder */\r
- \r
- /* Used by the 3d driver only at this point, for pageflipping:\r
- */\r
--\r
-- unsigned int pfCurrentOffset;\r
-+ unsigned int pfCurrentOffset;\r
- } drm_via_sarea_t;\r
- \r
-@@ -214,5 +212,5 @@\r
- } func;\r
- int wait;\r
-- uint32_t size;\r
-+ __u32 size;\r
- } drm_via_cmdbuf_size_t;\r
- \r
-@@ -226,17 +224,19 @@\r
- #define VIA_IRQ_FLAGS_MASK 0xF0000000\r
- \r
--enum drm_via_irqs{drm_via_irq_hqv0 = 0,\r
-- drm_via_irq_hqv1,\r
-- drm_via_irq_dma0_dd,\r
-- drm_via_irq_dma0_td,\r
-- drm_via_irq_dma1_dd,\r
-- drm_via_irq_dma1_td,\r
-- drm_via_irq_num};\r
--\r
--struct drm_via_wait_irq_request{\r
-+enum drm_via_irqs {\r
-+ drm_via_irq_hqv0 = 0,\r
-+ drm_via_irq_hqv1,\r
-+ drm_via_irq_dma0_dd,\r
-+ drm_via_irq_dma0_td,\r
-+ drm_via_irq_dma1_dd,\r
-+ drm_via_irq_dma1_td,\r
-+ drm_via_irq_num\r
-+};\r
-+\r
-+struct drm_via_wait_irq_request {\r
- unsigned irq;\r
- via_irq_seq_type_t type;\r
-- uint32_t sequence;\r
-- uint32_t signal;\r
-+ __u32 sequence;\r
-+ __u32 signal;\r
- };\r
- \r
-@@ -246,25 +246,30 @@\r
- } drm_via_irqwait_t;\r
- \r
--typedef struct drm_via_blitsync { \r
-- uint32_t sync_handle;\r
-+typedef struct drm_via_blitsync {\r
-+ __u32 sync_handle;\r
- unsigned engine;\r
- } drm_via_blitsync_t;\r
- \r
-+/* - * Below,"flags" is currently unused but will be used for possible future\r
-+ * extensions like kernel space bounce buffers for bad alignments and\r
-+ * blit engine busy-wait polling for better latency in the absence of\r
-+ * interrupts.\r
-+ */\r
-+\r
- typedef struct drm_via_dmablit {\r
-- uint32_t num_lines; \r
-- uint32_t line_length; \r
--\r
-- uint32_t fb_addr; \r
-- uint32_t fb_stride; \r
--\r
-- unsigned char *mem_addr; \r
-- uint32_t mem_stride; \r
-- \r
-- int bounce_buffer;\r
-- int to_fb;\r
--\r
-- drm_via_blitsync_t sync; \r
-+ __u32 num_lines;\r
-+ __u32 line_length;\r
-+\r
-+ __u32 fb_addr;\r
-+ __u32 fb_stride;\r
-+\r
-+ unsigned char *mem_addr;\r
-+ __u32 mem_stride;\r
-+\r
-+ __u32 flags;\r
-+ int to_fb;\r
-+\r
-+ drm_via_blitsync_t sync;\r
- } drm_via_dmablit_t;\r
- \r
--\r
- #endif /* _VIA_DRM_H_ */\r
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.904-r1.ebuild,v 1.1 2010/03/21 16:52:14 chithanh Exp $
-
-XDPVER="-1"
-IUSE="debug dri"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for VIA/S3G cards"
-HOMEPAGE="http://www.openchrome.org"
-SRC_URI="${HOMEPAGE}/releases/${P}.tar.bz2"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-RDEPEND=">=x11-base/xorg-server-1.2
- dri? ( >=x11-libs/libdrm-2.4.17 )"
-DEPEND="${RDEPEND}
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/libXvMC
- x11-proto/randrproto
- x11-proto/videoproto
- x11-proto/xextproto
- x11-proto/xproto
- dri? (
- x11-proto/xf86driproto
- x11-proto/glproto
- )"
-
-DOCS="ChangeLog NEWS README"
-
-pkg_setup() {
- CONFIGURE_OPTIONS="
- $(use_enable debug)
- $(use_enable debug xv-debug)
- "
- PATCHES=( "${FILESDIR}/${P}-libdrm-2.4.17.patch" )
-}
-
-pkg_postinst() {
- elog "Supported chipsets:"
- elog ""
- elog "CLE266 (VT3122)"
- elog "KM400/P4M800 (VT3205)"
- elog "K8M800 (VT3204)"
- elog "PM800/PM880/CN400 (VT3259)"
- elog "VM800/CN700/P4M800Pro (VT3314)"
- elog "CX700 (VT3324)"
- elog "P4M890 (VT3327)"
- elog "K8M890 (VT3336)"
- elog "P4M900/VN896 (VT3364)"
- elog ""
- elog "The driver name is 'openchrome', and this is what you need"
- elog "to use in your xorg.conf now (instead of 'via')."
- elog ""
- elog "See the ChangeLog and release notes for more information."
-}
projects / gentoo.git / commitdiff