From 16cbfe909d4c0e4c560a7f7201c62000609ed1a7 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Mar 22 2006 01:56:39 +0000 Subject: - Update to 1.0.99.1 snapshot. --- diff --git a/.cvsignore b/.cvsignore index 8ab848c..dcf1190 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ -*.tar.bz2 -*.tar.gz -clog +xorg-server-1.0.99.1 +MesaLib-6.5.tar.bz2 +xorg-server-1.0.99.1.tar.bz2 +MesaLib-6.5-cvs20060321.tar.bz2 diff --git a/sources b/sources index 678cd83..b789490 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 +660b1c6a0910d92190a6a7f0427a576d xorg-server-1.0.99.1.tar.bz2 +0fd3d0b3f8970dbc9ab2083a611c887a MesaLib-6.5-cvs20060321.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 03d15fa..41edf83 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,16 +1,18 @@ %define pkgname xorg-server -%define cvsdate xxxxxxxxxxx +%define cvsdate cvs20060321 +%define mesalib MesaLib-6.5-cvs20060321.tar.bz2 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.0.1 -Release: 8 +Version: 1.0.99.1 +Release: 1 URL: http://www.x.org License: MIT/X11 Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 +Source1: %{mesalib} Source100: comment-header-modefiles.txt Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch @@ -26,10 +28,6 @@ Patch6: xserver-1.0.1-randr-sdk.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch -# Patches taken from xserver/xorg CVS HEAD, post-1.0.1 -Patch100: xorg-x11-server-1.0.1-fbpict-fix-rounding.patch -Patch101: xorg-x11-server-1.0.1-SEGV-on-null-interface.patch - Patch1000: xorg-redhat-die-ugly-pattern-die-die-die.patch Patch1001: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch @@ -99,7 +97,7 @@ BuildRequires: xorg-x11-font-utils >= 1.0.0-1 %if %{with_dri} BuildRequires: mesa-libGL-devel >= 6.4.1-1 # "mesa-libGL-source >= 6.4.2-2" required for the solution for bug #176976 -BuildRequires: mesa-source >= 6.4.2-2 +# BuildRequires: mesa-source >= 6.4.2-2 BuildRequires: libdrm-devel >= 2.0-1 %endif %description @@ -244,19 +242,18 @@ drivers, input drivers, or other X modules should install this package. %patch6 -p1 -b .randrsdk %patch7 -p1 -b .xf86configfpic -%patch100 -p2 -b .fbpict-fix-rounding -%patch101 -p2 -b .SEGV-on-null-interface - %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die %patch1001 -p1 -b .Red-Hat-extramodes +tar xfj %{_sourcedir}/%{mesalib} + %build #FONTDIR="${datadir}/X11/fonts" #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" # --disable-dependency-tracking \ -automake-1.7 ; autoconf +automake; autoconf %configure %{xservers} \ --disable-xprint \ --disable-static \ @@ -267,7 +264,7 @@ automake-1.7 ; autoconf --enable-lbx \ %if %{with_dri} --enable-dri \ - --with-mesa-source=%{_datadir}/mesa/source \ + --with-mesa-source=%{_builddir}/%{pkgname}-%{version}/Mesa-6.5 \ %endif --with-module-dir=%{moduledir} \ --with-os-name="Fedora Core 5" \ @@ -319,6 +316,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input} rm -f $RPM_BUILD_ROOT%{_bindir}/outl rm -f $RPM_BUILD_ROOT%{_bindir}/outw rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak + rm -f $RPM_BUILD_ROOT%{_bindir}/cvt %endif } @@ -393,6 +391,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/outl %{_bindir}/outw %{_bindir}/pcitweak +%{_bindir}/cvt %endif %{_bindir}/scanpci %dir %{_datadir}/xorg @@ -428,14 +427,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xorg/modules/libafb.so %{_libdir}/xorg/modules/libcfb.so %{_libdir}/xorg/modules/libcfb16.so -%{_libdir}/xorg/modules/libcfb24.so %{_libdir}/xorg/modules/libcfb32.so %{_libdir}/xorg/modules/libddc.so %{_libdir}/xorg/modules/libexa.so %{_libdir}/xorg/modules/libfb.so %{_libdir}/xorg/modules/libi2c.so %{_libdir}/xorg/modules/libint10.so -%{_libdir}/xorg/modules/liblayer.so %{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so %{_libdir}/xorg/modules/librac.so @@ -450,7 +447,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xorg/modules/libxf4bpp.so %{_libdir}/xorg/modules/libxf8_16bpp.so %{_libdir}/xorg/modules/libxf8_32bpp.so -%{_libdir}/xorg/modules/libxf8_32wid.so %dir %{_libdir}/xserver %{_libdir}/xserver/SecurityPolicy #%dir %{_mandir}/man1x @@ -460,6 +456,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/scanpci.1x* %{_mandir}/man1/Xorg.1x* %{_mandir}/man1/Xserver.1x* +%{_mandir}/man1/cvt.1* #%dir %{_mandir}/man4x #%{_mandir}/man4/fbdevhw.4x* %{_mandir}/man4/fbdevhw.4* @@ -522,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT # ------------------------------------------------------------------- %changelog +* Tue Mar 21 2006 Kristian Høgsberg 1.0.99.1-1 +- Update to 1.0.99.1 snapshot. + * Mon Mar 6 2006 Jeremy Katz - 1.0.1-8 - build libxf86config with -fPIC (#181292) - fix sgi 1600sw extra mode (#182430)