Import some patches from WindRiver Linux

PATCH In review Kang Kai 4 participants 11 messages Oct 13, 2011 – Oct 14, 2011

lore

Share & tools

lore

Kang Kai

author

2011-10-13 09:10 UTC #0 lore raw

cover Import some patches from WindRiver Linux

Hi All,

I import some patches from WindRiver Linux. The first and second are try to use target commands instead of the commands on the build machine. And the last two will add the xinput-calibrator to add touchscreen support.

Regards,

The following changes since commit b92b776d56e64a437181de9bc76f8dcc8e15a5f8:

meta-yocto: Catch up with xserver and mesa upgrades/rename (2011-10-12 23:05:12 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro

Kang Kai (4):
mesa-dri/xlib: use target commands in mklib file
gdk-pixbuf: pick up ${NM} to fix libtool naming issue
xinput: add xinput from oe
xinput-calibrator: add touchscreen support

 .../gdk-pixbuf-2.24.0/configure-nm.patch           |   32 ++++++
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 +
 .../mesa-use-target-commands-in-mklib.patch        |  104 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb        |    3 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb       |    3 +-
 .../pointercal-xinput/bug20/pointercal.xinput      |    1 +
 .../pointercal-xinput/iphone3g/pointercal.xinput   |    1 +
 .../pointercal-xinput/nokia900/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta01/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta02/pointercal.xinput   |    2 +
 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   21 ++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   24 +++++
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb     |   10 ++
 14 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb

Signature · 1 line

1.7.5.1.300.gc565c

Kang Kai

author

2011-10-13 09:11 UTC #1 lore raw

PATCH 1/4 mesa-dri/xlib: use target commands in mklib file

the bin/mklib file in mesa-dri/xlib source code uses commands on hosts, this may cause build failed on some platform.

Patches are from WindRiver Linux, and CQID are:

    WIND00266791
    WIND00266497

Signed-off-by Kang Kai <[email protected]>

---
 .../mesa-use-target-commands-in-mklib.patch        |  104 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb        |    3 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb       |    3 +-
 3 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch

meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch new file +104 -0

new file mode 100644
index 0000000..1bc2a57
@@ -0,0 +1,104 @@
+This patch is merged from WindRiver linux commits, and it is to avoid build failed on some platform because of using the commands on host.
+
+And original commits are:
+
+commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
+Author: Yulong Pei <[email protected]>
+Date:   Tue Apr 12 22:14:10 2011 +0800
+
+    fix mesa-dri build fails on x86-64
+    
+    CQID: WIND00266791
+    
+    1. mesa-dri uses it's own script (mklib) to generate libraries, and it
+    calls the host's ar/ranlib/gcc/g++. This fixes mklib so that it calls the
+    cross-compiling tools properly.
+    
+    2. override PYTHON2 with 'python', 'python2' is not available in host-tools python.
+    Only 'python' and 'python2.6' are provided. So force configure to use 'python'.
+    
+    And the above two changes are ported from mesa-xlib.
+    
+    Signed-off-by: Randy MacLeod <[email protected]>
+
+commit 5c4212084b871a0c0fb7d174280ec9a634637deb
+Author: Bowen <[email protected]>
+Date:   Mon Apr 11 16:25:02 2011 +0800
+
+    Fix freeglut build failed for mips64_octeon-glibc_std_xapps
+    
+    CQID: 266497
+    
+    freeglut build failed on some hosts, because of mesa-xlib uses host ar command,
+    in some hosts, host ar command can't recognize target library, which will make some
+    symbols in libGL undefined.
+    
+    The fix is modifing mklib script in mesa-xlib, change fixed "ar" command to variable
+    $AR that set by our LDAT.
+
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- Mesa-7.10.2/bin/mklib.orig	2011-09-28 16:15:34.170000074 +0800
++++ Mesa-7.10.2/bin/mklib	2011-09-28 16:15:42.370000073 +0800
+@@ -49,8 +49,8 @@
+                     /*) ;;
+                     *)  FILE="$ORIG_DIR/$FILE" ;;
+                 esac
+-                MEMBERS=`ar t $FILE`
+-                ar x $FILE
++                MEMBERS=`${AR} t $FILE`
++                ${AR} x $FILE
+                 for MEMBER in $MEMBERS ; do
+                     NEWFILES="$NEWFILES $DIR/$MEMBER"
+                 done
+@@ -77,7 +77,7 @@
+ make_ar_static_lib() {
+     OPTS=$1
+     shift;
+-    RANLIB=$1
++    USE_RANLIB=$1
+     shift;
+     LIBNAME=$1
+     shift;
+@@ -87,11 +87,11 @@
+     rm -f ${LIBNAME}
+ 
+     # make static lib
+-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
++    ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
+ 
+     # run ranlib
+-    if [ ${RANLIB} = 1 ] ; then
+-        ranlib ${LIBNAME}
++    if [ ${USE_RANLIB} = 1 ] ; then
++        ${RANLIB} ${LIBNAME}
+     fi
+ 
+     echo ${LIBNAME}
+@@ -313,9 +313,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+ 
+@@ -531,9 +531,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +2 -1

index 6fc8d95..0f026b1 100644
@@ -9,11 +9,12 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
 DEPENDS += "mesa-dri-glsl-native"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch \
            file://uclibc.patch \
+           file://mesa-use-target-commands-in-mklib.patch \
           "
 
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +2 -1

index ea4acc6..3301068 100644
@@ -4,6 +4,7 @@ FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://uclibc.patch \
+           file://mesa-use-target-commands-in-mklib.patch \
            "
 
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

@@ -17,7 +18,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

Signature · 1 line

1.7.5.1.300.gc565c

Martin Jansa

2011-10-13 09:19 UTC #2 lore raw

Re: [PATCH 1/4] mesa-dri/xlib: use target commands in mklib file

Quoted 6 lines · Kang Kai

the bin/mklib file in mesa-dri/xlib source code uses commands on hosts, this may cause build failed on some platform.
Patches are from WindRiver Linux, and CQID are:
    WIND00266791
    WIND00266497

Please check my mesa patchset in openembedded-core-contrib/jansa/x11-v4
and please test it if it still applies to mesa-git too

And mesa-use-target-commands-in-mklib.patch doesn't have Upstream-Status

Regards,

Quoted 166 lines

Signed-off-by Kang Kai <[email protected]>

---
 .../mesa-use-target-commands-in-mklib.patch        |  104 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb        |    3 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb       |    3 +-
 3 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch

meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch new file +104 -0

new file mode 100644
index 0000000..1bc2a57
@@ -0,0 +1,104 @@
+This patch is merged from WindRiver linux commits, and it is to avoid build failed on some platform because of using the commands on host.
+
+And original commits are:
+
+commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
+Author: Yulong Pei <[email protected]>
+Date:   Tue Apr 12 22:14:10 2011 +0800
+
+    fix mesa-dri build fails on x86-64
+    
+    CQID: WIND00266791
+    
+    1. mesa-dri uses it's own script (mklib) to generate libraries, and it
+    calls the host's ar/ranlib/gcc/g++. This fixes mklib so that it calls the
+    cross-compiling tools properly.
+    
+    2. override PYTHON2 with 'python', 'python2' is not available in host-tools python.
+    Only 'python' and 'python2.6' are provided. So force configure to use 'python'.
+    
+    And the above two changes are ported from mesa-xlib.
+    
+    Signed-off-by: Randy MacLeod <[email protected]>
+
+commit 5c4212084b871a0c0fb7d174280ec9a634637deb
+Author: Bowen <[email protected]>
+Date:   Mon Apr 11 16:25:02 2011 +0800
+
+    Fix freeglut build failed for mips64_octeon-glibc_std_xapps
+    
+    CQID: 266497
+    
+    freeglut build failed on some hosts, because of mesa-xlib uses host ar command,
+    in some hosts, host ar command can't recognize target library, which will make some
+    symbols in libGL undefined.
+    
+    The fix is modifing mklib script in mesa-xlib, change fixed "ar" command to variable
+    $AR that set by our LDAT.
+
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- Mesa-7.10.2/bin/mklib.orig	2011-09-28 16:15:34.170000074 +0800
++++ Mesa-7.10.2/bin/mklib	2011-09-28 16:15:42.370000073 +0800
+@@ -49,8 +49,8 @@
+                     /*) ;;
+                     *)  FILE="$ORIG_DIR/$FILE" ;;
+                 esac
+-                MEMBERS=`ar t $FILE`
+-                ar x $FILE
++                MEMBERS=`${AR} t $FILE`
++                ${AR} x $FILE
+                 for MEMBER in $MEMBERS ; do
+                     NEWFILES="$NEWFILES $DIR/$MEMBER"
+                 done
+@@ -77,7 +77,7 @@
+ make_ar_static_lib() {
+     OPTS=$1
+     shift;
+-    RANLIB=$1
++    USE_RANLIB=$1
+     shift;
+     LIBNAME=$1
+     shift;
+@@ -87,11 +87,11 @@
+     rm -f ${LIBNAME}
+ 
+     # make static lib
+-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
++    ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
+ 
+     # run ranlib
+-    if [ ${RANLIB} = 1 ] ; then
+-        ranlib ${LIBNAME}
++    if [ ${USE_RANLIB} = 1 ] ; then
++        ${RANLIB} ${LIBNAME}
+     fi
+ 
+     echo ${LIBNAME}
+@@ -313,9 +313,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+ 
+@@ -531,9 +531,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +2 -1

index 6fc8d95..0f026b1 100644
@@ -9,11 +9,12 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
 DEPENDS += "mesa-dri-glsl-native"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch \
            file://uclibc.patch \
+           file://mesa-use-target-commands-in-mklib.patch \
           "
 
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +2 -1

index ea4acc6..3301068 100644
@@ -4,6 +4,7 @@ FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://uclibc.patch \
+           file://mesa-use-target-commands-in-mklib.patch \
            "
 
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

@@ -17,7 +18,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

Signature · 7 lines

1.7.5.1.300.gc565c


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Khem Raj

2011-10-13 23:57 UTC #3 lore raw

Re: [PATCH 1/4] mesa-dri/xlib: use target commands in mklib file

In reply to Kang Kai

Quoted 3 lines · Kang Kai

the bin/mklib file in mesa-dri/xlib source code uses commands on hosts, this may cause build failed on some platform.

you might want to say 'cross-tools' instead of 'target commands'

Quoted 3 lines

Patches are from WindRiver Linux, and CQID are:
WIND00266791
WIND00266497

I dont think we need this in oe-core

Quoted 167 lines

Signed-off-by Kang Kai <[email protected]>

---
.../mesa-use-target-commands-in-mklib.patch | 104 ++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 3 +- meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 3 +-

 3 files changed, 108 insertions(+), 2 deletions(-)

create mode 100644 meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch

meta/recipes-graphics/mesa/mesa-dri/mesa-use-target-commands-in-mklib.patch new file +104 -0

new file mode 100644
index 0000000..1bc2a57
@@ -0,0 +1,104 @@
+This patch is merged from WindRiver linux commits, and it is to avoid build failed on some platform because of using the commands on host.
+
+And original commits are:
+
+commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
+Author: Yulong Pei <[email protected]>
+Date:   Tue Apr 12 22:14:10 2011 +0800
+
+    fix mesa-dri build fails on x86-64
+
+    CQID: WIND00266791
+
+    1. mesa-dri uses it's own script (mklib) to generate libraries, and it
+    calls the host's ar/ranlib/gcc/g++. This fixes mklib so that it calls the
+    cross-compiling tools properly.
+
+    2. override PYTHON2 with 'python', 'python2' is not available in host-tools python.
+    Only 'python' and 'python2.6' are provided. So force configure to use 'python'.
+
+    And the above two changes are ported from mesa-xlib.
+
+    Signed-off-by: Randy MacLeod <[email protected]>
+
+commit 5c4212084b871a0c0fb7d174280ec9a634637deb
+Author: Bowen <[email protected]>
+Date:   Mon Apr 11 16:25:02 2011 +0800
+
+    Fix freeglut build failed for mips64_octeon-glibc_std_xapps
+
+    CQID: 266497
+
+    freeglut build failed on some hosts, because of mesa-xlib uses host ar command,
+    in some hosts, host ar command can't recognize target library, which will make some
+    symbols in libGL undefined.
+
+    The fix is modifing mklib script in mesa-xlib, change fixed "ar" command to variable
+    $AR that set by our LDAT.
+
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- Mesa-7.10.2/bin/mklib.orig 2011-09-28 16:15:34.170000074 +0800
++++ Mesa-7.10.2/bin/mklib      2011-09-28 16:15:42.370000073 +0800
+@@ -49,8 +49,8 @@
+                     /*) ;;
+                     *)  FILE="$ORIG_DIR/$FILE" ;;
+                 esac
+-                MEMBERS=`ar t $FILE`
+-                ar x $FILE
++                MEMBERS=`${AR} t $FILE`
++                ${AR} x $FILE
+                 for MEMBER in $MEMBERS ; do
+                     NEWFILES="$NEWFILES $DIR/$MEMBER"
+                 done
+@@ -77,7 +77,7 @@
+ make_ar_static_lib() {
+     OPTS=$1
+     shift;
+-    RANLIB=$1
++    USE_RANLIB=$1
+     shift;
+     LIBNAME=$1
+     shift;
+@@ -87,11 +87,11 @@
+     rm -f ${LIBNAME}
+
+     # make static lib
+-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
++    ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
+
+     # run ranlib
+-    if [ ${RANLIB} = 1 ] ; then
+-        ranlib ${LIBNAME}
++    if [ ${USE_RANLIB} = 1 ] ; then
++        ${RANLIB} ${LIBNAME}
+     fi
+
+     echo ${LIBNAME}
+@@ -313,9 +313,9 @@
+       if [ "x$LINK" = "x" ] ; then
+           # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+       fi
+
+@@ -531,9 +531,9 @@
+       if [ "x$LINK" = "x" ] ; then
+           # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+       fi
+

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -0

index 6fc8d95..0f026b1 100644
@@ -9,11 +9,12 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat

DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" DEPENDS += "mesa-dri-glsl-native"

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +1 -1

-PR = "r5"
+PR = "r6"

SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
file://uclibc.patch \
+ file://mesa-use-target-commands-in-mklib.patch \
"

SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -0

index ea4acc6..3301068 100644
@@ -4,6 +4,7 @@ FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
 
  SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://uclibc.patch \
+           file://mesa-use-target-commands-in-mklib.patch \

SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -0

@@ -17,7 +18,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ

DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"

PE = "1"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -1

-PR = "r1"
+PR = "r2"

EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

--
1.7.5.1.300.gc565c

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Kang Kai

author

2011-10-13 09:11 UTC #4 lore raw

PATCH 2/4 gdk-pixbuf: pick up ${NM} to fix libtool naming issue

In reply to Kang Kai

When gdk-pixbuf configures, it should pick up ${NM} from the environment if it is defined, instead of just looking for "nm".

The patch is from WindRiver Linux.
CQID: WIND00260200

Signed-off-by Kang Kai <[email protected]>

---
 .../gdk-pixbuf-2.24.0/configure-nm.patch           |   32 ++++++++++++++++++++
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++
 2 files changed, 35 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch new file +32 -0

new file mode 100644
index 0000000..71defd0
@@ -0,0 +1,32 @@
+This patch is from WindRiver Linux, to fix libtool naming issue.
+The original commit info is:
+
+commit 684b9d2daab517856222cc078ac51c72ce3ca3a9
+Author: David Borman <[email protected]>
+Date:   Thu Mar 10 07:51:11 2011 -0600
+
+    Have gdk-pixbuf pick up ${NM}, fix libtool naming issue
+    
+    CQID: WIND00260200
+    
+    The configuration for gdk-pixbuf needs to pick up $NM
+    from the environment, this is the same patch that was
+    applied to gdk+.
+    
+    Signed-off-by: David Borman <[email protected]>
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,7 +149,7 @@
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_PATH_PROG(NM, [$NM nm], nm)
+ 
+ AC_MSG_CHECKING([for some Win32 platform])
+ AS_CASE(["$host"],

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb +3 -0

index 9fabbe2..2099b98 100644
@@ -10,9 +10,12 @@ SECTION = "libs"
 
 DEPENDS = "libpng glib-2.0 jpeg"
 
+PR = "r1"
+
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
            file://hardcoded_libtool.patch \
            file://configure_fix.patch \
+           file://configure-nm.patch;patch=1 \
            "
 
 SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"

Signature · 1 line

1.7.5.1.300.gc565c

Khem Raj

2011-10-14 00:06 UTC #5 lore raw

Re: [PATCH 2/4] gdk-pixbuf: pick up ${NM} to fix libtool naming issue

Quoted 39 lines · Kang Kai

When gdk-pixbuf configures, it should pick up ${NM} from the environment if it is defined, instead of just looking for "nm".
The patch is from WindRiver Linux.
CQID: WIND00260200
Signed-off-by Kang Kai <[email protected]>
---
.../gdk-pixbuf-2.24.0/configure-nm.patch | 32 ++++++++++++++++++++ meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb | 3 ++
 2 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch new file +19 -0
new file mode 100644
index 0000000..71defd0
@@ -0,0 +1,32 @@
+This patch is from WindRiver Linux, to fix libtool naming issue.
+The original commit info is:
+
+commit 684b9d2daab517856222cc078ac51c72ce3ca3a9
+Author: David Borman <[email protected]>
+Date:   Thu Mar 10 07:51:11 2011 -0600
+
+    Have gdk-pixbuf pick up ${NM}, fix libtool naming issue
+
+    CQID: WIND00260200
+
+    The configuration for gdk-pixbuf needs to pick up $NM
+    from the environment, this is the same patch that was
+    applied to gdk+.
+
+    Signed-off-by: David Borman <[email protected]>
+
+Upstream-Status: Pending
+

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch line 29

Quoted 10 lines

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch new file +10 -0

+Signed-off-by: Kang Kai <[email protected]>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,7 +149,7 @@
+ AC_SYS_LARGEFILE
+
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_PATH_PROG(NM, [$NM nm], nm)

Does

AC_PATH_TOOL(NM,nm,nm)

work for you here ?

Quoted 13 lines

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch new file +3 -0
+
+ AC_MSG_CHECKING([for some Win32 platform])
+ AS_CASE(["$host"],
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb +0 -0
index 9fabbe2..2099b98 100644
@@ -10,9 +10,12 @@ SECTION = "libs"
 
DEPENDS = "libpng glib-2.0 jpeg"
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb +2 -0
+PR = "r1"
+

Quoted 4 lines

SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
file://hardcoded_libtool.patch \
file://configure_fix.patch \
+ file://configure-nm.patch;patch=1 \

patch=1 is redundant

Quoted 12 lines

"
SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8" --
1.7.5.1.300.gc565c
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Kang Kai

author

2011-10-13 09:11 UTC #6 lore raw

PATCH 3/4 xinput: add xinput from oe

In reply to Kang Kai

xinput is requred by xinput-calibrator, so pull it from oe. Reset PR and add LIC_FILES_CHKSUM.

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb

meta/recipes-graphics/xorg-app/xinput_1.5.3.bb new file +10 -0

new file mode 100644
index 0000000..5f0d351
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+
+LIC_FILES_CHKSUM="file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
+
+DEPENDS += " libxi"
+PR = "r0"
+
+SRC_URI[archive.md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
+SRC_URI[archive.sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"

Signature · 1 line

1.7.5.1.300.gc565c

Koen Kooi

2011-10-13 09:15 UTC #7 lore raw

Re: [PATCH 3/4] xinput: add xinput from oe

Op 13 okt. 2011, om 11:05 heeft Kang Kai het volgende geschreven:

Quoted 15 lines

xinput is requred by xinput-calibrator, so pull it from oe. Reset PR and add LIC_FILES_CHKSUM.
Signed-off-by Kang Kai <[email protected]>
---
meta/recipes-graphics/xorg-app/xinput_1.5.3.bb | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb
meta/recipes-graphics/xorg-app/xinput_1.5.3.bb new file +0 -0
new file mode 100644
index 0000000..5f0d351

meta/recipes-graphics/xorg-app/xinput_1.5.3.bb line 7

Quoted 7 lines

meta/recipes-graphics/xorg-app/xinput_1.5.3.bb new file +7 -0

@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+
+LIC_FILES_CHKSUM="file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
+
+DEPENDS += " libxi"
+PR = "r0"

That will make PR go backwards compared to the meta-oe version

Kang Kai

author

2011-10-13 09:11 UTC #8 lore raw

PATCH 4/4 xinput-calibrator: add touchscreen support

In reply to Kang Kai

Add the xinput_calibrator package to support evdev touchscreens, which both programs the xinput settings and writes out xorg.conf information that can be used to initialize the touchscreen in subsequent X start-ups.

Add dependency pointercal-xinput at same time.

Signed-off-by Kang Kai <[email protected]>

---
 .../pointercal-xinput/bug20/pointercal.xinput      |    1 +
 .../pointercal-xinput/iphone3g/pointercal.xinput   |    1 +
 .../pointercal-xinput/nokia900/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta01/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta02/pointercal.xinput   |    2 +
 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   21 +++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   24 ++++++++++++++++++++
 8 files changed, 54 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..50e2632
@@ -0,0 +1 @@
+xinput set-int-prop "TSC2004 Touchscreen" "Evdev Axis Calibration" 32 239 10 232 6;

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..d6ce56b
@@ -0,0 +1 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 -102 4739 6 7321;

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..66bb32c
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 204 3897 3763 178;
+

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..9633fc5
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput

meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb new file +21 -0

new file mode 100644
index 0000000..5b7b967
@@ -0,0 +1,21 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SECTION = "base"
+
+PR = "r0"
+
+SRC_URI = "file://pointercal.xinput"
+S = "${WORKDIR}"
+
+do_install() {
+	# Only install file if it has a contents
+	if [ -s ${S}/pointercal.xinput ]; then
+	        install -d ${D}${sysconfdir}/
+	        install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"

meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +24 -0

new file mode 100644
index 0000000..879f7e5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT/X11"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
+DEPENDS = "virtual/libx11 libxi"
+
+inherit autotools
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+PR = "r0"
+
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
+SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
+
+S = "${WORKDIR}/xinput_calibrator-${PV}"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
+}

Signature · 1 line

1.7.5.1.300.gc565c

Martin Jansa

2011-10-13 09:16 UTC #9 lore raw

Re: [PATCH 4/4] xinput-calibrator: add touchscreen support

Quoted 18 lines · Kang Kai

Add the xinput_calibrator package to support evdev touchscreens, which both programs the xinput settings and writes out xorg.conf information that can be used to initialize the touchscreen in subsequent X start-ups.
Add dependency pointercal-xinput at same time.
Signed-off-by Kang Kai <[email protected]>
---
 .../pointercal-xinput/bug20/pointercal.xinput      |    1 +
 .../pointercal-xinput/iphone3g/pointercal.xinput   |    1 +
 .../pointercal-xinput/nokia900/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta01/pointercal.xinput   |    2 +
 .../pointercal-xinput/om-gta02/pointercal.xinput   |    2 +
 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   21 +++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   24 ++++++++++++++++++++
 8 files changed, 54 insertions(+), 0 deletions(-)

Quoted 8 lines

 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb

those pointercal-xinput files should be in BSP layers and it was already cleaned in meta-oe so please update this patch..

Quoted 111 lines

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..50e2632
@@ -0,0 +1 @@
+xinput set-int-prop "TSC2004 Touchscreen" "Evdev Axis Calibration" 32 239 10 232 6;

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..d6ce56b
@@ -0,0 +1 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 -102 4739 6 7321;

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..66bb32c
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 204 3897 3763 178;
+

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput new file +2 -0

new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1

meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput new file +1 -0

new file mode 100644
index 0000000..9633fc5
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput

meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb new file +21 -0

new file mode 100644
index 0000000..5b7b967
@@ -0,0 +1,21 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SECTION = "base"
+
+PR = "r0"
+
+SRC_URI = "file://pointercal.xinput"
+S = "${WORKDIR}"
+
+do_install() {
+	# Only install file if it has a contents
+	if [ -s ${S}/pointercal.xinput ]; then
+	        install -d ${D}${sysconfdir}/
+	        install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"

meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +24 -0

new file mode 100644
index 0000000..879f7e5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT/X11"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
+DEPENDS = "virtual/libx11 libxi"
+
+inherit autotools
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+PR = "r0"
+
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
+SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
+
+S = "${WORKDIR}/xinput_calibrator-${PV}"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
+}

Signature · 7 lines

1.7.5.1.300.gc565c


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Koen Kooi

2011-10-13 09:17 UTC #10 lore raw

Re: [PATCH 4/4] xinput-calibrator: add touchscreen support

In reply to Kang Kai

Op 13 okt. 2011, om 11:05 heeft Kang Kai het volgende geschreven:

Quoted 8 lines

Add the xinput_calibrator package to support evdev touchscreens, which both programs the xinput settings and writes out xorg.conf information that can be used to initialize the touchscreen in subsequent X start-ups.
Add dependency pointercal-xinput at same time.
Signed-off-by Kang Kai <[email protected]>

If you would have imported the meta-oe version you wouldn't have dragged in BSP stuff.

I know I said this before, but I'll say it again: look at the meta-oe versions of all this

Quoted 129 lines

---
.../pointercal-xinput/bug20/pointercal.xinput      |    1 +
.../pointercal-xinput/iphone3g/pointercal.xinput   |    1 +
.../pointercal-xinput/nokia900/pointercal.xinput   |    2 +
.../pointercal-xinput/om-gta01/pointercal.xinput   |    2 +
.../pointercal-xinput/om-gta02/pointercal.xinput   |    2 +
.../pointercal-xinput/pointercal.xinput            |    1 +
.../xinput-calibrator/pointercal-xinput_0.0.bb     |   21 +++++++++++++++++
.../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   24 ++++++++++++++++++++
8 files changed, 54 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput new file +1 -0
new file mode 100644
index 0000000..50e2632
@@ -0,0 +1 @@
+xinput set-int-prop "TSC2004 Touchscreen" "Evdev Axis Calibration" 32 239 10 232 6;
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput new file +1 -0
new file mode 100644
index 0000000..d6ce56b
@@ -0,0 +1 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 -102 4739 6 7321;
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput new file +2 -0
new file mode 100644
index 0000000..66bb32c
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 204 3897 3763 178;
+
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput new file +2 -0
new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput new file +2 -0
new file mode 100644
index 0000000..be25da3
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput new file +1 -0
new file mode 100644
index 0000000..9633fc5
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput
meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb new file +21 -0
new file mode 100644
index 0000000..5b7b967
@@ -0,0 +1,21 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SECTION = "base"
+
+PR = "r0"
+
+SRC_URI = "file://pointercal.xinput"
+S = "${WORKDIR}"
+
+do_install() {
+	# Only install file if it has a contents
+	if [ -s ${S}/pointercal.xinput ]; then
+	        install -d ${D}${sysconfdir}/
+	        install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +24 -0
new file mode 100644
index 0000000..879f7e5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT/X11"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
+DEPENDS = "virtual/libx11 libxi"
+
+inherit autotools
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+PR = "r0"
+
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
+SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
+
+S = "${WORKDIR}/xinput_calibrator-${PV}"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
+}
Signature · 7 lines
1.7.5.1.300.gc565c


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core