Mailinglist Archive: opensuse-commit (1650 mails)
| < Previous | Next > |
commit xorg-x11-driver-video
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 08 Oct 2008 12:05:56 +0200
- Message-id: <20081008100556.ABEC067816D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Wed Oct 8 12:05:56 CEST 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-10-07
12:37:44.000000000 +0200
+++
/mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes
2008-10-07 21:56:16.554890582 +0200
@@ -1,0 +2,7 @@
+Tue Oct 7 21:53:59 CEST 2008 - sndirsch@xxxxxxx
+
+- xf86-video-mga-hal.diff
+ * renamed "mga_hal" module to "mgahal" to fix "X -configure"
+ (bnc #428189)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.Y12762/_old 2008-10-08 12:05:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Y12762/_new 2008-10-08 12:05:01.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel
xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 7
+Release: 8
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -153,12 +153,12 @@
%patch3 -p0
#%patch4 -p1
popd
-pushd xf86-video-mga-1.4.9/src
-tar xzf %{SOURCE44}
+pushd xf86-video-mga-1.4.9
+tar xzf %{SOURCE44} -C src
%ifarch %ix86
-%patch12 -p1
+%patch12
%endif
-%patch56 -p1
+%patch56
popd
pushd xf86-video-tdfx-*
%patch10
@@ -234,7 +234,7 @@
%ifarch %ix86
pushd xf86-video-mga-1.4.9/src
gcc -m32 \
- -o $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/mga_hal_drv.so \
+ -o $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/mgahal_drv.so \
-shared \
.libs/mga_halmod.o .libs/clientlx.o HALlib/mgaHALlib.a \
-Wl,-Bstatic -Wl,-Bdynamic
@@ -283,6 +283,10 @@
%changelog
* Tue Oct 07 2008 sndirsch@xxxxxxx
+- xf86-video-mga-hal.diff
+ * renamed "mga_hal" module to "mgahal" to fix "X -configure"
+ (bnc #428189)
+* Tue Oct 07 2008 sndirsch@xxxxxxx
- xf86-video-intel 2.4.97.0_2.5-branch_979bb10
* latest git commit of 2.5-branch
- obsoletes xf86-video-intel-commit-fa2586a.diff
++++++ xf86-video-mga-hal.diff ++++++
--- /var/tmp/diff_new_pack.Y12762/_old 2008-10-08 12:05:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Y12762/_new 2008-10-08 12:05:02.000000000 +0200
@@ -28,3 +28,66 @@
#if defined(__cplusplus)
extern "C" {
+diff -u -r -p ../xf86-video-mga-1.4.9.orig//man/mga.man ./man/mga.man
+--- ../xf86-video-mga-1.4.9.orig//man/mga.man 2008-10-07 21:49:31.608857646
+0200
++++ man/mga.man 2008-10-07 21:50:34.455653742 +0200
+@@ -24,7 +24,7 @@ on G200 and newer systems, with either
+ .B TexturedVideo
+ or video overlay. The second head of dual\-head cards is supported for the
+ G450 and G550. Support for the second head on G400 cards requires a
+-binary\-only "mga_hal" module that is available from Matrox
++binary\-only "mgahal" module that is available from Matrox
+ <http://www.matrox.com>, and may be on the CD supplied with the card. That
+ module also provides various other enhancements, and may be necessary to
+ use the DVI (digital) output on the G550 (and other cards).
+@@ -119,7 +119,7 @@ possibly unstable. The default is
+ .B XAA.
+ .TP
+ .BI "Option \*qNoHal\*q \*q" boolean \*q
+-Disable or enable loading the "mga_hal" module. Default: the module is
++Disable or enable loading the "mgahal" module. Default: the module is
+ loaded when available and when using hardware that it supports.
+ .TP
+ .BI "Option \*qOverclockMem\*q"
+diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_driver.c ./src/mga_driver.c
+--- ../xf86-video-mga-1.4.9.orig//src/mga_driver.c 2008-10-07
21:49:31.852868503 +0200
++++ src/mga_driver.c 2008-10-07 21:50:51.524413133 +0200
+@@ -1800,7 +1800,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
+ "Hal", loadHal);
+ from = X_CONFIG;
+ }
+- if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
++ if (loadHal && xf86LoadSubModule(pScrn, "mgahal")) {
+ xf86LoaderReqSymLists(halSymbols, NULL);
+ xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
+ pMga->HALLoaded = TRUE;
+@@ -1822,7 +1822,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
+ pMga->DualHeadEnabled = TRUE;
+ } else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "This card requires the \"mga_hal\" module for dual-head operation\n"
++ "This card requires the \"mgahal\" module for dual-head operation\n"
+ "\tIt can be found at the Matrox web site <http://www.matrox.com>\n");
+ }
+ }
+diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c ./src/mga_halmod.c
+--- ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c 2008-10-07
21:49:32.324889503 +0200
++++ src/mga_halmod.c 2008-10-07 21:51:29.818116810 +0200
+@@ -14,7 +14,7 @@ static MODULESETUPPROTO(halSetup);
+
+ static XF86ModuleVersionInfo halVersRec =
+ {
+- "mga_hal",
++ "mgahal",
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+@@ -30,7 +30,7 @@ static XF86ModuleVersionInfo halVersRec
+ * This is the module init data.
+ * Its name has to be the driver name followed by ModuleData.
+ */
+-_X_EXPORT XF86ModuleData mga_halModuleData = { &halVersRec, halSetup, NULL };
++_X_EXPORT XF86ModuleData mgahalModuleData = { &halVersRec, halSetup, NULL };
+
+ static pointer
+ halSetup(pointer module, pointer opts, int *errmaj, int *errmin)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |