ALT Linux Team development discussions
 help / color / mirror / Atom feed
* [devel] впечатление от нового xorg-x11 в Сизифе
@ 2005-08-13 12:09 Konstantin A. Lepikhov
  2005-08-13 12:30 ` Valery V. Inozemtsev
  2005-08-13 13:40 ` Konstantin A. Lepikhov
  0 siblings, 2 replies; 11+ messages in thread
From: Konstantin A. Lepikhov @ 2005-08-13 12:09 UTC (permalink / raw)
  To: ALT Linux Devel Mailing List


[-- Attachment #1.1: Type: text/plain, Size: 1189 bytes --]

Hi!

Есть несколько замечаний по новой сборке. Можно их разценивать как
bugreport.

1) с этой сборкой shrek@ обещал светлое будущее всем обладателям
radeon'ов. К сожалению, светлое будущее проехало мимо. Во-первых,
xorg-x11-drv-ati ни разу не Obsoletes: xorg-x11-drv-ati_gatos, т.к. не
имеет TV-out патча. Так что я могу разценивать этот шаг как саботаж
отдельно взятого пакета ;) Во-вторых, собирать из extras/Mesa только
r300_dri неправильно, т.к. в этом случае мы опять получаем dri без
прибамбасов - т.е. без поддержки hyperz и без поддержки внешних s3tc
библиотек. В-третьих было бы здорово, если вообще все radeon's собирались
из extras/Mesa. Исправленный патчик прилагается.

2) Отвалился -sdk. В changelog по этому поводу молчание. Патчик,
исправляющий ситуацию прилагается

3) Прилагается diff .spec с моими рекомендациями и исправлениями.

PS ccache рулит - 4 раза пересобрать xorg и не уснуть - это надо уметь ;)

-- 
WBR, Konstantin	      chat with ==>ICQ: 109916175
     Lepikhov,	      speak  to ==>JID: lakostis@jabber.org
aka L.A. Kostis       write  to ==>mailto:lakostis@pisem.net.nospam

...The information is like the bank... 			  (c) EC8OR

[-- Attachment #1.2: xorg-x11-6.8.99.900-alt-linux-dri.patch --]
[-- Type: text/plain, Size: 1363 bytes --]

--- xc/extras/Mesa/configs/linux-dri.orig	2005-08-01 11:06:38 +0400
+++ xc/extras/Mesa/configs/linux-dri	2005-08-04 22:56:12 +0400
@@ -9,7 +9,7 @@
 CC = gcc
 CXX = g++
 
-MKDEP = /usr/X11R6/bin/makedepend
+MKDEP = $(TOP)/../../config/makedepend/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 
@@ -24,7 +24,7 @@
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+X11_INCLUDES = -I$(TOP)/../../exports/include -I$(TOP)/../../exports/include/X11 -I$(TOP)/../../exports/include/X11/extensions
 
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(ASM_FLAGS) -std=c99 -ffast-math 
@@ -34,8 +34,10 @@
 
 ASM_SOURCES = 
 
+DRM_SOURCE_PATH = $(TOP)/../drm
+
 # Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
+EXTRA_LIB_PATH=-L$(TOP)/../../exports/lib
 
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
@@ -49,5 +51,4 @@
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+DRI_DIRS = dri_client r200 r300 radeon savage

[-- Attachment #1.3: xorg-x11-6.8.99.900-alt-sdk-build-fix.patch --]
[-- Type: text/plain, Size: 1257 bytes --]

--- xc/config/cf/Imake.rules~	2005-03-11 10:47:32 +0300
+++ xc/config/cf/Imake.rules	2005-08-13 14:54:55 +0400
@@ -3112,9 +3112,18 @@ NamedTargetSubdirs(includes,dirs,includi
 #define InstallDriverSDKObjectModule(module,dest,subdir)
 #endif
 #ifndef InstallDriverSDKObjectSubModule
+#if !DoLoadableServer
 #define InstallDriverSDKObjectSubModule(module,dest,subdir)
+#else
+#if MakeDllModules
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)                @@\
+InstallDynamicModule(Concat(module,.so),dest,subdir)
+#else
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)                @@\
+InstallDynamicModule(Concat(module,.o),dest,subdir)
+#endif
+#endif
 #endif
-
 
 
 /*
--- xc/config/cf/xf86.rules~	2004-04-23 22:41:59 +0400
+++ xc/config/cf/xf86.rules	2005-08-13 15:01:55 +0400
@@ -188,7 +188,7 @@ InstallDriverSDKDynamicModule(Concat(mod
 #else
 #if MakeDllModules
 #define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)
+InstallDriverSDKDynamicModule(Concat(module,.so),dest,subdir)
 #else
 #define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
 InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)

[-- Attachment #1.4: xorg-x11.spec.diff --]
[-- Type: text/plain, Size: 1908 bytes --]

--- xorg-x11.spec.orig	2005-08-09 12:33:03 +0400
+++ xorg-x11.spec	2005-08-13 15:38:55 +0400
@@ -1,10 +1,10 @@
 %def_enable xprt
-%def_disable sdk
+%def_enable sdk
 %def_disable drmsrc
 
 Name: xorg-x11
 Version: 6.8.99.900
-Release: alt2
+Release: alt2.1
 
 %define src_version %version
 %define mesa_version 6.3.1
@@ -111,6 +111,7 @@ Patch55000: %name-6.8.99.900-alt-linux-d
 Patch55001: %name-6.8.99.900-osmesa-imake-x86_64.patch
 Patch55002: %name-6.8.99.900-mesa-make.patch
 Patch55003: %name-6.8.99.900-drm.patch.bz2
+Patch55004: %name-6.8.99.900-alt-sdk-build-fix.patch
 
 # RedHat patches
 Patch90011: XFree86-4.3.0-makefile-fastbuild.patch
@@ -620,8 +621,8 @@ and SuperSavage chips.
 Summary: ATI video drivers for X Window System
 Group: System/X11
 PreReq: %name-server = %version-%release
-Obsoletes: XFree86-ati-gatos, xorg-x11-drv-ati_gatos
-Provides: XFree86-ati-gatos, xorg-x11-drv-ati_gatos
+Obsoletes: XFree86-ati-gatos
+Provides: XFree86-ati-gatos
 Provides: x11-driver-r128, x11-driver-radeon, x11-driver-ati
 
 %description drv-ati
@@ -1040,6 +1041,9 @@ find -type d -name CVS | xargs rm -fr
 %patch55000 -p0
 %patch55002 -p0
 %patch55003 -p0
+%if_enabled sdk
+%patch55004 -p0
+%endif
 
 # Red Hat patches
 %patch90011 -p0
@@ -1265,6 +1269,7 @@ touch %buildroot%_sysconfdir/security/co
 %make DESTDIR=%buildroot install install.man -C xc
 %if_enabled sdk
 %make DESTDIR=%buildroot install.sdk -C xc
+%add_strip_skiplist %_x11libdir/Server/drivers/rendition/*.uc
 %endif
 
 # install DRI drivers
@@ -2412,6 +2417,10 @@ fi
 %endif
 
 %changelog
+* Sat Aug 13 2005 LAKostis <lakostis at altlinux.ru> 6.8.99.900-alt2.1
+- add -sdk package and fix it's build.
+- build all radeons dri from extras/Mesa.
+
 * Tue Aug 09 2005 Valery Inozemtsev <shrek@altlinux.ru> 6.8.99.900-alt2
 - fixed build OSMesa for x86_64
 - fixed requires

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2005-08-15 16:17 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-08-13 12:09 [devel] впечатление от нового xorg-x11 в Сизифе Konstantin A. Lepikhov
2005-08-13 12:30 ` Valery V. Inozemtsev
2005-08-13 12:34   ` [devel] " Konstantin A. Lepikhov
2005-08-13 12:36     ` Valery V. Inozemtsev
2005-08-13 12:43       ` Konstantin A. Lepikhov
2005-08-15 16:17   ` Michael Shigorin
2005-08-13 13:40 ` Konstantin A. Lepikhov
2005-08-13 13:48   ` Денис Смирнов
2005-08-13 14:29     ` Konstantin A. Lepikhov
2005-08-13 20:46       ` Денис Смирнов
2005-08-13 20:57         ` Konstantin A. Lepikhov

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git