xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 +
debian/patches/05_kill_type1.diff | 160 +++++++++++++++++++++++++++++++++++
debian/patches/48_disable_type1.diff | 67 --------------
debian/patches/series | 2
hw/xfree86/dixmods/Makefile.in | 23 +----
5 files changed, 173 insertions(+), 87 deletions(-)
New commits:
commit 196c9df9c09e2d6a6cc73de91d82f10611ff9972
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 18 21:09:19 2007 +0200
Remove the type1 module (again).
Add patch backported from upstream commit
13949f997289068354e83bc83e50d97b8232efb1 to remove the type1 module: patch
05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in
debian/patches/series.
diff --git a/debian/changelog b/debian/changelog
index 6e69a37..733c54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,13 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
- Czech. Closes: #443100
- French
- -- Brice Goglin <bgoglin@debian.org> Mon, 17 Sep 2007 07:50:56 +0200
+ [ Julien Cristau ]
+ * Add patch backported from upstream commit
+ 13949f997289068354e83bc83e50d97b8232efb1 to remove the type1 module: patch
+ 05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in
+ debian/patches/series.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 18 Sep 2007 21:05:33 +0200
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/patches/05_kill_type1.diff b/debian/patches/05_kill_type1.diff
new file mode 100644
index 0000000..990ffbf
--- /dev/null
+++ b/debian/patches/05_kill_type1.diff
@@ -0,0 +1,160 @@
+From 13949f997289068354e83bc83e50d97b8232efb1 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 23 Aug 2007 11:27:33 +0200
+Subject: [PATCH] Get rid of the type1 font module.
+
+It is completely replaced by freetype these days.
+---
+ hw/xfree86/common/xf86AutoConfig.c | 1 -
+ hw/xfree86/common/xf86Config.c | 1 -
+ hw/xfree86/dixmods/Makefile.am | 6 +--
+ hw/xfree86/dixmods/type1mod.c | 75 ----------------------------------
+ hw/xfree86/doc/man/xorg.conf.man.pre | 4 +-
+ 5 files changed, 3 insertions(+), 84 deletions(-)
+ delete mode 100644 hw/xfree86/dixmods/type1mod.c
+
+Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:01:37.000000000 +0200
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:02:26.000000000 +0200
+@@ -49,7 +49,6 @@
+ "\tLoad\t\"dbe\"\n" \
+ "\tLoad\t\"glx\"\n" \
+ "\tLoad\t\"freetype\"\n" \
+- "\tLoad\t\"type1\"\n" \
+ "\tLoad\t\"record\"\n" \
+ "\tLoad\t\"dri\"\n" \
+ "EndSection\n\n"
+Index: xorg-server/hw/xfree86/common/xf86Config.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-18 21:01:37.000000000 +0200
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-18 21:02:26.000000000 +0200
+@@ -61,7 +61,6 @@
+ {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "record", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
+ {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
+Index: xorg-server/hw/xfree86/dixmods/Makefile.am
+===================================================================
+--- xorg-server.orig/hw/xfree86/dixmods/Makefile.am 2007-09-18 20:57:33.000000000 +0200
++++ xorg-server/hw/xfree86/dixmods/Makefile.am 2007-09-18 21:02:26.000000000 +0200
+@@ -40,8 +40,7 @@
+ $(XTRAPMOD)
+
+ fontsmoduledir = $(moduledir)/fonts
+-fontsmodule_LTLIBRARIES = libfreetype.la \
+- libtype1.la
++fontsmodule_LTLIBRARIES = libfreetype.la
+
+ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+ INCLUDES = @XORG_INCS@ \
+@@ -104,9 +103,6 @@
+ libfreetype_la_LDFLAGS = -avoid-version
+ libfreetype_la_SOURCES = ftmodule.c
+
+-libtype1_la_LDFLAGS = -avoid-version
+-libtype1_la_SOURCES = type1mod.c
+-
+ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
+ libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
+
+Index: xorg-server/hw/xfree86/dixmods/type1mod.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/dixmods/type1mod.c 2007-09-10 14:32:05.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,75 +0,0 @@
+-/*
+- * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a copy
+- * of this software and associated documentation files (the "Software"), to
+- * deal in the Software without restriction, including without limitation the
+- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+- * sell copies of the Software, and to permit persons to whom the Software is
+- * furnished to do so, subject to the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included in
+- * all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- *
+- * Except as contained in this notice, the name of the XFree86 Project shall
+- * not be used in advertising or otherwise to promote the sale, use or other
+- * dealings in this Software without prior written authorization from the
+- * XFree86 Project.
+- */
+-
+-#ifdef HAVE_XORG_CONFIG_H
+-#include <xorg-config.h>
+-#endif
+-
+-#include "misc.h"
+-
+-#include <X11/fonts/fontmod.h>
+-#include "xf86Module.h"
+-
+-static MODULESETUPPROTO(type1Setup);
+-
+- /*
+- * This is the module data function that is accessed when loading
+- * libtype1 as a module.
+- */
+-
+-static XF86ModuleVersionInfo VersRec =
+-{
+- "type1",
+- MODULEVENDORSTRING,
+- MODINFOSTRING1,
+- MODINFOSTRING2,
+- XORG_VERSION_CURRENT,
+- 1, 0, 2,
+- ABI_CLASS_FONT, /* Font module */
+- ABI_FONT_VERSION,
+- MOD_CLASS_FONT,
+- {0,0,0,0} /* signature, to be patched into the file by a tool */
+-};
+-
+-_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
+-
+-extern void Type1RegisterFontFileFunctions(void);
+-
+-FontModule type1Module = {
+- Type1RegisterFontFileFunctions,
+- "Type1",
+- NULL
+-};
+-
+-static pointer
+-type1Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+-{
+- type1Module.module = module;
+- LoadFont(&type1Module);
+-
+- /* Need a non-NULL return */
+- return (pointer)1;
+-}
+Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+===================================================================
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 20:51:46.000000000 +0200
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 21:02:26.000000000 +0200
+@@ -700,10 +700,10 @@
+ prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
+ .PP
+ .RS 7
+-Example: the Type 1 font rasteriser can be loaded with the following entry:
++Example: the FreeType font rasteriser can be loaded with the following entry:
+ .PP
+ .RS 4
+-.B "Load \*qtype1\*q"
++.B "Load \*qfreetype\*q"
+ .RE
+ .RE
+ .TP 7
diff --git a/debian/patches/48_disable_type1.diff b/debian/patches/48_disable_type1.diff
deleted file mode 100644
index ac09689..0000000
--- a/debian/patches/48_disable_type1.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac 2007-07-12 16:10:56.000000000 +0200
-+++ xorg-server/configure.ac 2007-07-12 16:11:11.000000000 +0200
-@@ -412,6 +412,11 @@
- [Install libxf86config (default: disabled)]),
- [INSTALL_LIBXF86CONFIG=$enableval],
- [INSTALL_LIBXF86CONFIG=no])
-+AC_ARG_ENABLE(type1,
-+ AS_HELP_STRING([--disable-type1],
-+ [Build the type1 font module (default: enabled)]),
-+ [TYPE1=$enableval],
-+ [TYPE1=yes])
-
- dnl Extensions.
- AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
-@@ -525,6 +530,9 @@
- dnl Handle installing libxf86config
- AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
-
-+dnl Handle building the type1 module
-+AM_CONDITIONAL(BUILD_TYPE1, [test "x$TYPE1" = xyes])
-+
- dnl ---------------------------------------------------------------------------
- dnl Extension section
- dnl ---------------------------------------------------------------------------
-Index: xorg-server/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server.orig/hw/xfree86/dixmods/Makefile.am 2007-07-12 15:57:00.000000000 +0200
-+++ xorg-server/hw/xfree86/dixmods/Makefile.am 2007-07-12 16:11:11.000000000 +0200
-@@ -28,8 +28,11 @@
- $(XTRAPMOD)
-
- fontsmoduledir = $(moduledir)/fonts
--fontsmodule_LTLIBRARIES = libfreetype.la \
-- libtype1.la
-+fontsmodule_LTLIBRARIES = libfreetype.la
-+
-+if BUILD_TYPE1
-+fontsmodule_LTLIBRARIES += libtype1.la
-+endif
-
- AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
- INCLUDES = @XORG_INCS@ \
-@@ -90,8 +93,10 @@
- libfreetype_la_LDFLAGS = -avoid-version
- libfreetype_la_SOURCES = ftmodule.c
-
-+if BUILD_TYPE1
- libtype1_la_LDFLAGS = -avoid-version
- libtype1_la_SOURCES = type1mod.c
-+endif
-
- libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
- libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
-Index: xorg-server/hw/xfree86/common/xf86Config.h
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-07-12 16:11:37.000000000 +0200
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-07-12 16:11:54.000000000 +0200
-@@ -59,7 +59,6 @@
- {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
- {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
- {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
-- {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
- {.name = "record", .toLoad = TRUE, .load_opt=NULL},
- {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
- {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
diff --git a/debian/patches/series b/debian/patches/series
index beda004..290b2c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
02_libvgahw_gcc4_volatile_fix.diff
03_auto_load_driver.diff
04_auto_load_driver_no_conf.diff
+05_kill_type1.diff
06_use_proc_instead_of_sysfs_for_pci_domains.diff
10_dont_look_in_home_for_config.diff -p0
13_debian_add_xkbpath_env_variable.diff
@@ -10,7 +11,6 @@
42_fix_RemoveGeneralSocket_crash_from_dbus.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
#47_fbdevhw_magic_numbers.diff
-#48_disable_type1.diff
#51_xkb-and-loathing.diff
91_ttf2pt1
91_ttf2pt1_updates
diff --git a/hw/xfree86/dixmods/Makefile.in b/hw/xfree86/dixmods/Makefile.in
index 6b9ef6e..33ce1d6 100644
--- a/hw/xfree86/dixmods/Makefile.in
+++ b/hw/xfree86/dixmods/Makefile.in
@@ -142,12 +142,6 @@ libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS)
libshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libshadow_la_LDFLAGS) $(LDFLAGS) -o $@
-libtype1_la_LIBADD =
-am_libtype1_la_OBJECTS = type1mod.lo
-libtype1_la_OBJECTS = $(am_libtype1_la_OBJECTS)
-libtype1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libtype1_la_LDFLAGS) $(LDFLAGS) -o $@
libwfb_la_DEPENDENCIES = $(top_builddir)/fb/libwfb.la
am_libwfb_la_OBJECTS = libwfb_la-fbcmap_mi.lo libwfb_la-fbmodule.lo
libwfb_la_OBJECTS = $(am_libwfb_la_OBJECTS)
@@ -182,16 +176,16 @@ SOURCES = $(libGLcore_la_SOURCES) $(libafb_la_SOURCES) \
$(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \
$(libglx_la_SOURCES) $(libmfb_la_SOURCES) \
$(librecord_la_SOURCES) $(libshadow_la_SOURCES) \
- $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \
- $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES)
+ $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \
+ $(libxtrap_la_SOURCES)
DIST_SOURCES = $(libGLcore_la_SOURCES) $(libafb_la_SOURCES) \
$(libcfb_la_SOURCES) $(libcfb32_la_SOURCES) \
$(libdbe_la_SOURCES) $(libdixmods_la_SOURCES) \
$(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \
$(libglx_la_SOURCES) $(libmfb_la_SOURCES) \
$(librecord_la_SOURCES) $(libshadow_la_SOURCES) \
- $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \
- $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES)
+ $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \
+ $(libxtrap_la_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -514,9 +508,7 @@ extsmodule_LTLIBRARIES = librecord.la \
$(XTRAPMOD)
fontsmoduledir = $(moduledir)/fonts
-fontsmodule_LTLIBRARIES = libfreetype.la \
- libtype1.la
-
+fontsmodule_LTLIBRARIES = libfreetype.la
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/dbe \
@@ -565,8 +557,6 @@ libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
libshadow_la_SOURCES = shmodule.c
libfreetype_la_LDFLAGS = -avoid-version
libfreetype_la_SOURCES = ftmodule.c
-libtype1_la_LDFLAGS = -avoid-version
-libtype1_la_SOURCES = type1mod.c
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
@@ -721,8 +711,6 @@ librecord.la: $(librecord_la_OBJECTS) $(librecord_la_DEPENDENCIES)
$(librecord_la_LINK) -rpath $(extsmoduledir) $(librecord_la_OBJECTS) $(librecord_la_LIBADD) $(LIBS)
libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES)
$(libshadow_la_LINK) -rpath $(moduledir) $(libshadow_la_OBJECTS) $(libshadow_la_LIBADD) $(LIBS)
-libtype1.la: $(libtype1_la_OBJECTS) $(libtype1_la_DEPENDENCIES)
- $(libtype1_la_LINK) -rpath $(fontsmoduledir) $(libtype1_la_OBJECTS) $(libtype1_la_LIBADD) $(LIBS)
libwfb.la: $(libwfb_la_OBJECTS) $(libwfb_la_DEPENDENCIES)
$(libwfb_la_LINK) -rpath $(moduledir) $(libwfb_la_OBJECTS) $(libwfb_la_LIBADD) $(LIBS)
libxorgxkb.la: $(libxorgxkb_la_OBJECTS) $(libxorgxkb_la_DEPENDENCIES)
@@ -751,7 +739,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbmodule.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recordmod.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shmodule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type1mod.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86XTrapModule.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkbKillSrv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkbPrivate.Plo@am__quote@
Reply to: