diff --git a/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/xorg-x11-server-1.0.1-fpic-libxf86config.patch new file mode 100644 index 0000000..a6a35f9 --- /dev/null +++ b/xorg-x11-server-1.0.1-fpic-libxf86config.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic 2006-03-06 13:57:45.000000000 -0500 ++++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am 2006-03-06 13:59:11.000000000 -0500 +@@ -23,7 +23,7 @@ + DRI.c \ + Extensions.c + +-AM_CFLAGS = $(XORG_CFLAGS) ++AM_CFLAGS = $(XORG_CFLAGS) -fPIC + + EXTRA_DIST = \ + Configint.h \ diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 9a2f37f..b44ebb1 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.1.0 -Release: 12 +Release: 13 URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -22,6 +22,8 @@ Patch4: xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch Patch6: xserver-1.0.1-randr-sdk.patch Patch7: xorg-x11-server-1.1.0-ppc64-build-fix.patch +Patch50: xorg-x11-server-1.0.1-fpic-libxf86config.patch + # Spiffiffity feature/optimization patches. Patch100: xorg-server-1.0.99.2-spiffiffity.patch Patch101: xorg-x11-server-1.1.0-gl-include-inferiors.patch @@ -264,6 +266,7 @@ drivers, input drivers, or other X modules should install this package. %patch3 -p0 -b .parser-add-missing-headers-to-sdk %patch6 -p1 -b .randrsdk %patch7 -p1 -b .ppc64 +%patch50 -p1 -b .fpic %patch100 -p0 -b .spiffiffity %patch101 -p0 -b .gl-include-inferiors @@ -563,6 +566,9 @@ rm -rf $RPM_BUILD_ROOT # ------------------------------------------------------------------- %changelog +* Tue Jun 13 2006 Jeremy Katz - 1.1.0-13 +- put back my -fPIC patch, libxf86config isn't built with fPIC otherwise + * Tue Jun 13 2006 Adam Jackson 1.1.0-12 - Add EDID mode autodetection.