summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-10 13:43:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:13:36 +0100
commitd6dc72c0487bf1b0c8c8b78c3f1d5cf6cd3b2c05 (patch)
tree5ca26e90b558a0eb97b0abd1ec1359f68285efe7 /meta
parentf29e000832edb7b3467a1dedcdd8579b1201c643 (diff)
downloadpoky-d6dc72c0487bf1b0c8c8b78c3f1d5cf6cd3b2c05.tar.gz
xorg: remove all traces of XPrint
The XPrint server was removed from Xorg in 2008. (From OE-Core rev: 5b3748d463a6666c0d8e2624092619da8d8e6328) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb4
-rw-r--r--meta/recipes-graphics/xorg-app/xset_1.2.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch42
-rw-r--r--meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb23
-rw-r--r--meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb17
-rw-r--r--meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb17
-rw-r--r--meta/recipes-graphics/xorg-proto/printproto_1.0.5.bb17
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
8 files changed, 5 insertions, 123 deletions
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb
index ae3cc8cbc1..e0b24420e9 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb
@@ -9,8 +9,8 @@ clients and the server, and the different types of screens and visuals \
9that are available." 9that are available."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" 11LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
12DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" 12DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau"
13PR = "${INC_PR}.0" 13PR = "${INC_PR}.1"
14PE = "1" 14PE = "1"
15 15
16SRC_URI += "file://disable-xkb.patch" 16SRC_URI += "file://disable-xkb.patch"
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
index 0430f8c544..dde2ced3c4 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
@@ -7,8 +7,8 @@ preference options of the display."
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" 9LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
10DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" 10DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxau"
11PR = "${INC_PR}.0" 11PR = "${INC_PR}.1"
12PE = "1" 12PE = "1"
13 13
14SRC_URI += "file://disable-xkb.patch" 14SRC_URI += "file://disable-xkb.patch"
diff --git a/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch b/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
deleted file mode 100644
index fea18cff0f..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1This patch fixes these new errors:
2
3| XpNotifyPdm.c:234:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
4| XpNotifyPdm.c:271:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
5| XpNotifyPdm.c:286:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
6
7
8Upstream-Status: Pending
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11
12Index: libXp-1.0.1/src/XpNotifyPdm.c
13===================================================================
14--- libXp-1.0.1.orig/src/XpNotifyPdm.c
15+++ libXp-1.0.1/src/XpNotifyPdm.c
16@@ -231,7 +231,7 @@ XpGetPdmStartParams (
17 /*
18 * Error - cannot determine or establish a selection_display.
19 */
20- return( (Status) NULL );
21+ return( (Status) 0 );
22 }
23
24 /*
25@@ -268,7 +268,7 @@ XpGetPdmStartParams (
26 XCloseDisplay( *selection_display );
27 *selection_display = (Display *) NULL;
28 }
29- return( (Status) NULL );
30+ return( (Status) 0 );
31 }
32
33 status = XmbTextListToTextProperty( *selection_display, list, 6,
34@@ -283,7 +283,7 @@ XpGetPdmStartParams (
35 XCloseDisplay( *selection_display );
36 *selection_display = (Display *) NULL;
37 }
38- return( (Status) NULL );
39+ return( (Status) 0 );
40 }
41
42 *type = text_prop.encoding;
diff --git a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
deleted file mode 100644
index dbd460928b..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require xorg-lib-common.inc
2
3SUMMARY = "XP: X Printing extension library"
4
5DESCRIPTION = "libXp provides public APIs to allow client applications \
6to render to non-display devices, making use of the X Print Service."
7
8LICENSE = "MIT & MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING;md5=9504a1264f5ddd4949254a57c0f8d6bb \
10 file://src/XpPage.c;beginline=2;endline=35;md5=2b7d3d2ba5505b19271cf31b6918997e"
11
12DEPENDS += "libxext libxau printproto"
13PR = "r1"
14PE = "1"
15
16XORG_PN = "libXp"
17
18CFLAGS_append = " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
19
20SRC_URI += "file://fix-cast-error.patch"
21
22SRC_URI[md5sum] = "7ae1d63748e79086bd51a633da1ff1a9"
23SRC_URI[sha256sum] = "71d1f260005616d646b8c8788365f2b7d93911dac57bb53b65753d9f9e6443d2"
diff --git a/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
deleted file mode 100644
index 0f3892cf69..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require xorg-lib-common.inc
2
3SUMMARY = "Xprint: Xprint job utility library"
4
5DESCRIPTION = "libxprintapputil provides utility Xpau APIs allowing \
6client applications to access information about and control Xprint jobs \
7from an Xprint server."
8
9DEPENDS += "libxp libxt libxprintutil"
10PR = "r1"
11LIC_FILES_CHKSUM = "file://src/xpapputil.c;beginline=2;endline=27;md5=be811cca90200613a672dc96206a767b"
12PE = "1"
13
14XORG_PN = "libXprintAppUtil"
15
16SRC_URI[md5sum] = "d2de510570aa6714681109b2ba178365"
17SRC_URI[sha256sum] = "24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5"
diff --git a/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
deleted file mode 100644
index 8e3507c380..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require xorg-lib-common.inc
2LIC_FILES_CHKSUM = "file://src/xprintutil.c;endline=29;md5=22d5a98494dd356a2c6c9c355886f3af"
3
4SUMMARY = "Xprint: Xprint printer utility library"
5
6DESCRIPTION = "libxprintutil provides utility Xpu APIs allowing client \
7applications to access and manipulate information about printer \
8capabilities from an Xprint server."
9
10DEPENDS += "libxp libxt"
11PR = "r1"
12PE = "1"
13
14XORG_PN = "libXprintUtil"
15
16SRC_URI[md5sum] = "22584f1aab1deba253949b562d1f0f45"
17SRC_URI[sha256sum] = "72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c"
diff --git a/meta/recipes-graphics/xorg-proto/printproto_1.0.5.bb b/meta/recipes-graphics/xorg-proto/printproto_1.0.5.bb
deleted file mode 100644
index 2c8afbd7e2..0000000000
--- a/meta/recipes-graphics/xorg-proto/printproto_1.0.5.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require xorg-proto-common.inc
2
3SUMMARY = "XP: X Printing extension headers"
4
5DESCRIPTION = "This package provides the wire protocol for the X \
6Printing extension. This extension provides a way for client \
7applications to render to non-display devices."
8
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=658463213f19b48b81f8672d2696069f \
11 file://Print.h;beginline=2;endline=59;md5=db19e065445b3755c09432864dcd8a9b"
12
13PR = "r0"
14PE = "1"
15
16SRC_URI[md5sum] = "99d0e25feea2fead7d8325b7000b41c3"
17SRC_URI[sha256sum] = "1298316cf43b987365ab7764d61b022a3d7f180b67b423eed3456862d155911a"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index b86b4937f2..a850214fa0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2" 15PE = "2"
16INC_PR = "r0" 16INC_PR = "r1"
17 17
18XORG_PN = "xorg-server" 18XORG_PN = "xorg-server"
19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -44,7 +44,6 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
44PACKAGES =+ "${PN}-security-policy \ 44PACKAGES =+ "${PN}-security-policy \
45 ${PN}-sdl \ 45 ${PN}-sdl \
46 ${PN}-fbdev \ 46 ${PN}-fbdev \
47 ${PN}-xprint \
48 ${PN}-xvfb \ 47 ${PN}-xvfb \
49 ${PN}-utils \ 48 ${PN}-utils \
50 ${PN}-xephyr \ 49 ${PN}-xephyr \
@@ -79,7 +78,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
79FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" 78FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
80FILES_${PN}-sdl = "${bindir}/Xsdl" 79FILES_${PN}-sdl = "${bindir}/Xsdl"
81FILES_${PN}-fbdev = "${bindir}/Xfbdev" 80FILES_${PN}-fbdev = "${bindir}/Xfbdev"
82FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
83FILES_${PN}-xvfb = "${bindir}/Xvfb" 81FILES_${PN}-xvfb = "${bindir}/Xvfb"
84FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" 82FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
85FILES_${PN}-xephyr = "${bindir}/Xephyr" 83FILES_${PN}-xephyr = "${bindir}/Xephyr"