Hello community,
here is the log from the commit of package xorg-x11-driver-video for
openSUSE:Factory
checked in at Wed Jul 27 11:31:24 CEST 2011.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-07-02
21:11:24.000000000 +0200
+++
/mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes
2011-07-10 22:04:55.000000000 +0200
@@ -1,0 +2,13 @@
+Sun Jul 10 19:55:35 UTC 2011 - [email protected]
+
+- added U_xgi-Fix-build-on-bigendian.patch:
+ Fixed a big endian issue in xgi, extracted from xgi GIT (found by
+ Marcus Meissner).
+
+------------------------------------------------------------------
+Sun Jul 10 19:54:53 UTC 2011 - [email protected]
+
+- renamed xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
+ to U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
New:
----
U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch
U_xgi-Fix-build-on-bigendian.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.VBxOpz/_old 2011-07-27 11:30:32.000000000 +0200
+++ /var/tmp/diff_new_pack.VBxOpz/_new 2011-07-27 11:30:32.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel
xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 73
+Release: 75
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -97,7 +97,8 @@
Patch145: xf86-video-xgixp-symbols.diff
Patch150: xf86-video-intel-dell_backlight.diff
Patch155: xf86-video-intel-copyfb.diff
-Patch156: xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
+Patch156: U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch
+Patch157: U_xgi-Fix-build-on-bigendian.patch
%description
This package contains X.Org video drivers.
@@ -149,6 +150,7 @@
pushd xf86-video-xgi-*
%patch143 -p1
%patch144 -p1
+%patch157 -p1
popd
pushd xf86-video-xgixp-*
%patch145 -p1
++++++ U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch ++++++
>From 30d46e6c28479e07ac8328b6f4dfc2692eb1ac6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin-=C3=89ric=20Racine?= <[email protected]>
Date: Mon, 7 Feb 2011 00:04:06 +0000
Subject: [PATCH] Stop including "linux/videodev.h" in z4l.c
V4L1 support was dropped as of Linux kernel 2.6.38
Patch-mainline: From Upstream
---
src/z4l.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/z4l.c b/src/z4l.c
index 11b3fa5..d44ff73 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -55,7 +55,6 @@ typedef long long __s64;
#define __u64 __u_64
typedef unsigned long long __u64;
-#include "linux/videodev.h"
#define __user
#include "linux/videodev2.h"
--
1.7.4.1
++++++ U_xgi-Fix-build-on-bigendian.patch ++++++
>From 82b83468d0ce39c52975a9a4dccbebc6abf6968e Mon Sep 17 00:00:00 2001
From: Adam Jackson <[email protected]>
Date: Fri, 25 Mar 2011 18:55:27 -0400
Subject: [PATCH] Fix build on bigendian
Patch-mainline: From Upstream
Signed-off-by: Adam Jackson <[email protected]>
---
src/Makefile.am | 2 ++
src/vb_init.c | 4 +++-
src/xgi_accel.c | 15 +--------------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 96e7018..505f4c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,8 @@ xgi_drv_la_SOURCES = \
vb_def.h \
vb_ext.c \
vb_ext.h \
+ vb_i2c.c \
+ vb_i2c.h \
vb_init.c \
vb_init.h \
vb_setmode.c \
diff --git a/src/vb_init.c b/src/vb_init.c
index 8338410..50980c4 100755
--- a/src/vb_init.c
+++ b/src/vb_init.c
@@ -131,6 +131,8 @@ static void
XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT,
PVB_DEVICE_INFO);
static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
+/* horrible */
+#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340(
PXGI_HW_DEVICE_INFO HwDeviceExtension ,
}
temp3 = 0 ;
- for( k = 0 ; k < 4 ; k++ )
+ for( k = 1 ; k < 4 ; k++ )
{
XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;
/* CR6E_D[1:0] select channel */
temp2 = 0 ;
diff --git a/src/xgi_accel.c b/src/xgi_accel.c
index c072691..4536c81 100755
--- a/src/xgi_accel.c
+++ b/src/xgi_accel.c
@@ -200,20 +200,7 @@ extern int FbDevExist;
#endif
#if X_BYTE_ORDER == X_BIG_ENDIAN
-static CARD32 BE_SWAP32 (CARD32 val)
-{
- PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
- if (CurrentColorDepth == 8)
- return ((((val) & 0x000000ff) << 24) | \
- (((val) & 0x0000ff00) << 8) | \
- (((val) & 0x00ff0000) >> 8) | \
- (((val) & 0xff000000) >> 24));
- if (CurrentColorDepth == 24)
- return val;
- if (CurrentColorDepth == 16)
- return ((((val) & 0x0000ffff) << 16) | \
- (((val) & 0xffff0000) >> 16));
-}
+#define BE_SWAP32(x) swapl(x)
#else
static CARD32 BE_SWAP32 (CARD32 val)
{
--
1.6.0.2
>From 2195d1cf692652fc51a94286a347000729301a32 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <[email protected]>
Date: Sun, 27 Mar 2011 15:17:04 -0700
Subject: [PATCH] BuildFix for big endian machines (fixes incorrect macro in
previous commit).
Signed-off-by: Jeremy Huddleston <[email protected]>
---
src/xgi_accel.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xgi_accel.c b/src/xgi_accel.c
index 4536c81..4c298ed 100755
--- a/src/xgi_accel.c
+++ b/src/xgi_accel.c
@@ -200,7 +200,7 @@ extern int FbDevExist;
#endif
#if X_BYTE_ORDER == X_BIG_ENDIAN
-#define BE_SWAP32(x) swapl(x)
+#define BE_SWAP32(x) lswapl(x)
#else
static CARD32 BE_SWAP32 (CARD32 val)
{
--
1.6.0.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
