diff options
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-live.inc | 14 | ||||
| -rw-r--r-- | recipes/xorg-app/xbacklight_1.1.2.bb | 8 | ||||
| -rw-r--r-- | recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch | 32 | ||||
| -rw-r--r-- | recipes/xorg-app/xkbevd_1.1.1.bb | 8 | ||||
| -rw-r--r-- | recipes/xorg-app/xkbevd_1.1.2.bb | 7 | ||||
| -rw-r--r-- | recipes/xorg-data/xbitmaps_1.1.1.bb | 10 | ||||
| -rw-r--r-- | recipes/xorg-proto/resourceproto_1.1.1.bb | 8 | ||||
| -rw-r--r-- | recipes/xorg-proto/xproto_7.0.19.bb | 7 | ||||
| -rw-r--r-- | recipes/xorg-proto/xproto_7.0.20.bb | 7 |
9 files changed, 47 insertions, 54 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 70f9177d86..48b704be6c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Mon Dec 6 11:29:28 CET 2010 +#Sat Dec 11 12:05:27 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.3" PREFERRED_VERSION_bdftopcf ?= "1.0.3" @@ -35,7 +35,7 @@ PREFERRED_VERSION_twm ?= "1.0.5" PREFERRED_VERSION_viewres ?= "1.0.3" PREFERRED_VERSION_x11perf ?= "1.5.2" PREFERRED_VERSION_xauth ?= "1.0.5" -PREFERRED_VERSION_xbacklight ?= "1.1.1" +PREFERRED_VERSION_xbacklight ?= "1.1.2" PREFERRED_VERSION_xbiff ?= "1.0.2" PREFERRED_VERSION_xcalc ?= "1.0.4.1" PREFERRED_VERSION_xclipboard ?= "1.1.1" @@ -67,7 +67,7 @@ PREFERRED_VERSION_xinit ?= "1.3.0" PREFERRED_VERSION_xinput ?= "1.5.3" PREFERRED_VERSION_xkbcomp ?= "1.2.0" PREFERRED_VERSION_xkbcomp-native ?= "1.2.0" -PREFERRED_VERSION_xkbevd ?= "1.1.1" +PREFERRED_VERSION_xkbevd ?= "1.1.2" PREFERRED_VERSION_xkbprint ?= "1.0.2" PREFERRED_VERSION_xkbutils ?= "1.0.3" PREFERRED_VERSION_xkill ?= "1.0.3" @@ -104,7 +104,7 @@ PREFERRED_VERSION_xwd ?= "1.0.4" PREFERRED_VERSION_xwininfo ?= "1.1.1" PREFERRED_VERSION_xwud ?= "1.0.3" #data -PREFERRED_VERSION_xbitmaps ?= "1.1.0" +PREFERRED_VERSION_xbitmaps ?= "1.1.1" PREFERRED_VERSION_xcursor-themes ?= "1.0.3" PREFERRED_VERSION_xkbdata ?= "1.0.1" #doc @@ -323,7 +323,7 @@ PREFERRED_VERSION_randrproto-native ?= "1.3.2" PREFERRED_VERSION_recordproto ?= "1.14.1" PREFERRED_VERSION_renderproto ?= "0.11.1" PREFERRED_VERSION_renderproto-native ?= "0.11.1" -PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_resourceproto ?= "1.1.1" PREFERRED_VERSION_scrnsaverproto ?= "1.2.1" PREFERRED_VERSION_trapproto ?= "3.4.3" PREFERRED_VERSION_videoproto ?= "2.3.1" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.19" -PREFERRED_VERSION_xproto-native ?= "7.0.19" +PREFERRED_VERSION_xproto ?= "7.0.20" +PREFERRED_VERSION_xproto-native ?= "7.0.20" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" diff --git a/recipes/xorg-app/xbacklight_1.1.2.bb b/recipes/xorg-app/xbacklight_1.1.2.bb new file mode 100644 index 0000000000..ac3c6d41f5 --- /dev/null +++ b/recipes/xorg-app/xbacklight_1.1.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +DESCRIPTION = "adjust backlight brightness using RandR extension" +DEPENDS += " libxrender libxrandr" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "c9891d6a3f3129d56cede72daa0ba26c" +SRC_URI[archive.sha256sum] = "af2f02d09de8a19848e3f3b322320141bceebf9d4097b7bd505457a1bd936509" diff --git a/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch b/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch deleted file mode 100644 index 7fba81852b..0000000000 --- a/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 16cdb1985052e6d16f724838f575deed7aeaa72a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 1 Nov 2010 09:46:20 +0100 -Subject: [PATCH] config: replace AC_CHECK_FILE with test -f - -* AC_CHECK_FILE doesn't work for cross compilation -* https://bugs.freedesktop.org/show_bug.cgi?id=31289 ---- - configure.ac | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 611861c..73c7def 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,8 +35,11 @@ AM_CONFIG_HEADER(config.h) - - AC_PROG_YACC - AC_PATH_PROG([YACC_INST], $YACC) --AC_CHECK_FILE([$srcdir/cfgparse.c], [], -- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])]) -+if test ! -f "$srcdir/cfgparse.c"; then -+ if test -z "$YACC_INST"; then -+ AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y]) -+ fi -+fi - - XORG_DEFAULT_OPTIONS - --- -1.7.3.2 - diff --git a/recipes/xorg-app/xkbevd_1.1.1.bb b/recipes/xorg-app/xkbevd_1.1.1.bb deleted file mode 100644 index 582c7465f1..0000000000 --- a/recipes/xorg-app/xkbevd_1.1.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-app-common.inc -DEPENDS += " libxkbfile " -PE = "1" -PR = "${INC_PR}.0" - -SRC_URI += "file://0001-config-replace-AC_CHECK_FILE-with-test-f.patch" -SRC_URI[archive.md5sum] = "699198865d6902c39e3c6a9693a6422d" -SRC_URI[archive.sha256sum] = "b47060a0131edd05d840ee21e8d3c7545151883b9a87c45e62e444d711e4805a" diff --git a/recipes/xorg-app/xkbevd_1.1.2.bb b/recipes/xorg-app/xkbevd_1.1.2.bb new file mode 100644 index 0000000000..22e76d637f --- /dev/null +++ b/recipes/xorg-app/xkbevd_1.1.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DEPENDS += " libxkbfile " +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "d8d0bc5935b4b8f016ed92fd369dd385" +SRC_URI[archive.sha256sum] = "cd62946c9feb3eb2fe0baef1ce5c0f4ab14148099264ecbce6e039b17880eb63" diff --git a/recipes/xorg-data/xbitmaps_1.1.1.bb b/recipes/xorg-data/xbitmaps_1.1.1.bb new file mode 100644 index 0000000000..5866979646 --- /dev/null +++ b/recipes/xorg-data/xbitmaps_1.1.1.bb @@ -0,0 +1,10 @@ +require xorg-data-common.inc + +DESCRIPTION = "Common X11 Bitmaps" +LICENSE = "MIT" +DEPENDS += "libxmu" + + +SRC_URI[archive.md5sum] = "7444bbbd999b53bec6a60608a5301f4c" +SRC_URI[archive.sha256sum] = "3671b034356bbc4d32d052808cf646c940ec8b2d1913adac51b1453e41aa1e9d" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-proto/resourceproto_1.1.1.bb b/recipes/xorg-proto/resourceproto_1.1.1.bb new file mode 100644 index 0000000000..a34c8474ff --- /dev/null +++ b/recipes/xorg-proto/resourceproto_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "8ff0525ae7502b48597b78d00bc22284" +SRC_URI[archive.sha256sum] = "8579818e99aa881c00c04eb5f96fcbeec463816ca8e3cda9d3d25562f7a4b8c6" + +CONFLICTS = "resourceext" diff --git a/recipes/xorg-proto/xproto_7.0.19.bb b/recipes/xorg-proto/xproto_7.0.19.bb deleted file mode 100644 index 6ae50be0a8..0000000000 --- a/recipes/xorg-proto/xproto_7.0.19.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc -PE = "1" -PR = "${INC_PR}.0" - -SRC_URI[archive.md5sum] = "700f8663c23713c2a81a6038a7d358f0" -SRC_URI[archive.sha256sum] = "47b14f6da8c57a726ef1cfa5964a4a6cf9505bc6d78f69d3ae89f4b19956fc2a" - diff --git a/recipes/xorg-proto/xproto_7.0.20.bb b/recipes/xorg-proto/xproto_7.0.20.bb new file mode 100644 index 0000000000..8ab3380427 --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.20.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "65633168e5315c19defb4652cd3d83c1" +SRC_URI[archive.sha256sum] = "3fe87fe47d9b795e60ba3715d71f90f9929d57e9048f1d2a6ebb558e5aee9e2a" + |