diff options
-rw-r--r-- | conf/distro/include/preferred-xorg-versions-live.inc | 16 | ||||
-rw-r--r-- | recipes/xorg-app/smproxy_1.0.4.bb | 7 | ||||
-rw-r--r-- | recipes/xorg-app/xfd_1.1.0.bb | 7 | ||||
-rw-r--r-- | recipes/xorg-lib/libfontenc_1.1.0.bb | 11 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.1/dolt-fix.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.0.902/dolt-fix.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.1/hack-assume-pixman-supports-overlapped-blt.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-assume-pixman-supports-overlapped-blt.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.1/hack-fbdev-ignore-return-mode.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-fbdev-ignore-return-mode.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.1/randr-support.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.0.902/randr-support.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.9.1.bb (renamed from recipes/xorg-xserver/xserver-xorg_1.9.0.902.bb) | 9 |
9 files changed, 36 insertions, 14 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 94139fc162..5b657ff9a3 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Wed Oct 20 18:13:56 CEST 2010 +#Mon Oct 25 09:44:10 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -30,7 +30,7 @@ PREFERRED_VERSION_scripts ?= "1.0.1" PREFERRED_VERSION_sessreg ?= "1.0.6" PREFERRED_VERSION_setxkbmap ?= "1.2.0" PREFERRED_VERSION_showfont ?= "1.0.2" -PREFERRED_VERSION_smproxy ?= "1.0.3" +PREFERRED_VERSION_smproxy ?= "1.0.4" PREFERRED_VERSION_twm ?= "1.0.4" PREFERRED_VERSION_viewres ?= "1.0.2" PREFERRED_VERSION_x11perf ?= "1.5.2" @@ -54,7 +54,7 @@ PREFERRED_VERSION_xedit ?= "1.1.2" PREFERRED_VERSION_xev ?= "1.0.4" PREFERRED_VERSION_xeyes ?= "1.1.0" PREFERRED_VERSION_xf86dga ?= "1.0.2" -PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfd ?= "1.1.0" PREFERRED_VERSION_xfindproxy ?= "1.0.1" PREFERRED_VERSION_xfontsel ?= "1.0.3" PREFERRED_VERSION_xfs ?= "1.1.0" @@ -285,16 +285,16 @@ PREFERRED_VERSION_libxxf86dga ?= "1.1.1" PREFERRED_VERSION_libxxf86misc ?= "1.0.2" PREFERRED_VERSION_libxxf86vm ?= "1.1.0" PREFERRED_VERSION_libdmx ?= "1.1.0" -PREFERRED_VERSION_libfontenc ?= "1.0.5" -PREFERRED_VERSION_libfontenc-native ?= "1.0.5" +PREFERRED_VERSION_libfontenc ?= "1.1.0" +PREFERRED_VERSION_libfontenc-native ?= "1.1.0" PREFERRED_VERSION_liblbxutil ?= "1.1.0" PREFERRED_VERSION_liboldx ?= "1.0.1" PREFERRED_VERSION_libpciaccess ?= "0.12.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_pixman ?= "0.19.4" -PREFERRED_VERSION_pixman-native ?= "0.19.4" +PREFERRED_VERSION_pixman ?= "0.19.6" +PREFERRED_VERSION_pixman-native ?= "0.19.6" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -353,4 +353,4 @@ PREFERRED_VERSION_util-macros ?= "1.10.1" PREFERRED_VERSION_util-macros-native ?= "1.10.1" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver -PREFERRED_VERSION_xserver-xorg ?= "1.9.0.902" +PREFERRED_VERSION_xserver-xorg ?= "1.9.1" diff --git a/recipes/xorg-app/smproxy_1.0.4.bb b/recipes/xorg-app/smproxy_1.0.4.bb new file mode 100644 index 0000000000..2b725c6742 --- /dev/null +++ b/recipes/xorg-app/smproxy_1.0.4.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DEPENDS += " libxt libxmu" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "8ab518393bef44d3ea2bccb027021aab" +SRC_URI[archive.sha256sum] = "3792e5772f74ac4a1bcb1d3feee2f899b24ffa958250ed6f9944269d15f94472" diff --git a/recipes/xorg-app/xfd_1.1.0.bb b/recipes/xorg-app/xfd_1.1.0.bb new file mode 100644 index 0000000000..e598c1009e --- /dev/null +++ b/recipes/xorg-app/xfd_1.1.0.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DEPENDS += " libxaw freetype fontconfig libxft libxt" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "17d8ef0d490301158f8abf7641cca243" +SRC_URI[archive.sha256sum] = "e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a" diff --git a/recipes/xorg-lib/libfontenc_1.1.0.bb b/recipes/xorg-lib/libfontenc_1.1.0.bb new file mode 100644 index 0000000000..bce1aa54ba --- /dev/null +++ b/recipes/xorg-lib/libfontenc_1.1.0.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 font encoding library" +LICENSE = "BSD-X" +DEPENDS += "zlib xproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "11d3c292f05a90f6f67840a9e9c3d9b8" +SRC_URI[archive.sha256sum] = "348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.9.1/dolt-fix.patch index e332ce0bbe..e332ce0bbe 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/dolt-fix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.9.1/dolt-fix.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-assume-pixman-supports-overlapped-blt.patch index a947582f15..a947582f15 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-assume-pixman-supports-overlapped-blt.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-fbdev-ignore-return-mode.patch index d3661cbea2..d3661cbea2 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/hack-fbdev-ignore-return-mode.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-fbdev-ignore-return-mode.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.1/randr-support.patch index abc7db41eb..abc7db41eb 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.0.902/randr-support.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.9.1/randr-support.patch diff --git a/recipes/xorg-xserver/xserver-xorg_1.9.0.902.bb b/recipes/xorg-xserver/xserver-xorg_1.9.1.bb index bd19b45d21..bee56896c1 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.9.0.902.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.9.1.bb @@ -6,18 +6,15 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PE = "2" -PR = "${INC_PR}.4" - -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" +PR = "${INC_PR}.0" SRC_URI += " \ file://dolt-fix.patch \ file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ " -SRC_URI[archive.md5sum] = "9bb3d015995150b49836dc0b89442f22" -SRC_URI[archive.sha256sum] = "bbb48daf562f6b046b649a592490de86ea2d5c7608c792a8d6103ddf950d753a" +SRC_URI[archive.md5sum] = "64f2a021667ac3a2bc007f2567170f03" +SRC_URI[archive.sha256sum] = "33e7624a52a21762c9dfdabde7b7bd1221c5298fd1b429f7c6b683145710114e" SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" |