summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-11-15 13:07:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:53 +0000
commit69f1b459155fa7d9f43635e391ca8ac4c615b613 (patch)
tree91fba7458acec2c6094f9443e2b3f268db11f408
parentcb758f9d32aef5e990adc8f0178674e5fdb26565 (diff)
downloadpoky-69f1b459155fa7d9f43635e391ca8ac4c615b613.tar.gz
xserver-xorg: upgrade to 1.13.0
The patch contains several aditional changes: * removed one backported patch (included in the new release); * changed mips64-compiler.patch to apply properly; * licence checksum for COPYING file changed: some copyright years have been changed; * bump PR in xorg-driver-common.inc so that all input/video drivers get rebuilt. That's becaue the ABI changed; The following external modules are now built-in: * DBE * DRI2 * DRI * RECORD The extmod module was completely removed. (From OE-Core rev: 506da0d139dd470475a1d6b2dd3ae62406c36816) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/ia32-base.inc5
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch29
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch70
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch29
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc32
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb)5
10 files changed, 53 insertions, 119 deletions
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index 4b10183c21..c2d267aa3b 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -33,11 +33,8 @@ XSERVER_IA32_BASE = "xserver-xorg \
33 xf86-input-synaptics \ 33 xf86-input-synaptics \
34 " 34 "
35 35
36XSERVER_IA32_EXT = "xserver-xorg-extension-dri \ 36XSERVER_IA32_EXT = "
37 xserver-xorg-extension-dri2 \
38 xserver-xorg-extension-glx \ 37 xserver-xorg-extension-glx \
39 xserver-xorg-extension-extmod \
40 xserver-xorg-extension-dbe \
41 xserver-xorg-module-libint10 \ 38 xserver-xorg-module-libint10 \
42 " 39 "
43 40
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index d2c9a5f453..aabf86b95c 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/drivers"
5LICENSE = "MIT-X" 5LICENSE = "MIT-X"
6 6
7PE = "2" 7PE = "2"
8INC_PR = "r19" 8INC_PR = "r20"
9 9
10DEPENDS = "virtual/xserver xproto randrproto util-macros" 10DEPENDS = "virtual/xserver xproto randrproto util-macros"
11 11
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
deleted file mode 100644
index e6bc95b449..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
2so we end up with incompatible conversion errors
3
4This patch choses the right values for mips64
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h
10===================================================================
11--- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700
12+++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700
13@@ -104,6 +104,7 @@
14
15 # if !defined(__arm__)
16 # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
17+ && !defined(__mips64) \
18 && !(defined(__alpha__) && defined(linux)) \
19 && !(defined(__ia64__) && defined(linux)) \
20
21@@ -708,7 +709,7 @@
22 }
23
24 # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
25-# ifdef __arm32__
26+# if defined (__arm32__) || defined (__mips64)
27 # define PORT_SIZE long
28 # else
29 # define PORT_SIZE short
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
deleted file mode 100644
index fee8d76ccf..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4commit 41d903918a5721e53ed694880eab44170f9717cc
5Author: Jeremy Huddleston <jeremyhu@apple.com>
6Date: Wed Sep 14 13:45:18 2011 -0500
7
8 xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
9
10 Every module building against xorg-server does not *Require* pixman nor
11 libpciaccess. If such modules need pixman or pciaccess, they should be
12 depending on them directly rather than inheriting a dependency from
13 xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
14 to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
15 to the appropriate _LDFLAGS variable in Makefile.am
16
17 This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
18 to satisfy include dependencies but avoid linking needlessly.
19
20 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
21 Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
22
23diff --git a/configure.ac b/configure.ac
24index 50beb01..4bfa82c 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
28 WINDOWSWMPROTO="windowswmproto"
29 APPLEWMPROTO="applewmproto >= 1.4"
30
31-dnl Core modules for most extensions, et al.
32-SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
33-# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
34-AC_SUBST(SDK_REQUIRED_MODULES)
35-
36 dnl List of libraries that require a specific version
37 LIBAPPLEWM="applewm >= 1.4"
38 LIBDMX="dmx >= 1.0.99.1"
39@@ -806,6 +801,11 @@ dnl specific modules against it
40 PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
41 REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
42
43+dnl Core modules for most extensions, et al.
44+SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.99.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
45+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
46+AC_SUBST(SDK_REQUIRED_MODULES)
47+
48 REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
49
50 if test "x$CONFIG_UDEV" = xyes &&
51@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
52 if test "x$PCI" = xyes; then
53
54 PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
55+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
56 SAVE_LIBS=$LIBS
57 SAVE_CFLAGS=$CFLAGS
58 CFLAGS=$PCIACCESS_CFLAGS
59diff --git a/xorg-server.pc.in b/xorg-server.pc.in
60index fb238b5..a98eca8 100644
61--- a/xorg-server.pc.in
62+++ b/xorg-server.pc.in
63@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
64 Name: xorg-server
65 Description: Modular X.Org X Server
66 Version: @PACKAGE_VERSION@
67-Requires: pixman-1 pciaccess
68 Requires.private: @SDK_REQUIRED_MODULES@
69 Cflags: -I${sdkdir} @symbol_visibility@
70 Libs: -L${libdir}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
index 2f98bb8c89..2f98bb8c89 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
index 2f629724c9..2f629724c9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
index ec0eea6ca2..ec0eea6ca2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
new file mode 100644
index 0000000000..168368e6c3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
@@ -0,0 +1,29 @@
1on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
2so we end up with incompatible conversion errors
3
4This patch choses the right values for mips64
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
10===================================================================
11--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
12+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
13@@ -101,6 +101,7 @@
14 #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
15 #if !defined(__arm__)
16 #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
17+ && !defined(__mips64) \
18 && !(defined(__alpha__) && defined(linux)) \
19 && !(defined(__ia64__) && defined(linux)) \
20
21@@ -721,7 +722,7 @@
22 }
23
24 #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
25-#ifdef __arm32__
26+#if defined (__arm32__) || defined (__mips64)
27 #define PORT_SIZE long
28 #else
29 #define PORT_SIZE short
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 33564eb66e..4135a8b4cf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "The X.Org X server"
2HOMEPAGE = "http://www.x.org" 2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base" 3SECTION = "x11/base"
4LICENSE = "MIT-X" 4LICENSE = "MIT-X"
5LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" 5LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
6 6
7# xf86-*-* packages depend on an X server built with the xfree86 DDX 7# xf86-*-* packages depend on an X server built with the xfree86 DDX
8# so we have a virtual to represent that: 8# so we have a virtual to represent that:
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2" 15PE = "2"
16INC_PR = "r3" 16INC_PR = "r5"
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"
@@ -48,12 +48,7 @@ PACKAGES =+ "${PN}-security-policy \
48 ${PN}-utils \ 48 ${PN}-utils \
49 ${PN}-xephyr \ 49 ${PN}-xephyr \
50 ${PN}-multimedia-modules \ 50 ${PN}-multimedia-modules \
51 ${PN}-extension-dri \
52 ${PN}-extension-dri2 \
53 ${PN}-extension-glx \ 51 ${PN}-extension-glx \
54 ${PN}-extension-record \
55 ${PN}-extension-extmod \
56 ${PN}-extension-dbe \
57 ${PN}-module-libint10 \ 52 ${PN}-module-libint10 \
58 ${PN}-module-libafb \ 53 ${PN}-module-libafb \
59 ${PN}-module-libwfb \ 54 ${PN}-module-libwfb \
@@ -67,6 +62,24 @@ PACKAGES =+ "${PN}-security-policy \
67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" 62RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68RDEPENDS_${PN}-xvfb += "xkeyboard-config" 63RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" 64RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
65RREPLACES_${PN} = "${PN}-extension-dri \
66 ${PN}-extension-dri2 \
67 ${PN}-extension-record \
68 ${PN}-extension-extmod \
69 ${PN}-extension-dbe \
70 "
71RPROVIDES_${PN} = "${PN}-extension-dri \
72 ${PN}-extension-dri2 \
73 ${PN}-extension-record \
74 ${PN}-extension-extmod \
75 ${PN}-extension-dbe \
76 "
77RCONFLICTS_${PN} = "${PN}-extension-dri \
78 ${PN}-extension-dri2 \
79 ${PN}-extension-record \
80 ${PN}-extension-extmod \
81 ${PN}-extension-dbe \
82 "
70 83
71FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" 84FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" 85FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
@@ -82,12 +95,7 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
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" 95FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
83FILES_${PN}-xephyr = "${bindir}/Xephyr" 96FILES_${PN}-xephyr = "${bindir}/Xephyr"
84FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" 97FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
85FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
86FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
87FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" 98FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
88FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
89FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
90FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
91FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" 99FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
92FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" 100FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
93FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" 101FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
index 4739ee2b7b..8ad87b862a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
@@ -4,10 +4,9 @@ require xserver-xorg.inc
4SRC_URI += "file://crosscompile.patch \ 4SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \ 5 file://fix_open_max_preprocessor_error.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://pkgconfig-deps.patch \
8 " 7 "
9 8
10SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb" 9SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f"
11SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc" 10SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a"
12 11
13PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"