From 658b9a4ff27a2638b41c780b71414a00d8c80045 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 30 Oct 2010 13:45:02 +0200 Subject: xorg: new versions for 20101030 Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 78 +++++++++++----------- recipes/xorg-app/bdftopcf_1.0.3.bb | 10 +++ recipes/xorg-app/iceauth_1.0.4.bb | 8 +++ recipes/xorg-app/mkfontscale_1.0.8.bb | 9 +++ recipes/xorg-font/encodings_1.0.4.bb | 8 +++ .../libx11-1.3.99.902/keysymdef_include.patch | 19 ------ .../libx11-1.3.99.902/x11_disable_makekeys.patch | 29 -------- .../libx11-1.3.99.903/keysymdef_include.patch | 19 ++++++ .../libx11-1.3.99.903/x11_disable_makekeys.patch | 29 ++++++++ recipes/xorg-lib/libx11_1.3.99.902.bb | 8 --- recipes/xorg-lib/libx11_1.3.99.903.bb | 8 +++ recipes/xorg-lib/libxdmcp_1.1.0.bb | 12 ++++ recipes/xorg-lib/libxft_2.2.0.bb | 22 ++++++ recipes/xorg-lib/libxkbfile_1.0.7.bb | 11 +++ recipes/xorg-lib/libxmu_1.1.0.bb | 17 +++++ recipes/xorg-lib/libxpm_3.5.9.bb | 16 +++++ recipes/xorg-lib/libxscrnsaver_1.2.1.bb | 13 ++++ recipes/xorg-lib/libxtst_1.2.0.bb | 10 +++ recipes/xorg-lib/libxv_1.0.6.bb | 10 +++ recipes/xorg-lib/libxxf86dga_1.1.2.bb | 10 +++ recipes/xorg-lib/libxxf86vm_1.1.1.bb | 10 +++ recipes/xorg-proto/bigreqsproto_1.1.1.bb | 8 +++ recipes/xorg-proto/compositeproto_0.4.2.bb | 8 +++ recipes/xorg-proto/damageproto_1.2.1.bb | 8 +++ recipes/xorg-proto/fixesproto_4.1.2.bb | 10 +++ recipes/xorg-proto/fontsproto_2.1.1.bb | 8 +++ recipes/xorg-proto/randrproto_1.3.2.bb | 10 +++ recipes/xorg-proto/recordproto_1.14.1.bb | 8 +++ recipes/xorg-proto/scrnsaverproto_1.2.1.bb | 6 ++ recipes/xorg-proto/xcmiscproto_1.2.1.bb | 8 +++ recipes/xorg-util/makedepend_1.0.3.bb | 4 ++ recipes/xorg-util/util-macros_1.10.1.bb | 4 -- recipes/xorg-util/util-macros_1.11.0.bb | 4 ++ 33 files changed, 343 insertions(+), 99 deletions(-) create mode 100644 recipes/xorg-app/bdftopcf_1.0.3.bb create mode 100644 recipes/xorg-app/iceauth_1.0.4.bb create mode 100644 recipes/xorg-app/mkfontscale_1.0.8.bb create mode 100644 recipes/xorg-font/encodings_1.0.4.bb delete mode 100644 recipes/xorg-lib/libx11-1.3.99.902/keysymdef_include.patch delete mode 100644 recipes/xorg-lib/libx11-1.3.99.902/x11_disable_makekeys.patch create mode 100644 recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch create mode 100644 recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch delete mode 100644 recipes/xorg-lib/libx11_1.3.99.902.bb create mode 100644 recipes/xorg-lib/libx11_1.3.99.903.bb create mode 100644 recipes/xorg-lib/libxdmcp_1.1.0.bb create mode 100644 recipes/xorg-lib/libxft_2.2.0.bb create mode 100644 recipes/xorg-lib/libxkbfile_1.0.7.bb create mode 100644 recipes/xorg-lib/libxmu_1.1.0.bb create mode 100644 recipes/xorg-lib/libxpm_3.5.9.bb create mode 100644 recipes/xorg-lib/libxscrnsaver_1.2.1.bb create mode 100644 recipes/xorg-lib/libxtst_1.2.0.bb create mode 100644 recipes/xorg-lib/libxv_1.0.6.bb create mode 100644 recipes/xorg-lib/libxxf86dga_1.1.2.bb create mode 100644 recipes/xorg-lib/libxxf86vm_1.1.1.bb create mode 100644 recipes/xorg-proto/bigreqsproto_1.1.1.bb create mode 100644 recipes/xorg-proto/compositeproto_0.4.2.bb create mode 100644 recipes/xorg-proto/damageproto_1.2.1.bb create mode 100644 recipes/xorg-proto/fixesproto_4.1.2.bb create mode 100644 recipes/xorg-proto/fontsproto_2.1.1.bb create mode 100644 recipes/xorg-proto/randrproto_1.3.2.bb create mode 100644 recipes/xorg-proto/recordproto_1.14.1.bb create mode 100644 recipes/xorg-proto/scrnsaverproto_1.2.1.bb create mode 100644 recipes/xorg-proto/xcmiscproto_1.2.1.bb create mode 100644 recipes/xorg-util/makedepend_1.0.3.bb delete mode 100644 recipes/xorg-util/util-macros_1.10.1.bb create mode 100644 recipes/xorg-util/util-macros_1.11.0.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 33c4935605..9377338d2d 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,8 +1,8 @@ -#Fri Oct 29 08:03:06 CEST 2010 +#Sat Oct 30 10:30:36 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" -PREFERRED_VERSION_bdftopcf ?= "1.0.2" -PREFERRED_VERSION_bdftopcf-native ?= "1.0.2" +PREFERRED_VERSION_bdftopcf ?= "1.0.3" +PREFERRED_VERSION_bdftopcf-native ?= "1.0.3" PREFERRED_VERSION_beforelight ?= "1.0.3" PREFERRED_VERSION_bitmap ?= "1.0.5" PREFERRED_VERSION_constype ?= "1.0.2" @@ -10,7 +10,7 @@ PREFERRED_VERSION_editres ?= "1.0.4" PREFERRED_VERSION_fonttosfnt ?= "1.0.4" PREFERRED_VERSION_fslsfonts ?= "1.0.2" PREFERRED_VERSION_fstobdf ?= "1.0.3" -PREFERRED_VERSION_iceauth ?= "1.0.3" +PREFERRED_VERSION_iceauth ?= "1.0.4" PREFERRED_VERSION_ico ?= "1.0.2" PREFERRED_VERSION_lbxproxy ?= "1.0.2" PREFERRED_VERSION_listres ?= "1.0.2" @@ -19,8 +19,8 @@ PREFERRED_VERSION_mkcfm ?= "1.0.1" PREFERRED_VERSION_mkcomposecache ?= "1.2.1" PREFERRED_VERSION_mkfontdir ?= "1.0.5" PREFERRED_VERSION_mkfontdir-native ?= "1.0.5" -PREFERRED_VERSION_mkfontscale ?= "1.0.7" -PREFERRED_VERSION_mkfontscale-native ?= "1.0.7" +PREFERRED_VERSION_mkfontscale ?= "1.0.8" +PREFERRED_VERSION_mkfontscale-native ?= "1.0.8" PREFERRED_VERSION_oclock ?= "1.0.2" PREFERRED_VERSION_proxymngr ?= "1.0.1" PREFERRED_VERSION_rendercheck ?= "1.3" @@ -195,7 +195,7 @@ PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" PREFERRED_VERSION_xf86-video-xgi ?= "1.6.0" PREFERRED_VERSION_xf86-video-xgixp ?= "1.8.0" #font -PREFERRED_VERSION_encodings ?= "1.0.3" +PREFERRED_VERSION_encodings ?= "1.0.4" PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.2" PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.2" PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.3" @@ -242,9 +242,9 @@ PREFERRED_VERSION_libice-native ?= "1.0.7" PREFERRED_VERSION_libsm ?= "1.2.0" PREFERRED_VERSION_libsm-native ?= "1.2.0" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.99.902" -PREFERRED_VERSION_libx11-native ?= "1.3.99.902" -PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" +PREFERRED_VERSION_libx11 ?= "1.3.99.903" +PREFERRED_VERSION_libx11-native ?= "1.3.99.903" +PREFERRED_VERSION_libxscrnsaver ?= "1.2.1" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.6" PREFERRED_VERSION_libxau-native ?= "1.0.6" @@ -253,8 +253,8 @@ PREFERRED_VERSION_libxcomposite ?= "0.4.3" PREFERRED_VERSION_libxcursor ?= "1.1.11" PREFERRED_VERSION_libxcursor-native ?= "1.1.11" PREFERRED_VERSION_libxdamage ?= "1.1.3" -PREFERRED_VERSION_libxdmcp ?= "1.0.3" -PREFERRED_VERSION_libxdmcp-native ?= "1.0.3" +PREFERRED_VERSION_libxdmcp ?= "1.1.0" +PREFERRED_VERSION_libxdmcp-native ?= "1.1.0" PREFERRED_VERSION_libxevie ?= "1.0.2" PREFERRED_VERSION_libxext ?= "1.2.0" PREFERRED_VERSION_libxext-native ?= "1.2.0" @@ -263,12 +263,12 @@ PREFERRED_VERSION_libxfixes-native ?= "4.0.5" PREFERRED_VERSION_libxfont ?= "1.4.3" PREFERRED_VERSION_libxfont-native ?= "1.4.3" PREFERRED_VERSION_libxfontcache ?= "1.0.5" -PREFERRED_VERSION_libxft ?= "2.1.14" +PREFERRED_VERSION_libxft ?= "2.2.0" PREFERRED_VERSION_libxi ?= "1.3.2" PREFERRED_VERSION_libxinerama ?= "1.1.1" -PREFERRED_VERSION_libxmu ?= "1.0.5" +PREFERRED_VERSION_libxmu ?= "1.1.0" PREFERRED_VERSION_libxp ?= "1.0.0" -PREFERRED_VERSION_libxpm ?= "3.5.8" +PREFERRED_VERSION_libxpm ?= "3.5.9" PREFERRED_VERSION_libxprintapputil ?= "1.0.1" PREFERRED_VERSION_libxprintutil ?= "1.0.1" PREFERRED_VERSION_libxrandr ?= "1.3.1" @@ -278,20 +278,20 @@ PREFERRED_VERSION_libxrender-native ?= "0.9.6" PREFERRED_VERSION_libxres ?= "1.0.5" PREFERRED_VERSION_libxt ?= "1.0.9" PREFERRED_VERSION_libxt-native ?= "1.0.9" -PREFERRED_VERSION_libxtst ?= "1.1.0" -PREFERRED_VERSION_libxv ?= "1.0.5" +PREFERRED_VERSION_libxtst ?= "1.2.0" +PREFERRED_VERSION_libxv ?= "1.0.6" PREFERRED_VERSION_libxvmc ?= "1.0.6" -PREFERRED_VERSION_libxxf86dga ?= "1.1.1" +PREFERRED_VERSION_libxxf86dga ?= "1.1.2" PREFERRED_VERSION_libxxf86misc ?= "1.0.2" -PREFERRED_VERSION_libxxf86vm ?= "1.1.0" +PREFERRED_VERSION_libxxf86vm ?= "1.1.1" PREFERRED_VERSION_libdmx ?= "1.1.1" 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_libxkbfile ?= "1.0.7" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.7" PREFERRED_VERSION_libxkbui ?= "1.0.2" PREFERRED_VERSION_pixman ?= "0.20.0" PREFERRED_VERSION_pixman-native ?= "0.20.0" @@ -299,37 +299,37 @@ PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto PREFERRED_VERSION_applewmproto ?= "1.4.1" -PREFERRED_VERSION_bigreqsproto ?= "1.1.0" -PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" -PREFERRED_VERSION_compositeproto ?= "0.4.1" -PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_bigreqsproto ?= "1.1.1" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.1" +PREFERRED_VERSION_compositeproto ?= "0.4.2" +PREFERRED_VERSION_damageproto ?= "1.2.1" PREFERRED_VERSION_dmxproto ?= "2.3" PREFERRED_VERSION_dri2proto ?= "2.3" PREFERRED_VERSION_evieext ?= "1.1.0" -PREFERRED_VERSION_fixesproto ?= "4.1.1" -PREFERRED_VERSION_fixesproto-native ?= "4.1.1" +PREFERRED_VERSION_fixesproto ?= "4.1.2" +PREFERRED_VERSION_fixesproto-native ?= "4.1.2" PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" -PREFERRED_VERSION_fontsproto ?= "2.1.0" -PREFERRED_VERSION_fontsproto-native ?= "2.1.0" +PREFERRED_VERSION_fontsproto ?= "2.1.1" +PREFERRED_VERSION_fontsproto-native ?= "2.1.1" PREFERRED_VERSION_glproto ?= "1.4.12" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" PREFERRED_VERSION_kbproto ?= "1.0.5" PREFERRED_VERSION_kbproto-native ?= "1.0.5" PREFERRED_VERSION_printproto ?= "1.0.4" -PREFERRED_VERSION_randrproto ?= "1.3.1" -PREFERRED_VERSION_randrproto-native ?= "1.3.1" -PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_randrproto ?= "1.3.2" +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_scrnsaverproto ?= "1.2.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.1" PREFERRED_VERSION_trapproto ?= "3.4.3" PREFERRED_VERSION_videoproto ?= "2.3.1" PREFERRED_VERSION_windowswmproto ?= "1.0.4" -PREFERRED_VERSION_xcmiscproto ?= "1.2.0" -PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto ?= "1.2.1" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.1" PREFERRED_VERSION_xextproto ?= "7.1.2" PREFERRED_VERSION_xextproto-native ?= "7.1.2" PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" @@ -347,10 +347,10 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" PREFERRED_VERSION_gccmakedep ?= "1.0.2" PREFERRED_VERSION_imake ?= "1.0.3" PREFERRED_VERSION_lndir ?= "1.0.2" -PREFERRED_VERSION_makedepend ?= "1.0.2" -PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.10.1" -PREFERRED_VERSION_util-macros-native ?= "1.10.1" +PREFERRED_VERSION_makedepend ?= "1.0.3" +PREFERRED_VERSION_makedepend-native ?= "1.0.3" +PREFERRED_VERSION_util-macros ?= "1.11.0" +PREFERRED_VERSION_util-macros-native ?= "1.11.0" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver PREFERRED_VERSION_xserver-xorg ?= "1.9.1" diff --git a/recipes/xorg-app/bdftopcf_1.0.3.bb b/recipes/xorg-app/bdftopcf_1.0.3.bb new file mode 100644 index 0000000000..cfe686eb1e --- /dev/null +++ b/recipes/xorg-app/bdftopcf_1.0.3.bb @@ -0,0 +1,10 @@ +require xorg-app-common.inc +DESCRIPTION = "converts BDF fonts to PCF fonts" +DEPENDS += " libxfont" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "4a7a4a848c43c42f7d499b60666434a4" +SRC_URI[archive.sha256sum] = "9c90b408b2fe079495697bfc8fb13da940b2b70f4907213bf5dcc9e3024a1d0a" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-app/iceauth_1.0.4.bb b/recipes/xorg-app/iceauth_1.0.4.bb new file mode 100644 index 0000000000..6bb99999bf --- /dev/null +++ b/recipes/xorg-app/iceauth_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +DESCRIPTION = "a tool for manipulating ICE protocol authorization records" +DEPENDS += " libice" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "bb2e4d2611047f7c5a1a82ec956a9de4" +SRC_URI[archive.sha256sum] = "0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d" diff --git a/recipes/xorg-app/mkfontscale_1.0.8.bb b/recipes/xorg-app/mkfontscale_1.0.8.bb new file mode 100644 index 0000000000..9c34286b81 --- /dev/null +++ b/recipes/xorg-app/mkfontscale_1.0.8.bb @@ -0,0 +1,9 @@ +require xorg-app-common.inc +DESCRIPTION = "a program to create an index of scalable font files for X" +DEPENDS += " zlib libfontenc freetype " +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "5210c9385c6cc4a00ce829d8dc9c819b" +SRC_URI[archive.sha256sum] = "6eb57786cd79eebfbaca386fe24dcfe50689dbf433d052e58291c2925f2050f9" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-font/encodings_1.0.4.bb b/recipes/xorg-font/encodings_1.0.4.bb new file mode 100644 index 0000000000..a9c661e1cf --- /dev/null +++ b/recipes/xorg-font/encodings_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc +PE = "1" +PR = "${INC_PR}.0" + +DEPENDS = "mkfontscale-native font-util-native font-util" + +SRC_URI[archive.md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" +SRC_URI[archive.sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" diff --git a/recipes/xorg-lib/libx11-1.3.99.902/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.99.902/keysymdef_include.patch deleted file mode 100644 index 1a30e345f9..0000000000 --- a/recipes/xorg-lib/libx11-1.3.99.902/keysymdef_include.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/recipes/xorg-lib/libx11-1.3.99.902/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.99.902/x11_disable_makekeys.patch deleted file mode 100644 index 9763313975..0000000000 --- a/recipes/xorg-lib/libx11-1.3.99.902/x11_disable_makekeys.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: libX11-1.3.4/src/util/Makefile.am -=================================================================== ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh -- --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch new file mode 100644 index 0000000000..1a30e345f9 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.99.903/keysymdef_include.patch @@ -0,0 +1,19 @@ +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.99.903/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.3.99.902.bb b/recipes/xorg-lib/libx11_1.3.99.902.bb deleted file mode 100644 index e7efc057bb..0000000000 --- a/recipes/xorg-lib/libx11_1.3.99.902.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libx11.inc -#--without-xcb is not an option anymore -#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 -DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}" -PR = "${INC_PR}.0" - -SRC_URI[archive.md5sum] = "dd824b76739a23fb466518f4acabb77b" -SRC_URI[archive.sha256sum] = "9435dc0214afea0567f5f9f894cc62e44505511e4221dc936df361f14817bf2e" diff --git a/recipes/xorg-lib/libx11_1.3.99.903.bb b/recipes/xorg-lib/libx11_1.3.99.903.bb new file mode 100644 index 0000000000..65ff63c9a2 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.99.903.bb @@ -0,0 +1,8 @@ +require libx11.inc +#--without-xcb is not an option anymore +#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 +DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "3e8ed7a91f70bb819b5dab9c124a7062" +SRC_URI[archive.sha256sum] = "50205aad0646c0ab13aff8e8eaec7c5cddff416d3a012f83c5661ad98e49736f" diff --git a/recipes/xorg-lib/libxdmcp_1.1.0.bb b/recipes/xorg-lib/libxdmcp_1.1.0.bb new file mode 100644 index 0000000000..076297e9a6 --- /dev/null +++ b/recipes/xorg-lib/libxdmcp_1.1.0.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc +DESCRIPTION = "X Display Manager Control Protocol library" +DEPENDS += "xproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "762b6bbaff7b7d0831ddb4f072f939a5" +SRC_URI[archive.sha256sum] = "b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072" + +BBCLASSEXTEND = "native nativesdk" + +XORG_PN = "libXdmcp" diff --git a/recipes/xorg-lib/libxft_2.2.0.bb b/recipes/xorg-lib/libxft_2.2.0.bb new file mode 100644 index 0000000000..794efb7643 --- /dev/null +++ b/recipes/xorg-lib/libxft_2.2.0.bb @@ -0,0 +1,22 @@ +require xorg-lib-common.inc +DESCRIPTION = "FreeType-based font drawing library for X" +DEPENDS += "libxrender freetype fontconfig" +PE = "1" +PR = "${INC_PR}.0" + +#SRC_URI += "file://autotools.patch" +SRC_URI[archive.md5sum] = "cce3c327258116493b753f157e0360c7" +SRC_URI[archive.sha256sum] = "c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2" + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} + +XORG_PN = "libXft" diff --git a/recipes/xorg-lib/libxkbfile_1.0.7.bb b/recipes/xorg-lib/libxkbfile_1.0.7.bb new file mode 100644 index 0000000000..28612e9d35 --- /dev/null +++ b/recipes/xorg-lib/libxkbfile_1.0.7.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 keyboard file manipulation library" +LICENSE = "GPL" +DEPENDS += "virtual/libx11 kbproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "59b4fe0bdf8d9b05e45b59e8fe9e7516" +SRC_URI[archive.sha256sum] = "667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-lib/libxmu_1.1.0.bb b/recipes/xorg-lib/libxmu_1.1.0.bb new file mode 100644 index 0000000000..6692bfb83d --- /dev/null +++ b/recipes/xorg-lib/libxmu_1.1.0.bb @@ -0,0 +1,17 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 miscellaneous utility library" +DEPENDS += "libxt libxext" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6836883a0120e8346cf7f58dc42e465a" +SRC_URI[archive.sha256sum] = "0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" + +XORG_PN = "libXmu" diff --git a/recipes/xorg-lib/libxpm_3.5.9.bb b/recipes/xorg-lib/libxpm_3.5.9.bb new file mode 100644 index 0000000000..028f5fd45d --- /dev/null +++ b/recipes/xorg-lib/libxpm_3.5.9.bb @@ -0,0 +1,16 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 Pixmap library" +LICENSE = "X-BSD" +DEPENDS += "libxext libsm libxt" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "2de3a1b9541f4b3a6f9d84b69d25530e" +SRC_URI[archive.sha256sum] = "8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e" + +PACKAGES =+ "sxpm cxpm" + +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" + +XORG_PN = "libXpm" diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.1.bb b/recipes/xorg-lib/libxscrnsaver_1.2.1.bb new file mode 100644 index 0000000000..c21096d775 --- /dev/null +++ b/recipes/xorg-lib/libxscrnsaver_1.2.1.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc +DESCRIPTION = "X Screen Saver extension library" +LICENSE = "GPL" +DEPENDS += "libxext scrnsaverproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "898794bf6812fc9be9bf1bb7aa4d2b08" +SRC_URI[archive.sha256sum] = "ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a" + +RREPLACES_${PN} = "libxss" + +XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxtst_1.2.0.bb b/recipes/xorg-lib/libxtst_1.2.0.bb new file mode 100644 index 0000000000..4a9735687a --- /dev/null +++ b/recipes/xorg-lib/libxtst_1.2.0.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +DESCRIPTION = "X Test Extension: client side library" +DEPENDS += "libxext recordproto inputproto libxi" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "7c592c72da6676f8b0aeec9133b81686" +SRC_URI[archive.sha256sum] = "7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408" + +XORG_PN = "libXtst" diff --git a/recipes/xorg-lib/libxv_1.0.6.bb b/recipes/xorg-lib/libxv_1.0.6.bb new file mode 100644 index 0000000000..e8b94e2ff3 --- /dev/null +++ b/recipes/xorg-lib/libxv_1.0.6.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 Video extension library" +LICENSE = "GPL" +DEPENDS += "libxext videoproto" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "e292445a64b63e918bbc8b6aae6391dd" +SRC_URI[archive.sha256sum] = "e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee" + +XORG_PN = "libXv" diff --git a/recipes/xorg-lib/libxxf86dga_1.1.2.bb b/recipes/xorg-lib/libxxf86dga_1.1.2.bb new file mode 100644 index 0000000000..a86e76a091 --- /dev/null +++ b/recipes/xorg-lib/libxxf86dga_1.1.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 Direct Graphics Access extension library" +DEPENDS += "libxext xf86dgaproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "bbd5fdf63d4c107c8cb710d4df2012b4" +SRC_URI[archive.sha256sum] = "1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06" + +XORG_PN = "libXxf86dga" diff --git a/recipes/xorg-lib/libxxf86vm_1.1.1.bb b/recipes/xorg-lib/libxxf86vm_1.1.1.bb new file mode 100644 index 0000000000..1bcdfe5621 --- /dev/null +++ b/recipes/xorg-lib/libxxf86vm_1.1.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 XFree86 video mode extension library" +DEPENDS += "libxext xf86vidmodeproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "34dc3df888c164378da89a7deeb245a0" +SRC_URI[archive.sha256sum] = "21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e" + +XORG_PN = "libXxf86vm" diff --git a/recipes/xorg-proto/bigreqsproto_1.1.1.bb b/recipes/xorg-proto/bigreqsproto_1.1.1.bb new file mode 100644 index 0000000000..4bba2e6a83 --- /dev/null +++ b/recipes/xorg-proto/bigreqsproto_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6f6c24436c2b3ab235eb14a85b9aaacf" +SRC_URI[archive.sha256sum] = "1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/compositeproto_0.4.2.bb b/recipes/xorg-proto/compositeproto_0.4.2.bb new file mode 100644 index 0000000000..7656d1c4ac --- /dev/null +++ b/recipes/xorg-proto/compositeproto_0.4.2.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" +SRC_URI[archive.sha256sum] = "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc" + +CONFLICTS = "compositeext" diff --git a/recipes/xorg-proto/damageproto_1.2.1.bb b/recipes/xorg-proto/damageproto_1.2.1.bb new file mode 100644 index 0000000000..f26eaa2ff9 --- /dev/null +++ b/recipes/xorg-proto/damageproto_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "998e5904764b82642cc63d97b4ba9e95" +SRC_URI[archive.sha256sum] = "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b" + +CONFLICTS = "damageext" diff --git a/recipes/xorg-proto/fixesproto_4.1.2.bb b/recipes/xorg-proto/fixesproto_4.1.2.bb new file mode 100644 index 0000000000..36ad7e40db --- /dev/null +++ b/recipes/xorg-proto/fixesproto_4.1.2.bb @@ -0,0 +1,10 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "bdb58ecc313b509247036d5c11fa99df" +SRC_URI[archive.sha256sum] = "de4cbfccb533c190073445eb2a891d997e89f6fb58204f68ae82871de044f857" + +BBCLASSEXTEND = "native" + +CONFLICTS = "fixesext" diff --git a/recipes/xorg-proto/fontsproto_2.1.1.bb b/recipes/xorg-proto/fontsproto_2.1.1.bb new file mode 100644 index 0000000000..5c169c9b51 --- /dev/null +++ b/recipes/xorg-proto/fontsproto_2.1.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "37102ffcaa73f77d700acd6f7a25d8f0" +SRC_URI[archive.sha256sum] = "9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-proto/randrproto_1.3.2.bb b/recipes/xorg-proto/randrproto_1.3.2.bb new file mode 100644 index 0000000000..fbba3bcbd5 --- /dev/null +++ b/recipes/xorg-proto/randrproto_1.3.2.bb @@ -0,0 +1,10 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "597491c0d8055e2a66f11350c4985775" +SRC_URI[archive.sha256sum] = "d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71" + +BBCLASSEXTEND = "nativesdk sdk" + +CONFLICTS = "randrext" diff --git a/recipes/xorg-proto/recordproto_1.14.1.bb b/recipes/xorg-proto/recordproto_1.14.1.bb new file mode 100644 index 0000000000..f00f90d709 --- /dev/null +++ b/recipes/xorg-proto/recordproto_1.14.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "24541a30b399213def35f48efd926c63" +SRC_URI[archive.sha256sum] = "b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d" + +CONFLICTS = "recordext" diff --git a/recipes/xorg-proto/scrnsaverproto_1.2.1.bb b/recipes/xorg-proto/scrnsaverproto_1.2.1.bb new file mode 100644 index 0000000000..cb69ad1f23 --- /dev/null +++ b/recipes/xorg-proto/scrnsaverproto_1.2.1.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6af0f2e3369f5f74e69345e214f5fd0d" +SRC_URI[archive.sha256sum] = "fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1" diff --git a/recipes/xorg-proto/xcmiscproto_1.2.1.bb b/recipes/xorg-proto/xcmiscproto_1.2.1.bb new file mode 100644 index 0000000000..4dc9f3cef0 --- /dev/null +++ b/recipes/xorg-proto/xcmiscproto_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "cd7372cd827bfd7ca7e9238f2ce274b1" +SRC_URI[archive.sha256sum] = "730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-util/makedepend_1.0.3.bb b/recipes/xorg-util/makedepend_1.0.3.bb new file mode 100644 index 0000000000..e709999aa3 --- /dev/null +++ b/recipes/xorg-util/makedepend_1.0.3.bb @@ -0,0 +1,4 @@ +require makedepend.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "ec37ca8b810a40cdfb16a736b3360f6c" +SRC_URI[archive.sha256sum] = "2d3466acc29b382a4368b30371f17a4083933281b97f8ef67fc8b785a60d52dc" diff --git a/recipes/xorg-util/util-macros_1.10.1.bb b/recipes/xorg-util/util-macros_1.10.1.bb deleted file mode 100644 index f5304bd2de..0000000000 --- a/recipes/xorg-util/util-macros_1.10.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require util-macros.inc -PR = "${INC_PR}.0" -SRC_URI[archive.md5sum] = "775895851365e0fc194394c5d1ea6df8" -SRC_URI[archive.sha256sum] = "ed552efc8c76334d404fd60bfc185eff4b020326ea2ae2212f25978927836ec9" diff --git a/recipes/xorg-util/util-macros_1.11.0.bb b/recipes/xorg-util/util-macros_1.11.0.bb new file mode 100644 index 0000000000..8392794460 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.11.0.bb @@ -0,0 +1,4 @@ +require util-macros.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "8580021f3a9e242ab09d23d62e475d53" +SRC_URI[archive.sha256sum] = "212c3d14474d7cffdbc22437d4896211a5dce6b99b02b96229c9be7d963c90cf" -- cgit 1.2.3-korg