* [PATCH 0/1] libx11-trim: update to 1.4.4
@ 2011-11-21 8:29 Xiaofeng Yan
2011-11-21 8:29 ` [PATCH 1/1] blibx11-trim: " Xiaofeng Yan
2011-11-29 16:00 ` [PATCH 0/1] " Saul Wold
0 siblings, 2 replies; 7+ messages in thread
From: Xiaofeng Yan @ 2011-11-21 8:29 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Thanks for martin's comment.
I have modified libx11-trim_1.4.4.bb and don't remove libx11-trim_1.3.4.bb because someone could want to use previous version for some reason. If it is not necessary later, then I will remove the old version.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/update_libx11-trim
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update_libx11-trim
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
blibx11-trim: update to 1.4.4
.../libx11-trim-1.4.4/keysymdef_include.patch | 23 ++++++++++
.../libx11-trim-1.4.4/makekeys_crosscompile.patch | 45 ++++++++++++++++++++
.../libx11-trim-1.4.4/x11_disable_makekeys.patch | 29 +++++++++++++
.../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 20 +++++++++
4 files changed, 117 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/1] blibx11-trim: update to 1.4.4 2011-11-21 8:29 [PATCH 0/1] libx11-trim: update to 1.4.4 Xiaofeng Yan @ 2011-11-21 8:29 ` Xiaofeng Yan 2011-11-23 22:15 ` [PATCH 1/1] libx11-trim: " Khem Raj 2011-11-29 16:00 ` [PATCH 0/1] " Saul Wold 1 sibling, 1 reply; 7+ messages in thread From: Xiaofeng Yan @ 2011-11-21 8:29 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> Some description : 1 Remove --with-xcb because xcb is necessary item in the new version. 2 keysymdef_include.patch uses in keeping native directory of X11 as the default configuration. \ or else host directory "/usr/include/X11" is selected when running ./configure. 3 makekeys_crosscompile.patch avoid host contamination. 4 x11_disable_makekeys.patch uses in compiling makekey.c needed by makekeys-makekeys.o Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- .../libx11-trim-1.4.4/keysymdef_include.patch | 23 ++++++++++ .../libx11-trim-1.4.4/makekeys_crosscompile.patch | 45 ++++++++++++++++++++ .../libx11-trim-1.4.4/x11_disable_makekeys.patch | 29 +++++++++++++ .../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 20 +++++++++ 4 files changed, 117 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +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/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch new file mode 100644 index 0000000..e5eacf0 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch @@ -0,0 +1,45 @@ +Because the size of "unsigned long" is different between 32-bit +and 64-bit, judge whether target is 32-bit or 64-bit and tell +"makekey". + +Upstream-Status: Pending + +Signed-off-by: dbuitenh@windriver.com + +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 +@@ -33,6 +33,7 @@ + #include <X11/keysymdef.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + + typedef unsigned long Signature; + +@@ -124,7 +125,12 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif ++ + first = j = sig % z; + for (k = 0; tab[j]; k++) { + j += first + 1; +@@ -163,7 +169,11 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif + first = j = sig % z; + while (offsets[j]) { + j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 0000000..9763313 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/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/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb new file mode 100644 index 0000000..7aed308 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb @@ -0,0 +1,20 @@ +require libx11.inc + +DESCRIPTION += " Support for XCMS is disabled in this version." + +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +PR = "r0" + +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" + +SRC_URI += "file://x11_disable_makekeys.patch \ + file://keysymdef_include.patch \ + file://makekeys_crosscompile.patch" + + +SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" +SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms " -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] libx11-trim: update to 1.4.4 2011-11-21 8:29 ` [PATCH 1/1] blibx11-trim: " Xiaofeng Yan @ 2011-11-23 22:15 ` Khem Raj 2011-11-23 23:16 ` Richard Purdie 0 siblings, 1 reply; 7+ messages in thread From: Khem Raj @ 2011-11-23 22:15 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Mon, Nov 21, 2011 at 12:32 AM, Xiaofeng Yan <xiaofeng.yan@windriver.com> wrote: > +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch > @@ -0,0 +1,45 @@ > +Because the size of "unsigned long" is different between 32-bit > +and 64-bit, judge whether target is 32-bit or 64-bit and tell > +"makekey". > + > +Upstream-Status: Pending > + > +Signed-off-by: dbuitenh@windriver.com > + > +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 > ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 > +@@ -33,6 +33,7 @@ > + #include <X11/keysymdef.h> > + #include <stdio.h> > + #include <stdlib.h> > ++#include <stdint.h> > + > + typedef unsigned long Signature; > + > +@@ -124,7 +125,12 @@ > + name = info[i].name; > + sig = 0; > + while ((c = *name++)) > +- sig = (sig << 1) + c; > ++#ifdef USE32 > ++ sig = (uint32_t)(sig << 1) + c; > ++#else > ++ sig = (uint64_t)(sig << 1) + c; > ++#endif > ++ > + first = j = sig % z; > + for (k = 0; tab[j]; k++) { > + j += first + 1; > +@@ -163,7 +169,11 @@ > + name = info[i].name; > + sig = 0; > + while ((c = *name++)) > +- sig = (sig << 1) + c; > ++#ifdef USE32 > ++ sig = (uint32_t)(sig << 1) + c; > ++#else > ++ sig = (uint64_t)(sig << 1) + c; > ++#endif > + first = j = sig % z; > + while (offsets[j]) { > + j += first + 1; why use USE32 define ? why not use compiler builtin define __LP64__ ? is it something a programs that needs to know the bitness of target or something ? ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] libx11-trim: update to 1.4.4 2011-11-23 22:15 ` [PATCH 1/1] libx11-trim: " Khem Raj @ 2011-11-23 23:16 ` Richard Purdie 0 siblings, 0 replies; 7+ messages in thread From: Richard Purdie @ 2011-11-23 23:16 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Wed, 2011-11-23 at 14:15 -0800, Khem Raj wrote: > On Mon, Nov 21, 2011 at 12:32 AM, Xiaofeng Yan > <xiaofeng.yan@windriver.com> wrote: > > +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch > > @@ -0,0 +1,45 @@ > > +Because the size of "unsigned long" is different between 32-bit > > +and 64-bit, judge whether target is 32-bit or 64-bit and tell > > +"makekey". > > + > > +Upstream-Status: Pending > > + > > +Signed-off-by: dbuitenh@windriver.com > > + > > +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 > > ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 > > +@@ -33,6 +33,7 @@ > > + #include <X11/keysymdef.h> > > + #include <stdio.h> > > + #include <stdlib.h> > > ++#include <stdint.h> > > + > > + typedef unsigned long Signature; > > + > > +@@ -124,7 +125,12 @@ > > + name = info[i].name; > > + sig = 0; > > + while ((c = *name++)) > > +- sig = (sig << 1) + c; > > ++#ifdef USE32 > > ++ sig = (uint32_t)(sig << 1) + c; > > ++#else > > ++ sig = (uint64_t)(sig << 1) + c; > > ++#endif > > ++ > > + first = j = sig % z; > > + for (k = 0; tab[j]; k++) { > > + j += first + 1; > > +@@ -163,7 +169,11 @@ > > + name = info[i].name; > > + sig = 0; > > + while ((c = *name++)) > > +- sig = (sig << 1) + c; > > ++#ifdef USE32 > > ++ sig = (uint32_t)(sig << 1) + c; > > ++#else > > ++ sig = (uint64_t)(sig << 1) + c; > > ++#endif > > + first = j = sig % z; > > + while (offsets[j]) { > > + j += first + 1; > > why use USE32 define ? why not use compiler builtin define __LP64__ ? > is it something a programs that needs to know the bitness of target or > something ? This gets run on the build system but needs to generate data for the target... Cheers, Richard ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/1] libx11-trim: update to 1.4.4 2011-11-21 8:29 [PATCH 0/1] libx11-trim: update to 1.4.4 Xiaofeng Yan 2011-11-21 8:29 ` [PATCH 1/1] blibx11-trim: " Xiaofeng Yan @ 2011-11-29 16:00 ` Saul Wold 1 sibling, 0 replies; 7+ messages in thread From: Saul Wold @ 2011-11-29 16:00 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 11/21/2011 12:29 AM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > Thanks for martin's comment. > I have modified libx11-trim_1.4.4.bb and don't remove libx11-trim_1.3.4.bb because someone could want to use previous version for some reason. If it is not necessary later, then I will remove the old version. > > Pull URL: git://git.pokylinux.org/poky-contrib.git > Branch: xiaofeng/update_libx11-trim > Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update_libx11-trim > > Thanks, > Xiaofeng Yan<xiaofeng.yan@windriver.com> > --- > > > Xiaofeng Yan (1): > blibx11-trim: update to 1.4.4 > > .../libx11-trim-1.4.4/keysymdef_include.patch | 23 ++++++++++ > .../libx11-trim-1.4.4/makekeys_crosscompile.patch | 45 ++++++++++++++++++++ > .../libx11-trim-1.4.4/x11_disable_makekeys.patch | 29 +++++++++++++ > .../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 20 +++++++++ > 4 files changed, 117 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 0/1] libx11-trim: update to 1.4.4
@ 2011-11-17 11:00 Xiaofeng Yan
2011-11-17 11:00 ` [PATCH 1/1] " Xiaofeng Yan
0 siblings, 1 reply; 7+ messages in thread
From: Xiaofeng Yan @ 2011-11-17 11:00 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
I remove patch "nodolt.patch" because it is no use in the new version \
and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/update_libx11-trim
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update_libx11-trim
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
libx11-trim: update to 1.4.4
.../xorg-lib/libx11-trim-1.3.4/include_fix.patch | 21 ---------
.../libx11-trim-1.3.4/makekeys_crosscompile.patch | 45 --------------------
.../xorg-lib/libx11-trim-1.3.4/nodolt.patch | 12 -----
.../libx11-trim-1.3.4/x11_disable_makekeys.patch | 33 --------------
.../{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} | 7 +--
5 files changed, 3 insertions(+), 115 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} (78%)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/1] libx11-trim: update to 1.4.4 2011-11-17 11:00 Xiaofeng Yan @ 2011-11-17 11:00 ` Xiaofeng Yan 2011-11-17 11:24 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Xiaofeng Yan @ 2011-11-17 11:00 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> I remove patch "nodolt.patch" because it is no use in the new version \ and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- .../xorg-lib/libx11-trim-1.3.4/include_fix.patch | 21 --------- .../libx11-trim-1.3.4/makekeys_crosscompile.patch | 45 -------------------- .../xorg-lib/libx11-trim-1.3.4/nodolt.patch | 12 ----- .../libx11-trim-1.3.4/x11_disable_makekeys.patch | 33 -------------- .../{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} | 7 +-- 5 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch rename meta/recipes-graphics/xorg-lib/{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} (78%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch deleted file mode 100644 index eeb4175..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libX11-1.3.4.orig/configure.ac -+++ libX11-1.3.4/configure.ac -@@ -353,9 +353,9 @@ - # - # Find keysymdef.h - # --AC_MSG_CHECKING([keysymdef.h]) --dir=`$PKG_CONFIG --variable=includedir xproto` --KEYSYMDEF="$dir/X11/keysymdef.h" -+AC_ARG_WITH(keysymdef, -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), -+ KEYSYMDEF=$withval, KEYSYMDEF="") - if test -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) - else diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch deleted file mode 100644 index e5eacf0..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch +++ /dev/null @@ -1,45 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include <X11/keysymdef.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch deleted file mode 100644 index bf6c7d5..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- libX11-1.3.4.orig/configure.ac -+++ libX11-1.3.4/configure.ac -@@ -32,7 +32,6 @@ - - # Checks for programs. - AC_PROG_LIBTOOL --DOLT - AC_PROG_CC - PKG_PROG_PKG_CONFIG - diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch deleted file mode 100644 index 561b577..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - src/util/Makefile.am | 21 ----------------- - 1 file changed, 21 deletions(-) - ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1,3 @@ - --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/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb similarity index 78% rename from meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb rename to meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb index 3a8f2c4..81fb63b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb @@ -3,15 +3,14 @@ require libx11.inc DESCRIPTION += " Support for XCB, and XCMS is disabled in this version." LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "r2" +PR = "r0" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" SRC_URI += "file://x11_disable_makekeys.patch \ - file://include_fix.patch \ - file://nodolt.patch \ + file://keysymdef_include.patch \ file://makekeys_crosscompile.patch" SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] libx11-trim: update to 1.4.4 2011-11-17 11:00 ` [PATCH 1/1] " Xiaofeng Yan @ 2011-11-17 11:24 ` Martin Jansa 0 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2011-11-17 11:24 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 8563 bytes --] On Thu, Nov 17, 2011 at 07:00:08PM +0800, Xiaofeng Yan wrote: > From: Xiaofeng Yan <xiaofeng.yan@windriver.com> > > I remove patch "nodolt.patch" because it is no use in the new version \ > and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. Did you forget to add FILESDIR like libx11-diet does or even FILESEXTRAPATHS, or how should it find those files in libx11-1.4.4? and BTW why is there libx11-diet-1.4.4/keysymdef_include.patch libx11-diet-1.4.4/x11_disable_makekeys.patch when your commit dbb86f8445512f95d9dc3cbbdf935901fe2e04b9 says: I remove patch "nodolt.patch" because it is no use in the new version \ and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. ? And I would prefer to keep them in libx11-diet-1.4.4/libx11-trim-1.4.4 even when they are the same as libx11-1.4.4 to be able to upgrade libx11 easier then last time. And last pun to this whole -diet -trim mess: libx11-diet: DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in this version." EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" libx11-trim: DESCRIPTION += " Support for XCB, and XCMS is disabled in this version." EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb" And --without-xcb/--with-xcb doesn't work since 1.4.0: http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 http://git.openembedded.org/openembedded/commit/recipes/xorg-lib/libx11_1.4.0.bb?id=d28cdb2d2e6c910afbaa14b17bd2c0003052df7d So it would be better to consolidate -diet -trim versions and don't tell lies in DESCRIPTION.. Cheers, > > Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> > --- > .../xorg-lib/libx11-trim-1.3.4/include_fix.patch | 21 --------- > .../libx11-trim-1.3.4/makekeys_crosscompile.patch | 45 -------------------- > .../xorg-lib/libx11-trim-1.3.4/nodolt.patch | 12 ----- > .../libx11-trim-1.3.4/x11_disable_makekeys.patch | 33 -------------- > .../{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} | 7 +-- > 5 files changed, 3 insertions(+), 115 deletions(-) > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch > rename meta/recipes-graphics/xorg-lib/{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} (78%) > > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch > deleted file mode 100644 > index eeb4175..0000000 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch > +++ /dev/null > @@ -1,21 +0,0 @@ > -Upstream-Status: Inappropriate [configuration] > - > ---- > - configure.ac | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > ---- libX11-1.3.4.orig/configure.ac > -+++ libX11-1.3.4/configure.ac > -@@ -353,9 +353,9 @@ > - # > - # Find keysymdef.h > - # > --AC_MSG_CHECKING([keysymdef.h]) > --dir=`$PKG_CONFIG --variable=includedir xproto` > --KEYSYMDEF="$dir/X11/keysymdef.h" > -+AC_ARG_WITH(keysymdef, > -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), > -+ KEYSYMDEF=$withval, KEYSYMDEF="") > - if test -f "$KEYSYMDEF"; then > - AC_MSG_RESULT([$KEYSYMDEF]) > - else > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch > deleted file mode 100644 > index e5eacf0..0000000 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -Because the size of "unsigned long" is different between 32-bit > -and 64-bit, judge whether target is 32-bit or 64-bit and tell > -"makekey". > - > -Upstream-Status: Pending > - > -Signed-off-by: dbuitenh@windriver.com > - > ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 > -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 > -@@ -33,6 +33,7 @@ > - #include <X11/keysymdef.h> > - #include <stdio.h> > - #include <stdlib.h> > -+#include <stdint.h> > - > - typedef unsigned long Signature; > - > -@@ -124,7 +125,12 @@ > - name = info[i].name; > - sig = 0; > - while ((c = *name++)) > -- sig = (sig << 1) + c; > -+#ifdef USE32 > -+ sig = (uint32_t)(sig << 1) + c; > -+#else > -+ sig = (uint64_t)(sig << 1) + c; > -+#endif > -+ > - first = j = sig % z; > - for (k = 0; tab[j]; k++) { > - j += first + 1; > -@@ -163,7 +169,11 @@ > - name = info[i].name; > - sig = 0; > - while ((c = *name++)) > -- sig = (sig << 1) + c; > -+#ifdef USE32 > -+ sig = (uint32_t)(sig << 1) + c; > -+#else > -+ sig = (uint64_t)(sig << 1) + c; > -+#endif > - first = j = sig % z; > - while (offsets[j]) { > - j += first + 1; > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch > deleted file mode 100644 > index bf6c7d5..0000000 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -Upstream-Status: Inappropriate [configuration] > - > ---- libX11-1.3.4.orig/configure.ac > -+++ libX11-1.3.4/configure.ac > -@@ -32,7 +32,6 @@ > - > - # Checks for programs. > - AC_PROG_LIBTOOL > --DOLT > - AC_PROG_CC > - PKG_PROG_PKG_CONFIG > - > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch > deleted file mode 100644 > index 561b577..0000000 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Upstream-Status: Inappropriate [configuration] > - > ---- > - src/util/Makefile.am | 21 ----------------- > - 1 file changed, 21 deletions(-) > - > ---- libX11-1.3.4.orig/src/util/Makefile.am > -+++ libX11-1.3.4/src/util/Makefile.am > -@@ -1,24 +1,3 @@ > - > --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/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > similarity index 78% > rename from meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb > rename to meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > index 3a8f2c4..81fb63b 100644 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb > +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > @@ -3,15 +3,14 @@ require libx11.inc > DESCRIPTION += " Support for XCB, and XCMS is disabled in this version." > > LICENSE = "MIT & MIT-style & BSD" > -LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" > +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" > > -PR = "r2" > +PR = "r0" > > DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" > > SRC_URI += "file://x11_disable_makekeys.patch \ > - file://include_fix.patch \ > - file://nodolt.patch \ > + file://keysymdef_include.patch \ > file://makekeys_crosscompile.patch" > > SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" > -- > 1.7.0.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-11-29 16:06 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-21 8:29 [PATCH 0/1] libx11-trim: update to 1.4.4 Xiaofeng Yan 2011-11-21 8:29 ` [PATCH 1/1] blibx11-trim: " Xiaofeng Yan 2011-11-23 22:15 ` [PATCH 1/1] libx11-trim: " Khem Raj 2011-11-23 23:16 ` Richard Purdie 2011-11-29 16:00 ` [PATCH 0/1] " Saul Wold -- strict thread matches above, loose matches on Subject: below -- 2011-11-17 11:00 Xiaofeng Yan 2011-11-17 11:00 ` [PATCH 1/1] " Xiaofeng Yan 2011-11-17 11:24 ` Martin Jansa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox