diff options
-rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
-rw-r--r-- | meta/packages/xorg-lib/libx11-trim_1.3.4.bb | 14 | ||||
-rw-r--r-- | meta/packages/xorg-lib/libx11-trim_1.3.bb | 11 |
3 files changed, 15 insertions, 12 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 060c8b7ec..8083df247 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -38,7 +38,7 @@ PREFERRED_VERSION_libx11 ?= "1.3.4" PREFERRED_VERSION_libx11-diet ?= "1.3" PREFERRED_VERSION_libx11-native ?= "1.3.4" PREFERRED_VERSION_libx11-nativesdk ?= "1.3.4" -PREFERRED_VERSION_libx11-trim ?= "1.3" +PREFERRED_VERSION_libx11-trim ?= "1.3.4" PREFERRED_VERSION_libxau ?= "1.0.5" PREFERRED_VERSION_libxau-native ?= "1.0.5" PREFERRED_VERSION_libxau-nativesdk ?= "1.0.5" diff --git a/meta/packages/xorg-lib/libx11-trim_1.3.4.bb b/meta/packages/xorg-lib/libx11-trim_1.3.4.bb new file mode 100644 index 000000000..190217d38 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-trim_1.3.4.bb @@ -0,0 +1,14 @@ +require libx11.inc + +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" + +PR = "r0" + +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" + +SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \ + file://../libx11-${PV}/include_fix.patch \ + file://../libx11-${PV}/nodolt.patch" + +EXTRA_OECONF += "--disable-xcms --with-xcb" diff --git a/meta/packages/xorg-lib/libx11-trim_1.3.bb b/meta/packages/xorg-lib/libx11-trim_1.3.bb deleted file mode 100644 index 08c8b163a..000000000 --- a/meta/packages/xorg-lib/libx11-trim_1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libx11.inc - -PR = "r6" - -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1 \ - file://nodolt.patch;patch=1" - -EXTRA_OECONF += "--disable-xcms --with-xcb" |