rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-enable-composite.patch, 1.1, 1.1.2.1 xorg-x11-server-1.1.1-mesa-6.5.1.patch, 1.2, 1.2.2.1 xorg-x11-server-1.1.1-selinux-awareness.patch, 1.1, 1.1.2.1 xorg-x11-server.spec, 1.170.2.1, 1.170.2.2 comment-header-modefiles.txt, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 15 17:39:53 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10033
Modified Files:
Tag: private-1_2-branch
xorg-x11-server-1.1.1-enable-composite.patch
xorg-x11-server-1.1.1-mesa-6.5.1.patch
xorg-x11-server-1.1.1-selinux-awareness.patch
xorg-x11-server.spec
Removed Files:
Tag: private-1_2-branch
comment-header-modefiles.txt
Log Message:
* Thu Sep 14 2006 Adam Jackson <ajackson at redhat.com> - 1.1.99.3-0.1.fc6
- Initial attempt to get pre-1.2 building.
- Omit applying fedora patches unless $FEDORA is set at rpmbuild time.
xorg-x11-server-1.1.1-enable-composite.patch:
utils.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: xorg-x11-server-1.1.1-enable-composite.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-enable-composite.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- xorg-x11-server-1.1.1-enable-composite.patch 13 Jul 2006 21:20:42 -0000 1.1
+++ xorg-x11-server-1.1.1-enable-composite.patch 15 Sep 2006 17:39:51 -0000 1.1.2.1
@@ -1,11 +1,11 @@
---- ./os/utils.c.enable-composite 2006-07-13 17:12:10.000000000 -0400
-+++ ./os/utils.c 2006-07-13 17:12:50.000000000 -0400
-@@ -139,7 +139,7 @@
- #ifdef XFree86Server
- /* COMPOSITE is disabled by default for now until the
- * interface is stable */
-- #define COMPOSITE_DEFAULT FALSE
-+ #define COMPOSITE_DEFAULT TRUE
- #else
- #define COMPOSITE_DEFAULT TRUE
- #endif
+--- xorg-server-1.1.99.3/os/utils.c.enable-composite 2006-07-21 19:12:41.000000000 -0400
++++ xorg-server-1.1.99.3/os/utils.c 2006-09-14 22:25:46.000000000 -0400
+@@ -138,7 +138,7 @@ _X_EXPORT Bool noBigReqExtension = FALSE
+ #ifdef COMPOSITE
+ /* COMPOSITE is disabled by default for now until the
+ * interface is stable */
+- #define COMPOSITE_DEFAULT FALSE
++ #define COMPOSITE_DEFAULT TRUE
+ _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT;
+ #endif
+
xorg-x11-server-1.1.1-mesa-6.5.1.patch:
symlink-mesa.sh | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: xorg-x11-server-1.1.1-mesa-6.5.1.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-mesa-6.5.1.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- xorg-x11-server-1.1.1-mesa-6.5.1.patch 25 Aug 2006 04:54:22 -0000 1.2
+++ xorg-x11-server-1.1.1-mesa-6.5.1.patch 15 Sep 2006 17:39:51 -0000 1.2.2.1
@@ -1,48 +1,7 @@
-diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
-index 867fe57..4d5b0cd 100644
---- a/GL/mesa/main/Makefile.am
-+++ b/GL/mesa/main/Makefile.am
-@@ -29,6 +27,7 @@ nodist_libmain_la_SOURCES = accum.c \
- api_loopback.c \
- api_noop.c \
- api_validate.c \
-+ arrayobj.c \
- attrib.c \
- blend.c \
- bufferobj.c \
-@@ -67,6 +66,7 @@ nodist_libmain_la_SOURCES = accum.c \
- points.c \
- polygon.c \
- rastpos.c \
-+ rbadaptors.c \
- renderbuffer.c \
- state.c \
- stencil.c \
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index ccaa2a9..32f839a 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
-@@ -88,8 +88,11 @@ symlink_mesa_main() {
- action api_noop.h
- action api_validate.c
- action api_validate.h
-+ action arrayobj.c
-+ action arrayobj.h
- action attrib.c
- action attrib.h
-+ action bitset.h
- action blend.c
- action blend.h
- action bufferobj.c
-@@ -168,6 +171,8 @@ symlink_mesa_main() {
- action polygon.h
- action rastpos.c
- action rastpos.h
-+ action rbadaptors.c
-+ action rbadaptors.h
- action renderbuffer.c
- action renderbuffer.h
- action simple_list.h
@@ -468,7 +468,7 @@ symlink_mesa_shader_slang_library() {
action slang_core_gc.h
action slang_fragment_builtin_gc.h
xorg-x11-server-1.1.1-selinux-awareness.patch:
configure.ac | 4 +++-
hw/xfree86/dixmods/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: xorg-x11-server-1.1.1-selinux-awareness.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-selinux-awareness.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- xorg-x11-server-1.1.1-selinux-awareness.patch 25 Jul 2006 20:26:27 -0000 1.1
+++ xorg-x11-server-1.1.1-selinux-awareness.patch 15 Sep 2006 17:39:51 -0000 1.1.2.1
@@ -1,6 +1,6 @@
---- xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am.selinux-awareness 2006-07-05 14:38:47.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am 2006-07-25 15:45:47.000000000 -0400
-@@ -40,7 +40,7 @@
+--- xorg-server-1.1.99.3/hw/xfree86/dixmods/Makefile.am.selinux-awareness 2006-07-20 16:27:48.000000000 -0400
++++ xorg-server-1.1.99.3/hw/xfree86/dixmods/Makefile.am 2006-09-15 00:42:21.000000000 -0400
+@@ -42,7 +42,7 @@ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/GL/glx
libGLcore_la_LDFLAGS = -avoid-version
@@ -9,9 +9,9 @@
libGLcore_la_SOURCES = GLcoremodule.c
libafb_la_LDFLAGS = -avoid-version
---- xorg-server-1.1.1/configure.ac.selinux-awareness 2006-07-07 19:44:45.000000000 -0400
-+++ xorg-server-1.1.1/configure.ac 2006-07-25 16:06:24.000000000 -0400
-@@ -233,6 +233,8 @@
+--- xorg-server-1.1.99.3/configure.ac.selinux-awareness 2006-07-30 04:00:22.000000000 -0400
++++ xorg-server-1.1.99.3/configure.ac 2006-09-15 00:46:15.000000000 -0400
+@@ -236,6 +236,8 @@ case $host_cpu in
;;
esac
@@ -20,12 +20,12 @@
dnl BSD *_video.c selection
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
-@@ -954,7 +956,7 @@
+@@ -936,7 +938,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
-- XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
-+ XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $XSERVER_LIBS"
+- XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
++ XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $XSERVER_LIBS"
AC_SUBST([XNEST_LIBS])
fi
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.170.2.1
retrieving revision 1.170.2.2
diff -u -r1.170.2.1 -r1.170.2.2
--- xorg-x11-server.spec 15 Sep 2006 02:24:59 -0000 1.170.2.1
+++ xorg-x11-server.spec 15 Sep 2006 17:39:51 -0000 1.170.2.2
@@ -1,17 +1,15 @@
-
%define pkgname xorg-server
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.1.1
-Release: 38%{?dist}
+Version: 1.1.99.3
+Release: 0.1%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
-Source100: comment-header-modefiles.txt
Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=5093
@@ -26,8 +24,6 @@
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
Patch101: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
-Patch103: xorg-x11-server-1.1.0-tfp-damage.patch
-Patch104: xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
Patch105: xorg-x11-server-1.1.1-enable-composite.patch
Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.patch
Patch107: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
@@ -44,7 +40,6 @@
Patch1005: xorg-x11-server-1.1.1-builtin-fonts.patch
# Backports of post-1.1 stuff.
-Patch2001: xorg-x11-server-1.1.0-pci-scan-fixes.patch
Patch2004: xorg-x11-server-1.1.0-no-zlib.patch
Patch2005: xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
Patch2006: xorg-x11-server-1.1.1-revert-xkb-change.patch
@@ -332,6 +327,12 @@
%prep
%setup -q -n %{pkgname}-%{version}
+
+# hack
+%patch108 -p1 -b .mesa-651
+%patch1004 -p1 -b .selinux-awareness
+[ -n "$FEDORA" ] || exit 0
+
%patch0 -p0 -b .init-origins-fix
%patch3 -p0 -b .parser-add-missing-headers-to-sdk
%patch5 -p0 -b .libxf86config-dont-write-empty-sections
@@ -341,22 +342,17 @@
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
-%patch103 -p0 -b .tfp-damage
-%patch104 -p0 -b .mesa-copy-sub-buffer
-%patch105 -p0 -b .enable-composite
+%patch105 -p1 -b .enable-composite
%patch106 -p1 -b .no-xnest-composite
%patch107 -p1 -b .offscreen-pixmaps
-%patch108 -p1 -b .mesa-651
%patch109 -p1 -b .aiglx-happy-vt-switch
%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
%patch1001 -p1 -b .Red-Hat-extramodes
%patch1002 -p1 -b .xephyr
%patch1003 -p1 -b .fpic
-%patch1004 -p1 -b .selinux-awareness
%patch1005 -p0 -b .builtin-fonts
-%patch2001 -p1 -b .pci-scan
%patch2004 -p1 -b .zlib
%patch2005 -p1 -b .Xdmx
%patch2006 -p1 -b .revert-xkb-change
@@ -430,11 +426,7 @@
# be able to parse the same modelist as the X server uses (rhpxl).
{
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
- for each in vesamodes extramodes ; do
- install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
- cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
- chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
- done
+ install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/
}
%endif
@@ -482,6 +474,12 @@
rm -rf $RPM_BUILD_ROOT/var/lib/xkb
# rm -f $RPM_BUILD_ROOT%{_datadir}/man/man1/Xserver.1x*
%endif
+
+ # XXX pre-1.2 noise. fix me properly please.
+ rm -f $RPM_BUILD_ROOT/%{_bindir}/X{ati,chips,epson,fake,fbdev,i810,mach64}
+ rm -f $RPM_BUILD_ROOT/%{_bindir}/X{mga,neomagic,nvidia,pm2,r128,sdl,smi}
+ rm -f $RPM_BUILD_ROOT/%{_bindir}/X{vesa,via}
+ rm -f $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/librac.a
}
%clean
@@ -577,7 +575,6 @@
%{_libdir}/xorg/modules/extensions/libxtrap.so
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/fonts
-%{_libdir}/xorg/modules/fonts/libbitmap.so
%{_libdir}/xorg/modules/fonts/libfreetype.so
%{_libdir}/xorg/modules/fonts/libtype1.so
%dir %{_libdir}/xorg/modules/linux
@@ -595,7 +592,6 @@
%{_libdir}/xorg/modules/multimedia/uda1380_drv.so
%{_libdir}/xorg/modules/libafb.so
%{_libdir}/xorg/modules/libcfb.so
-%{_libdir}/xorg/modules/libcfb16.so
%{_libdir}/xorg/modules/libcfb32.so
%{_libdir}/xorg/modules/libddc.so
%{_libdir}/xorg/modules/libexa.so
@@ -604,7 +600,6 @@
%{_libdir}/xorg/modules/libint10.so
%{_libdir}/xorg/modules/libmfb.so
%{_libdir}/xorg/modules/libpcidata.so
-%{_libdir}/xorg/modules/librac.so
%{_libdir}/xorg/modules/libramdac.so
%{_libdir}/xorg/modules/libscanpci.so
%{_libdir}/xorg/modules/libshadow.so
@@ -630,6 +625,7 @@
#%dir %{_mandir}/man4x
#%{_mandir}/man4/fbdevhw.4x*
%{_mandir}/man4/fbdevhw.4*
+%{_mandir}/man4/exa.4*
#%dir %{_mandir}/man5x
%{_mandir}/man5/xorg.conf.5x*
%dir %{_localstatedir}/lib/xkb
@@ -708,6 +704,10 @@
# -------------------------------------------------------------------
%changelog
+* Thu Sep 14 2006 Adam Jackson <ajackson at redhat.com> - 1.1.99.3-0.1.fc6
+- Initial attempt to get pre-1.2 building.
+- Omit applying fedora patches unless $FEDORA is set at rpmbuild time.
+
* Thu Sep 7 2006 Adam Jackson <ajackson at redhat.coM> - 1.1.1-38.fc6
- xorg-x11-server-1.1.1-believe-monitor-rb-modes.patch: Always believe the
monitor when it reports a reduced-blanking mode, even over VGA.
--- comment-header-modefiles.txt DELETED ---
More information about the fedora-cvs-commits
mailing list