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 --- .../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 ++++++++ 16 files changed, 187 insertions(+), 56 deletions(-) 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 (limited to 'recipes/xorg-lib') 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" -- cgit 1.2.3-korg