sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

xorg-driver: rename .inc files and merge some changes from meta-oe 

* use INC_PR
* use BPN directly instead of XORG_PN

(From OE-Core rev: 7920cc4b43f139d023b52a71c2407f5295347618)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2011-09-30 09:27:18 +02:00 committed by Richard Purdie
parent b887e7fd3f
commit 7047b873e4
16 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- event devices (evdev) input driver"
@ -14,7 +14,7 @@ xorg.conf for each input device that will use this driver. "
LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
PR = "r0"
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "f33fe9413bde68936d8909206a13e8a1"
SRC_URI[sha256sum] = "b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac"

4
meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@ -9,7 +9,7 @@ core keyboard."
LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
PR = "r0"
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "e2abe9f13e526a73cb68a7d257546eba"
SRC_URI[sha256sum] = "c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e"

3
meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@ -9,6 +9,7 @@ core keyboard."
SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892"
PV = "1.3.2+git${SRCPV}"
PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
S = "${WORKDIR}/git"

4
meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@ -10,5 +10,7 @@ driver."
LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19"
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
SRC_URI[sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"

4
meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@ -10,7 +10,7 @@ driver."
SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6"
PV = "1.3.0+git${SRCPV}"
PR = "r2"
PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
file://unbreak.patch"

4
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@ -10,6 +10,8 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5"
PR = "${INC_PR}.0"
DEPENDS += "libxi"
#

3
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
View File

@ -1,4 +1,4 @@
require xf86-input-common.inc
require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@ -10,6 +10,7 @@ advanced features of the touchpad to become available."
SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2"
PV = "0.15.2+git${SRCPV}"
PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
S = "${WORKDIR}/git"

4
meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
View File

@ -1,7 +1,7 @@
require xf86-input-common.inc
require xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
PR = "r0"
PR = "${INC_PR}.0"
RDEPENDS_${PN} += "xf86-input-mouse"

4
meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
View File

@ -1,4 +1,4 @@
require xf86-video-common.inc
require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@ -9,7 +9,7 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
PR = "r0"
PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc"

4
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
View File

@ -1,4 +1,4 @@
require xf86-video-common.inc
require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@ -12,7 +12,7 @@ DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
PV = "2.10.0+git${SRCPV}"
PR = "r0"
PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"

4
meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
View File

@ -1,4 +1,4 @@
require xf86-driver-common.inc
require xorg-driver-driver.inc
SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
@ -11,7 +11,7 @@ DEPENDS += "virtual/libx11"
SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
PE = "1"
PR = "r1"
PR = "${INC_PR}.0"
PV = "0.1.1+git${SRCPV}"
SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \

4
meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
View File

@ -1,4 +1,4 @@
require xf86-video-common.inc
require xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e5418e7a75e21268637984e70265e146"
@ -11,6 +11,8 @@ can drive most VESA-compatible video cards, but only makes use of the \
basic standard VESA core that is common to these cards. The driver \
supports depths 8, 15 16 and 24."
PR = "${INC_PR}.0"
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"

4
meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
View File

@ -1,4 +1,4 @@
require xf86-video-common.inc
require xorg-driver-video.inc
SUMMARY = "X.Org X server -- VMware SVGA display driver"
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
DEPENDS += "virtual/libx11 libxvmc drm glproto \
virtual/libgl xineramaproto libpciaccess"
PR = "r0"
PR = "${INC_PR}.0"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'

14
meta/recipes-graphics/xorg-driver/xf86-driver-common.inc → meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
View File

@ -5,14 +5,13 @@ SECTION = "x11/drivers"
LICENSE = "MIT-X"
PE = "1"
PR = "r1"
INC_PR = "r15"
DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
XORG_PN = "${BPN}"
SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
S = "${WORKDIR}/${BPN}-${PV}"
FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
@ -27,7 +26,8 @@ do_configure_prepend () {
mv configure.ac.new configure.ac
}
do_install_append () {
# driver's la files are not packaged
rm -f ${D}${libdir}/xorg/modules/drivers/*.la
# FIXME: We don't want to include the libtool archives (*.la) from modules
# directory, as they serve no useful purpose. Upstream should fix Makefile.am
do_install_append() {
find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
}

3
meta/recipes-graphics/xorg-driver/xf86-input-common.inc → meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
View File

@ -1,7 +1,6 @@
include xf86-driver-common.inc
include xorg-driver-common.inc
DEPENDS += "inputproto kbproto "
FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"

2
meta/recipes-graphics/xorg-driver/xf86-video-common.inc → meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
View File

@ -1,4 +1,4 @@
include xf86-driver-common.inc
include xorg-driver-common.inc
DEPENDS =+ "renderproto videoproto xextproto fontsproto"