summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-driver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-driver-common.inc29
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-common.inc7
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb7
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb7
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb9
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch19
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb5
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb11
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb5
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb10
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb8
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-common.inc4
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb10
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb16
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff146
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb21
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb9
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb12
18 files changed, 335 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
new file mode 100644
index 0000000000..550423b0f8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
@@ -0,0 +1,29 @@
1DESCRIPTION = "X driver"
2HOMEPAGE = "http://www.x.org"
3BUGTRACKER = "https://bugs.freedesktop.org"
4SECTION = "x11/drivers"
5LICENSE = "MIT-X"
6
7PE = "1"
8PR = "r0"
9
10DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
11
12XORG_PN = "${PN}"
13SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
14
15S = "${WORKDIR}/${XORG_PN}-${PV}"
16
17FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
18FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
19
20inherit autotools pkgconfig
21
22# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
23# macro that simply assumes the test succeeds.
24do_configure_prepend () {
25 echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
26 sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
27 mv configure.ac.new configure.ac
28}
29
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
new file mode 100644
index 0000000000..6fc88cf9d0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
@@ -0,0 +1,7 @@
1include xf86-driver-common.inc
2
3DEPENDS += "inputproto kbproto "
4
5FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
6FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
7
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
new file mode 100644
index 0000000000..fad47fbc00
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
@@ -0,0 +1,7 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- evdev input driver"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4ad82cd33b1432eacb1798a43c092"
6
7PR = "r1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
new file mode 100644
index 0000000000..1efb505e27
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
@@ -0,0 +1,7 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
6
7PR = "r1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
new file mode 100644
index 0000000000..a6744bda64
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
@@ -0,0 +1,9 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5PV = "1.3.2+git${SRCPV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
8S = "${WORKDIR}/git"
9
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
new file mode 100644
index 0000000000..665b320df1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
@@ -0,0 +1,19 @@
1Unbreak the linux mouse driver by using config.h
2
3RP - 4/11/07
4
5Index: git/src/lnx_mouse.c
6===================================================================
7--- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000
8+++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000
9@@ -3,8 +3,8 @@
10 * Copyright 1999 by The XFree86 Project, Inc.
11 */
12
13-#ifdef HAVE_XORG_CONFIG_H
14-#include <xorg-config.h>
15+#ifdef HAVE_CONFIG_H
16+#include <config.h>
17 #endif
18
19 #include <X11/X.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
new file mode 100644
index 0000000000..44d60bf753
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
@@ -0,0 +1,5 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- mouse input driver"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=43eb754a9f368985c40a2a5370fc364a"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
new file mode 100644
index 0000000000..94dedf104d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
@@ -0,0 +1,11 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- mouse input driver"
4
5PV = "1.3.0+git${SRCPV}"
6PR = "r2"
7
8SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
9 file://unbreak.patch;patch=1"
10S = "${WORKDIR}/git"
11
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
new file mode 100644
index 0000000000..81128394c3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
@@ -0,0 +1,5 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5DEPENDS += "libxi"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
new file mode 100644
index 0000000000..f7dc3b731c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
@@ -0,0 +1,10 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5PV = "0.15.2+git${SRCPV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
8S = "${WORKDIR}/git"
9
10DEPENDS += "libxi"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
new file mode 100644
index 0000000000..36418ad59e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
@@ -0,0 +1,8 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
4PR = "r0"
5
6RDEPENDS_${PN} += "xf86-input-mouse"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=d1f16420e5ed7ed2133768425dfdab50"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
new file mode 100644
index 0000000000..f2e28170e7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
@@ -0,0 +1,4 @@
1include xf86-driver-common.inc
2
3DEPENDS =+ "renderproto videoproto xextproto fontsproto"
4
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
new file mode 100644
index 0000000000..968c20167f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
@@ -0,0 +1,10 @@
1require xf86-video-common.inc
2
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4
5EXTRA_OECONF += "--disable-xvmc"
6
7DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
8 virtual/libgl xineramaproto xf86driproto libpciaccess"
9
10COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
new file mode 100644
index 0000000000..7011b7ea79
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -0,0 +1,16 @@
1require xf86-video-common.inc
2
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
5 virtual/libgl xineramaproto libpciaccess"
6
7PV = "2.10.0+git${SRCPV}"
8PR = "r0"
9
10EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
11
12SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git"
13
14S = "${WORKDIR}/git"
15
16COMPATIBLE_HOST = '(i.86|x86_4).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
new file mode 100644
index 0000000000..325ca66f0c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
@@ -0,0 +1,146 @@
1--- /tmp/image-format-conversions.h 2009-02-03 10:18:04.000000000 +0100
2+++ git/src/image-format-conversions.h 2009-02-03 10:19:18.000000000 +0100
3@@ -30,6 +30,8 @@
4 /* Basic C implementation of YV12/I420 to UYVY conversion */
5 void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
6
7+/* NEON implementation of YV12/I420 to UYVY conversion */
8+void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
9
10 #endif /* __IMAGE_FORMAT_CONVERSIONS_H__ */
11
12--- /tmp/image-format-conversions.c 2009-02-03 10:18:04.000000000 +0100
13+++ git/src/image-format-conversions.c 2009-02-03 10:16:47.000000000 +0100
14@@ -2,6 +2,7 @@
15 * Copyright 2008 Kalle Vahlman, <zuh@iki.fi>
16 * Ilpo Ruotsalainen, <lonewolf@iki.fi>
17 * Tuomas Kulve, <tuomas.kulve@movial.com>
18+ * Ian Rickards, <ian.rickards@arm.com>
19 *
20 *
21 * Permission to use, copy, modify, distribute and sell this software and its
22@@ -89,3 +90,104 @@
23 }
24 }
25
26+void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest)
27+{
28+ int x, y;
29+ uint8_t *dest_even = dest;
30+ uint8_t *dest_odd = dest + w * 2;
31+ uint8_t *y_p_even = y_p;
32+ uint8_t *y_p_odd = y_p + y_pitch;
33+
34+ /*ErrorF("in uv12_to_uyvy, w: %d, pitch: %d\n", w, pitch);*/
35+ if (w<16)
36+ {
37+ for (y=0; y<h; y+=2)
38+ {
39+ for (x=0; x<w; x+=2)
40+ {
41+ /* Output two 2x1 macroblocks to form a 2x2 block from input */
42+ uint8_t u_val = *u_p++;
43+ uint8_t v_val = *v_p++;
44+
45+ /* Even row, first pixel */
46+ *dest_even++ = u_val;
47+ *dest_even++ = *y_p_even++;
48+
49+ /* Even row, second pixel */
50+ *dest_even++ = v_val;
51+ *dest_even++ = *y_p_even++;
52+
53+ /* Odd row, first pixel */
54+ *dest_odd++ = u_val;
55+ *dest_odd++ = *y_p_odd++;
56+
57+ /* Odd row, second pixel */
58+ *dest_odd++ = v_val;
59+ *dest_odd++ = *y_p_odd++;
60+ }
61+
62+ dest_even += w * 2;
63+ dest_odd += w * 2;
64+
65+ u_p += ((uv_pitch << 1) - w) >> 1;
66+ v_p += ((uv_pitch << 1) - w) >> 1;
67+
68+ y_p_even += (y_pitch - w) + y_pitch;
69+ y_p_odd += (y_pitch - w) + y_pitch;
70+ }
71+ }
72+ else
73+ {
74+ for (y=0; y<h; y+=2)
75+ {
76+ x=w;
77+ do {
78+ // avoid using d8-d15 (q4-q7) aapcs callee-save registers
79+ asm volatile (
80+ "1:\n\t"
81+ "vld1.u8 {d0}, [%[u_p]]!\n\t"
82+ "sub %[x],%[x],#16\n\t"
83+ "cmp %[x],#16\n\t"
84+ "vld1.u8 {d1}, [%[v_p]]!\n\t"
85+ "vld1.u8 {q1}, [%[y_p_even]]!\n\t"
86+ "vzip.u8 d0, d1\n\t"
87+ "vld1.u8 {q2}, [%[y_p_odd]]!\n\t"
88+ // use 2-element struct stores to zip up y with y&v
89+ "vst2.u8 {q0,q1}, [%[dest_even]]!\n\t"
90+ "vmov.u8 q1, q2\n\t"
91+ "vst2.u8 {q0,q1}, [%[dest_odd]]!\n\t"
92+ "bhs 1b\n\t"
93+ : [u_p] "+r" (u_p), [v_p] "+r" (v_p), [y_p_even] "+r" (y_p_even), [y_p_odd] "+r" (y_p_odd),
94+ [dest_even] "+r" (dest_even), [dest_odd] "+r" (dest_odd),
95+ [x] "+r" (x)
96+ :
97+ : "cc", "memory", "d0","d1","d2","d3","d4","d5"
98+ );
99+ if (x!=0)
100+ {
101+ // overlap final 16-pixel block to process requested width exactly
102+ x = 16-x;
103+ u_p -= x/2;
104+ v_p -= x/2;
105+ y_p_even -= x;
106+ y_p_odd -= x;
107+ dest_even -= x*2;
108+ dest_odd -= x*2;
109+ x = 16;
110+ // do another 16-pixel block
111+ }
112+ }
113+ while (x!=0);
114+
115+ dest_even += w * 2;
116+ dest_odd += w * 2;
117+
118+ u_p += ((uv_pitch << 1) - w) >> 1;
119+ v_p += ((uv_pitch << 1) - w) >> 1;
120+
121+ y_p_even += (y_pitch - w) + y_pitch;
122+ y_p_odd += (y_pitch - w) + y_pitch;
123+ }
124+ }
125+}
126+
127--- /tmp/omapfb-xv-generic.c 2009-02-03 10:52:18.000000000 +0100
128+++ git/src/omapfb-xv-generic.c 2009-02-03 10:52:24.000000000 +0100
129@@ -240,7 +240,7 @@
130 uint8_t *yb = buf;
131 uint8_t *ub = yb + (src_y_pitch * src_h);
132 uint8_t *vb = ub + (src_uv_pitch * (src_h / 2));
133- uv12_to_uyvy(src_w & ~15,
134+ uv12_to_uyvy_neon(src_w & ~15,
135 src_h & ~15,
136 src_y_pitch,
137 src_uv_pitch,
138@@ -256,7 +256,7 @@
139 uint8_t *yb = buf;
140 uint8_t *vb = yb + (src_y_pitch * src_h);
141 uint8_t *ub = vb + (src_uv_pitch * (src_h / 2));
142- uv12_to_uyvy(src_w & ~15,
143+ uv12_to_uyvy_neon(src_w & ~15,
144 src_h & ~15,
145 src_y_pitch,
146 src_uv_pitch,
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
new file mode 100644
index 0000000000..15bef87198
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -0,0 +1,21 @@
1require xf86-driver-common.inc
2
3DESCRIPTION = "X.Org X server -- OMAP display driver"
4DEPENDS += "virtual/libx11"
5
6PE = "1"
7PR = "r1"
8PV = "0.1.1+git${SRCPV}"
9
10SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
11 "
12
13S = "${WORKDIR}/git"
14
15EXTRA_OECONF_armv7a = " --enable-neon "
16CFLAGS += " -I${STAGING_INCDIR}/xorg "
17
18# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
19do_compile_prepend_armv7a () {
20 sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
21}
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
new file mode 100644
index 0000000000..3212004db7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
@@ -0,0 +1,9 @@
1require xf86-video-common.inc
2
3EXTRA_OECONF += "--disable-xvmc"
4
5DESCRIPTION = "X.Org X server -- Generic Vesa display driver"
6DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
7 virtual/libgl xineramaproto xf86driproto libpciaccess"
8
9COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
new file mode 100644
index 0000000000..56daa86c86
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
@@ -0,0 +1,12 @@
1require xf86-video-common.inc
2
3DESCRIPTION = "X.Org X server -- VMware SVGA II display driver"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
6
7DEPENDS += "virtual/libx11 libxvmc drm glproto \
8 virtual/libgl xineramaproto libpciaccess"
9
10PR = "r1"
11
12COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'