OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=70

MesaLib-7.0.3-rc3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe1914115bcb3aeebfd0ea24a8a4bb715de14737866c9bb72aa1cfc4f3509ca0
-size 3427910

MesaLib-7.0.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6aa8a9c0eeb7a8bb86230d87b7bf0a99e5c07bc75892df47559b209dd807e19c
+size 3427683

bitmap_always_unscaled.diff

@@ -0,0 +1,74 @@
+From 107688407c7ebc71323dc1203ed5b92276026e1e Mon Sep 17 00:00:00 2001
+From: Luc Verhaegen <libv@skynet.be>
+Date: Wed, 2 Apr 2008 20:09:26 +0200
+Subject: [PATCH] Default bitmap fonts should typically be set as unscaled.
+
+It is generally not desired to have bitmap fonts scale. Even so
+DEFAULT_FONT_PATH had the misc, 100dpi and 75dpi paths without the
+:unscaled specifier.
+
+Now the default font path has this per default, xorgconfig and
+--configure will only use these as :unscaled too.
+
+Since SUSE has been specifying :unscaled for its bitmap fonts for
+about a decade or so, and since adding the default font path to the
+.conf fontpath was only introduced a year ago, this lack of scaled
+bitmap fonts will not have any new side-effects.
+
+Reported by Mike Fabian, debugged and fixed with the help of Mike
+Fabian and Stefan Dirsch.
+---
+ configure.ac                             |    2 +-
+ hw/xfree86/Makefile.am                   |    6 +++---
+ hw/xfree86/utils/xorgconfig/xorgconfig.c |    4 +---
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index 03c2c3a..843efb7 100644
+--- a/hw/xfree86/Makefile.am
++++ b/hw/xfree86/Makefile.am
+@@ -105,11 +105,11 @@ dist_options_DATA = Options
+ 
+ CPP_FILES_FLAGS = \
+ 	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
+-	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
++	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
+ 	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
+ 	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
+-	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
+-	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
++	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
++	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
+ 	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
+ 
+ relink:
+--- xorg-server-1.4.0.90/configure.ac.orig	2008-04-05 02:06:32.000000000 +0000
++++ xorg-server-1.4.0.90/configure.ac	2008-04-05 02:12:34.000000000 +0000
+@@ -441,7 +441,7 @@
+ AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
+                                 [ FONTDIR="$withval" ],
+                                 [ FONTDIR="${libdir}/X11/fonts" ])
+-DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
++DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ 				[ FONTPATH="$withval" ],
+ 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
+--- xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig	2007-12-07 02:38:42.000000000 +0000
++++ xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c	2008-04-05 02:14:06.000000000 +0000
+@@ -1920,15 +1920,13 @@
+ {
+ /*	"    FontPath	\"" TREEROOTFONT "/75dpi/\"\n"*/
+     "/local/",
+-	"/misc/",
++	"/misc/:unscaled",
+ 	"/75dpi/:unscaled",
+ 	"/100dpi/:unscaled",
+ 	"/Speedo/",
+ 	"/Type1/",
+ 	"/TrueType/",
+ 	"/freefont/",
+-	"/75dpi/",
+-	"/100dpi/",
+ 	0 /* end of fontpaths */
+ };
+ 

xorg-x11-server.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Apr  5 04:03:18 CEST 2008 - sndirsch@suse.de
+
+- bitmap_always_unscaled.diff 
+  * Default bitmap fonts should typically be set as unscaled (libv)
+
+-------------------------------------------------------------------
+Sat Apr  5 03:49:02 CEST 2008 - sndirsch@suse.de
+
+- update to Mesa bugfix release 7.0.3 (final) sources 
+
 -------------------------------------------------------------------
 Wed Apr  2 09:37:56 CEST 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        83
+Release:        85
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -36,7 +36,7 @@ Provides:       xorg-x11-server-glx
 Obsoletes:      xorg-x11-server-glx
 Summary:        X.Org Server
 Source:         xorg-server-%{dirsuffix}.tar.bz2
-Source1:        MesaLib-7.0.3-rc3.tar.bz2
+Source1:        MesaLib-7.0.3.tar.bz2
 Source3:        README.updates
 Source4:        xorgcfg.tar.bz2
 %if %suse_version > 1010
@@ -109,6 +109,7 @@ Patch100:       commit-a6a7fad.diff
 Patch101:       zap_warning_xserver.diff
 Patch102:       xorg-server-1.4-vnc-memory.diff 
 Patch103:       confine_to_shape.diff
+Patch104:       bitmap_always_unscaled.diff
 
 %description
 This package contains the X.Org Server.
@@ -173,8 +174,8 @@ An X Window System server for Virtual Network Computing (VNC).
 test -s hw/xfree86/os-support/shared/ia64Pci.h || \
   cp $RPM_SOURCE_DIR/ia64Pci.h hw/xfree86/os-support/shared/ia64Pci.h
 # make legal department happy (Bug #204110)
-test -f ../Mesa-7.0.3-rc3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
+test -f ../Mesa-7.0.3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
-test -f ../Mesa-7.0.3-rc3/progs/ggi/asc-view.c && exit 1
+test -f ../Mesa-7.0.3/progs/ggi/asc-view.c && exit 1
 # remove wrongly prebuilt files (Bug #328201)
 mv hw/xfree86/xf1bpp/mfbmodule.c .
 rm hw/xfree86/xf1bpp/*.c
@@ -247,6 +248,7 @@ popd
 %patch100 -p1
 %patch101 -p1
 %patch103
+%patch104 -p1
 
 %build
 pushd xorg-docs-*
@@ -312,7 +314,7 @@ autoreconf -fi
             --with-log-dir="/var/log" \
             --with-os-name="openSUSE" \
             --with-os-vendor="SUSE LINUX" \
-            --with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3-rc3 \
+            --with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3 \
             --with-fontdir="/usr/share/fonts" \
             --with-xkb-path="/usr/share/X11/xkb" \
             --with-xkb-output="/var/lib/xkb/compiled"
@@ -553,6 +555,11 @@ exit 0
 %endif
 
 %changelog
+* Sat Apr 05 2008 sndirsch@suse.de
+- bitmap_always_unscaled.diff
+  * Default bitmap fonts should typically be set as unscaled (libv)
+* Sat Apr 05 2008 sndirsch@suse.de
+- update to Mesa bugfix release 7.0.3 (final) sources
 * Wed Apr 02 2008 sndirsch@suse.de
 - update to Mesa bugfix release 7.0.3 RC3 sources
 * Tue Apr 01 2008 sndirsch@suse.de