Patchwork xorg: remove XF86 BigFont extension

login
register
mail settings
Submitter Ross Burton
Date Oct. 22, 2012, 8:31 a.m.
Message ID <1350894704-12289-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38381/
State Accepted
Commit 8ce23f569584f195391bc5c68a780e1bf54e4360
Headers show

Comments

Ross Burton - Oct. 22, 2012, 8:31 a.m.
This has been disabled by default upstream since 2007, nothing uses it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11.inc            |    9 ++++-----
 .../xorg-proto/xf86bigfontproto_1.2.0.bb             |   18 ------------------
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc  |    2 +-
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
Saul Wold - Oct. 23, 2012, 7:04 p.m.
On 10/22/2012 01:31 AM, Ross Burton wrote:
> This has been disabled by default upstream since 2007, nothing uses it.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-lib/libx11.inc            |    9 ++++-----
>   .../xorg-proto/xf86bigfontproto_1.2.0.bb             |   18 ------------------
>   meta/recipes-graphics/xorg-xserver/xserver-xorg.inc  |    2 +-
>   3 files changed, 5 insertions(+), 24 deletions(-)
>   delete mode 100644 meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
>
Merged into OE-Core

Thanks
	Sau!


> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> index 97bd1c2..71e74f7 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> @@ -11,7 +11,7 @@ inherit siteinfo
>   FILESPATH = "${FILE_DIRNAME}/libx11"
>
>   PE = "1"
> -INC_PR = "r9"
> +INC_PR = "r10"
>
>   PROVIDES = "virtual/libx11"
>
> @@ -22,14 +22,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
>   DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
>   DEPENDS += "xproto-native"
>
> -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
> +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
>   EXTRA_OEMAKE += 'CWARNFLAGS=""'
>
> -# Let people with incredibly archaic requirements enable Xcms and BigFont, but
> -# disable them by default.
> +# Let people with incredibly archaic requirements enable Xcms, but disable it by
> +# default.
>   PACKAGECONFIG ??= ""
>   PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
> -PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
>
>   # src/util/makekeys needs to be compiled natively, so tell it what compiler to
>   # use.
> diff --git a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
> deleted file mode 100644
> index 969fc91..0000000
> --- a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -require xorg-proto-common.inc
> -
> -SUMMARY = "XFree86-BIGFONT: XFree86 Big Font extension headers"
> -
> -DESCRIPTION = "This package provides the wire protocol for the XFree86 \
> -Big Font extension.  This extension makes larger font requests \
> -possible."
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
> -
> -PR = "r1"
> -PE = "1"
> -
> -BBCLASSEXTEND = "native nativesdk"
> -
> -SRC_URI[md5sum] = "120e226ede5a4687b25dd357cc9b8efe"
> -SRC_URI[sha256sum] = "ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 772fa52..b45cb44 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
>
>   inherit autotools pkgconfig
>
> -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto  xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
> +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto  xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
>   LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
>   DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
>
>

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 97bd1c2..71e74f7 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@  inherit siteinfo
 FILESPATH = "${FILE_DIRNAME}/libx11"
 
 PE = "1"
-INC_PR = "r9"
+INC_PR = "r10"
 
 PROVIDES = "virtual/libx11"
 
@@ -22,14 +22,13 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
 DEPENDS += "xproto-native"
 
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
 EXTRA_OEMAKE += 'CWARNFLAGS=""'
 
-# Let people with incredibly archaic requirements enable Xcms and BigFont, but
-# disable them by default.
+# Let people with incredibly archaic requirements enable Xcms, but disable it by
+# default.
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
-PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
 
 # src/util/makekeys needs to be compiled natively, so tell it what compiler to
 # use.
diff --git a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
deleted file mode 100644
index 969fc91..0000000
--- a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@ 
-require xorg-proto-common.inc
-
-SUMMARY = "XFree86-BIGFONT: XFree86 Big Font extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XFree86 \
-Big Font extension.  This extension makes larger font requests \
-possible."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
-
-PR = "r1"
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "120e226ede5a4687b25dd357cc9b8efe"
-SRC_URI[sha256sum] = "ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 772fa52..b45cb44 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -23,7 +23,7 @@  S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto  xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto  xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
 LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"