diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-04-21 14:32:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 12:26:29 +0100 |
| commit | cdf878387ad460f7c6b7a58dcc996918bcd07a0a (patch) | |
| tree | b8962ec003760b36fc1ead9c0a5ad38c0c4d0f4a /meta/recipes-graphics | |
| parent | 5331f471045459a496f829cb747447e8f196d26e (diff) | |
| download | poky-cdf878387ad460f7c6b7a58dcc996918bcd07a0a.tar.gz | |
Remove machine-specific metadata for machines no longer in oe-core
(From OE-Core rev: 72567733033347b662d9baa07432985fd2da3efa)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
31 files changed, 4 insertions, 358 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb index 998545ab21..b736846034 100644 --- a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb +++ b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require clutter.inc | 1 | require clutter.inc |
| 2 | 2 | ||
| 3 | PR = "r0" | 3 | PR = "r1" |
| 4 | 4 | ||
| 5 | PACKAGES =+ "${PN}-examples" | 5 | PACKAGES =+ "${PN}-examples" |
| 6 | FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" | 6 | FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" |
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb index ab9e0e0560..938a30ceb1 100644 --- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb +++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require recipes-graphics/clutter/clutter.inc | 1 | require recipes-graphics/clutter/clutter.inc |
| 2 | 2 | ||
| 3 | PR = "r0" | 3 | PR = "r1" |
| 4 | 4 | ||
| 5 | # Internal json-glib was removed in Clutter 1.5.2 | 5 | # Internal json-glib was removed in Clutter 1.5.2 |
| 6 | STDDEPENDS += "json-glib" | 6 | STDDEPENDS += "json-glib" |
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc index 2f9a55cab5..54f65c5357 100644 --- a/meta/recipes-graphics/clutter/clutter.inc +++ b/meta/recipes-graphics/clutter/clutter.inc | |||
| @@ -2,47 +2,12 @@ DESCRIPTION = "Clutter graphics library" | |||
| 2 | HOMEPAGE = "http://www.clutter-project.org/" | 2 | HOMEPAGE = "http://www.clutter-project.org/" |
| 3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPL" |
| 4 | 4 | ||
| 5 | COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)" | ||
| 6 | |||
| 7 | STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" | 5 | STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" |
| 8 | BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" | 6 | BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" |
| 9 | 7 | ||
| 10 | DEPENDS = "${STDDEPENDS} virtual/libgl" | 8 | DEPENDS = "${STDDEPENDS} virtual/libgl" |
| 11 | EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" | 9 | EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" |
| 12 | 10 | ||
| 13 | DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" | ||
| 14 | EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative" | ||
| 15 | PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}" | ||
| 16 | LDFLAGS_append_zylonite = " -lnws -lstdc++ " | ||
| 17 | |||
| 18 | DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib" | ||
| 19 | EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative" | ||
| 20 | PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}" | ||
| 21 | LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ " | ||
| 22 | |||
| 23 | DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib" | ||
| 24 | # The eglx drivers are pretty dire, use eglnative | ||
| 25 | EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglnative" | ||
| 26 | PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" | ||
| 27 | |||
| 28 | DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib" | ||
| 29 | # The eglx drivers are pretty dire, use eglnative | ||
| 30 | EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglnative" | ||
| 31 | PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" | ||
| 32 | |||
| 33 | DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" | ||
| 34 | EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" | ||
| 35 | PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" | ||
| 36 | LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " | ||
| 37 | |||
| 38 | DEPENDS_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" | ||
| 39 | EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx" | ||
| 40 | PACKAGE_ARCH_atom-pc = "${MACHINE_ARCH}" | ||
| 41 | |||
| 42 | DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" | ||
| 43 | EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx" | ||
| 44 | PACKAGE_ARCH_menlow = "${MACHINE_ARCH}" | ||
| 45 | |||
| 46 | FILESPATH = "${FILE_DIRNAME}/clutter" | 11 | FILESPATH = "${FILE_DIRNAME}/clutter" |
| 47 | 12 | ||
| 48 | inherit autotools pkgconfig gtk-doc gettext | 13 | inherit autotools pkgconfig gtk-doc gettext |
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb index 6df48e2e69..cb5f47639b 100644 --- a/meta/recipes-graphics/clutter/clutter_git.bb +++ b/meta/recipes-graphics/clutter/clutter_git.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | |||
| 5 | 5 | ||
| 6 | SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748" | 6 | SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748" |
| 7 | PV = "1.0.0+git${SRCPV}" | 7 | PV = "1.0.0+git${SRCPV}" |
| 8 | PR = "r8" | 8 | PR = "r9" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ | 10 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ |
| 11 | file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ | 11 | file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ |
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb index 28f9f27214..c7bd974152 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | |||
| @@ -19,9 +19,6 @@ SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac | |||
| 19 | # most of our targets do not have DRI so will use mesa-xlib | 19 | # most of our targets do not have DRI so will use mesa-xlib |
| 20 | DEFAULT_PREFERENCE = "-1" | 20 | DEFAULT_PREFERENCE = "-1" |
| 21 | 21 | ||
| 22 | # Atom PCs have DRI support so use mesa-dri by default | ||
| 23 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
| 24 | |||
| 25 | LEAD_SONAME = "libGL.so.1" | 22 | LEAD_SONAME = "libGL.so.1" |
| 26 | 23 | ||
| 27 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | 24 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" |
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index f61d23c543..07887f4c10 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb | |||
| @@ -18,9 +18,6 @@ PR = "r1" | |||
| 18 | # most of our targets do not have DRI so will use mesa-xlib | 18 | # most of our targets do not have DRI so will use mesa-xlib |
| 19 | DEFAULT_PREFERENCE = "-1" | 19 | DEFAULT_PREFERENCE = "-1" |
| 20 | 20 | ||
| 21 | # Atom PCs have DRI support so use mesa-dri by default | ||
| 22 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
| 23 | |||
| 24 | PACKAGES =+ "${PN}-xprogs" | 21 | PACKAGES =+ "${PN}-xprogs" |
| 25 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" | 22 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" |
| 26 | 23 | ||
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc index a734cdda46..60ceed4a96 100644 --- a/meta/recipes-graphics/mutter/mutter.inc +++ b/meta/recipes-graphics/mutter/mutter.inc | |||
| @@ -10,9 +10,6 @@ ALTERNATIVE_LINK = "${bindir}/x-window-manager" | |||
| 10 | ALTERNATIVE_PATH = "${bindir}/mutter" | 10 | ALTERNATIVE_PATH = "${bindir}/mutter" |
| 11 | ALTERNATIVE_PRIORITY = "11" | 11 | ALTERNATIVE_PRIORITY = "11" |
| 12 | 12 | ||
| 13 | COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)" | ||
| 14 | |||
| 15 | |||
| 16 | EXTRA_OECONF += "--disable-verbose \ | 13 | EXTRA_OECONF += "--disable-verbose \ |
| 17 | --disable-xinerama \ | 14 | --disable-xinerama \ |
| 18 | --without-introspection \ | 15 | --without-introspection \ |
diff --git a/meta/recipes-graphics/tslib/tslib/a780/tslib.sh b/meta/recipes-graphics/tslib/tslib/a780/tslib.sh deleted file mode 100644 index 51cd0f1f36..0000000000 --- a/meta/recipes-graphics/tslib/tslib/a780/tslib.sh +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/event1 | ||
| 4 | TSLIB_CONFFILE=/etc/ts.conf | ||
| 5 | |||
| 6 | export TSLIB_TSDEVICE TSLIB_CONFFILE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/collie/ts.conf b/meta/recipes-graphics/tslib/tslib/collie/ts.conf deleted file mode 100644 index 2099b9b414..0000000000 --- a/meta/recipes-graphics/tslib/tslib/collie/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw collie | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/collie/tslib.sh b/meta/recipes-graphics/tslib/tslib/collie/tslib.sh deleted file mode 100644 index 664bda426a..0000000000 --- a/meta/recipes-graphics/tslib/tslib/collie/tslib.sh +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/touchscreen0 | ||
| 4 | TSLIB_CONFFILE=/etc/ts.conf | ||
| 5 | |||
| 6 | case `uname -r` in | ||
| 7 | 2.4*) | ||
| 8 | TSLIB_TSDEVICE=/dev/ts | ||
| 9 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 | ||
| 10 | ;; | ||
| 11 | esac | ||
| 12 | |||
| 13 | export TSLIB_TSDEVICE TSLIB_CONFFILE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/devfs.patch b/meta/recipes-graphics/tslib/tslib/devfs.patch deleted file mode 100644 index d7ef0a9589..0000000000 --- a/meta/recipes-graphics/tslib/tslib/devfs.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- tslib/tests/fbutils.c~devfs.patch | ||
| 7 | +++ tslib/tests/fbutils.c | ||
| 8 | @@ -44,8 +44,8 @@ | ||
| 9 | static unsigned colormap [256]; | ||
| 10 | int xres, yres; | ||
| 11 | |||
| 12 | -static char *defaultfbdevice = "/dev/fb0"; | ||
| 13 | -static char *defaultconsoledevice = "/dev/tty"; | ||
| 14 | +static char *defaultfbdevice = "/dev/fb/0"; | ||
| 15 | +static char *defaultconsoledevice = "/dev/vc/"; | ||
| 16 | static char *fbdevice = NULL; | ||
| 17 | static char *consoledevice = NULL; | ||
| 18 | |||
diff --git a/meta/recipes-graphics/tslib/tslib/e680/tslib.sh b/meta/recipes-graphics/tslib/tslib/e680/tslib.sh deleted file mode 100644 index 51cd0f1f36..0000000000 --- a/meta/recipes-graphics/tslib/tslib/e680/tslib.sh +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/event1 | ||
| 4 | TSLIB_CONFFILE=/etc/ts.conf | ||
| 5 | |||
| 6 | export TSLIB_TSDEVICE TSLIB_CONFFILE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/event1.patch b/meta/recipes-graphics/tslib/tslib/event1.patch deleted file mode 100644 index 88cc3f3a2a..0000000000 --- a/meta/recipes-graphics/tslib/tslib/event1.patch +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- tslib/tests/ts_calibrate.c~event1 | ||
| 7 | +++ tslib/tests/ts_calibrate.c | ||
| 8 | @@ -179,11 +179,7 @@ | ||
| 9 | if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { | ||
| 10 | ts = ts_open(tsdevice,0); | ||
| 11 | } else { | ||
| 12 | -#ifdef USE_INPUT_API | ||
| 13 | - ts = ts_open("/dev/input/event0", 0); | ||
| 14 | -#else | ||
| 15 | - ts = ts_open("/dev/touchscreen/ucb1x00", 0); | ||
| 16 | -#endif /* USE_INPUT_API */ | ||
| 17 | + ts = ts_open("/dev/input/event1", 0); | ||
| 18 | } | ||
| 19 | |||
| 20 | if (!ts) { | ||
| 21 | --- tslib/tests/ts_print.c~event1 | ||
| 22 | +++ tslib/tests/ts_print.c | ||
| 23 | @@ -28,11 +28,7 @@ | ||
| 24 | if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { | ||
| 25 | ts = ts_open(tsdevice,0); | ||
| 26 | } else { | ||
| 27 | -#ifdef USE_INPUT_API | ||
| 28 | - ts = ts_open("/dev/input/event0", 0); | ||
| 29 | -#else | ||
| 30 | - ts = ts_open("/dev/touchscreen/ucb1x00", 0); | ||
| 31 | -#endif /* USE_INPUT_API */ | ||
| 32 | + ts = ts_open("/dev/input/event1", 0); | ||
| 33 | } | ||
| 34 | |||
| 35 | if (!ts) { | ||
| 36 | --- tslib/tests/ts_test.c~event1 | ||
| 37 | +++ tslib/tests/ts_test.c | ||
| 38 | @@ -120,11 +120,7 @@ | ||
| 39 | signal(SIGTERM, sig); | ||
| 40 | |||
| 41 | if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { | ||
| 42 | -#ifdef USE_INPUT_API | ||
| 43 | - tsdevice = strdup ("/dev/input/event0"); | ||
| 44 | -#else | ||
| 45 | - tsdevice = strdup ("/dev/touchscreen/ucb1x00"); | ||
| 46 | -#endif /* USE_INPUT_API */ | ||
| 47 | + tsdevice = strdup ("/dev/input/event1"); | ||
| 48 | } | ||
| 49 | |||
| 50 | ts = ts_open (tsdevice, 0); | ||
| 51 | --- tslib/tests/ts_print_raw.c~event1 | ||
| 52 | +++ tslib/tests/ts_print_raw.c | ||
| 53 | @@ -28,11 +28,7 @@ | ||
| 54 | if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { | ||
| 55 | ts = ts_open(tsdevice,0); | ||
| 56 | } else { | ||
| 57 | -#ifdef USE_INPUT_API | ||
| 58 | - ts = ts_open("/dev/input/event0", 0); | ||
| 59 | -#else | ||
| 60 | - ts = ts_open("/dev/touchscreen/ucb1x00", 0); | ||
| 61 | -#endif /* USE_INPUT_API */ | ||
| 62 | + ts = ts_open("/dev/input/event1", 0); | ||
| 63 | } | ||
| 64 | |||
| 65 | if (!ts) { | ||
| 66 | --- tslib/tests/ts_harvest.c~event1 | ||
| 67 | +++ tslib/tests/ts_harvest.c | ||
| 68 | @@ -75,11 +75,7 @@ | ||
| 69 | signal(SIGTERM, sig); | ||
| 70 | |||
| 71 | if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { | ||
| 72 | -#ifdef USE_INPUT_API | ||
| 73 | - tsdevice = strdup ("/dev/input/event0"); | ||
| 74 | -#else | ||
| 75 | - tsdevice = strdup ("/dev/touchscreen/ucb1x00"); | ||
| 76 | -#endif /* USE_INPUT_API */ | ||
| 77 | + tsdevice = strdup ("/dev/input/event1"); | ||
| 78 | } | ||
| 79 | |||
| 80 | ts = ts_open (tsdevice, 0); | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf deleted file mode 100644 index 20729b6154..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw h3600 | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh deleted file mode 100644 index 8f907b0755..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/tsraw0 | ||
| 4 | |||
| 5 | export TSLIB_TSDEVICE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf deleted file mode 100644 index 20729b6154..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw h3600 | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh deleted file mode 100644 index 1b5db781c1..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/ts0 | ||
| 4 | |||
| 5 | export TSLIB_TSDEVICE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf deleted file mode 100644 index 09309719f2..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw input | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh deleted file mode 100644 index 040f4de3d5..0000000000 --- a/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/event1 | ||
| 4 | |||
| 5 | export TSLIB_TSDEVICE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/mnci/ts.conf b/meta/recipes-graphics/tslib/tslib/mnci/ts.conf deleted file mode 100644 index adff17717b..0000000000 --- a/meta/recipes-graphics/tslib/tslib/mnci/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw input | ||
| 2 | module pthres pmin=600 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh b/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh deleted file mode 100644 index 07928f226d..0000000000 --- a/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | export TSLIB_TSDEVICE=/dev/input/event1 | ||
diff --git a/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf b/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf deleted file mode 100644 index 6d94a8f468..0000000000 --- a/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw input | ||
| 2 | module variance delta=80 | ||
| 3 | #module dejitter delta=2 | ||
| 4 | module linear | ||
| 5 | |||
diff --git a/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh b/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh deleted file mode 100644 index d31bc76368..0000000000 --- a/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=`detect-stylus --device` | ||
| 4 | |||
| 5 | export TSLIB_TSDEVICE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh deleted file mode 100644 index 040f4de3d5..0000000000 --- a/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/event1 | ||
| 4 | |||
| 5 | export TSLIB_TSDEVICE | ||
diff --git a/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh deleted file mode 100644 index 6bb56651f8..0000000000 --- a/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | export TSLIB_TSDEVICE=/dev/input/event1 | ||
| 4 | export QWS_MOUSE_PROTO=TPanel | ||
diff --git a/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh b/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh deleted file mode 100644 index 9c4eb1e0f9..0000000000 --- a/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | TSLIB_TSDEVICE=/dev/input/touchscreen0 | ||
| 4 | TSLIB_CONFFILE=/etc/ts.conf | ||
| 5 | |||
| 6 | case `uname -r` in | ||
| 7 | 2.4*) | ||
| 8 | TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00 | ||
| 9 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4 | ||
| 10 | ;; | ||
| 11 | esac | ||
| 12 | |||
| 13 | export TSLIB_TSDEVICE TSLIB_CONFFILE | ||
| 14 | |||
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4 deleted file mode 100644 index 2099b9b414..0000000000 --- a/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4 +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw collie | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=30 | ||
| 4 | module dejitter delta=100 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4 deleted file mode 100644 index 035e794cb4..0000000000 --- a/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4 +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | module_raw ucb1x00 | ||
| 2 | module pthres pmin=1 | ||
| 3 | module variance delta=10 | ||
| 4 | module dejitter delta=150 | ||
| 5 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb index 51529e3f13..9ab8259e47 100644 --- a/meta/recipes-graphics/tslib/tslib_1.0.bb +++ b/meta/recipes-graphics/tslib/tslib_1.0.bb | |||
| @@ -10,19 +10,15 @@ SECTION = "base" | |||
| 10 | LICENSE = "LGPLv2" | 10 | LICENSE = "LGPLv2" |
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" |
| 12 | 12 | ||
| 13 | PR = "r16" | 13 | PR = "r17" |
| 14 | 14 | ||
| 15 | SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ |
| 16 | file://fix_version.patch;patch=1 \ | 16 | file://fix_version.patch;patch=1 \ |
| 17 | file://ts.conf \ | 17 | file://ts.conf \ |
| 18 | file://ts.conf-simpad-2.4 \ | ||
| 19 | file://ts.conf-collie-2.4 \ | ||
| 20 | file://tslib.sh" | 18 | file://tslib.sh" |
| 21 | 19 | ||
| 22 | SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" | 20 | SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" |
| 23 | SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" | 21 | SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" |
| 24 | SRC_URI_append_mnci += " file://devfs.patch;patch=1" | ||
| 25 | SRC_URI_append_mnci += " file://event1.patch;patch=1" | ||
| 26 | SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1" | 22 | SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1" |
| 27 | 23 | ||
| 28 | 24 | ||
| @@ -37,18 +33,6 @@ do_install_prepend() { | |||
| 37 | do_install_append() { | 33 | do_install_append() { |
| 38 | install -d ${D}${sysconfdir}/profile.d/ | 34 | install -d ${D}${sysconfdir}/profile.d/ |
| 39 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ | 35 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ |
| 40 | case ${MACHINE} in | ||
| 41 | collie ) | ||
| 42 | install -d ${D}${datadir}/tslib | ||
| 43 | install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/ | ||
| 44 | ;; | ||
| 45 | simpad ) | ||
| 46 | install -d ${D}${datadir}/tslib | ||
| 47 | install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/ | ||
| 48 | ;; | ||
| 49 | *) | ||
| 50 | ;; | ||
| 51 | esac | ||
| 52 | } | 36 | } |
| 53 | 37 | ||
| 54 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" | 38 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" |
| @@ -58,20 +42,6 @@ SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" | |||
| 58 | #RDEPENDS_tslib-conf_weird-machine = "detect-stylus" | 42 | #RDEPENDS_tslib-conf_weird-machine = "detect-stylus" |
| 59 | RPROVIDES_tslib-conf = "libts-0.0-conf" | 43 | RPROVIDES_tslib-conf = "libts-0.0-conf" |
| 60 | 44 | ||
| 61 | # Machines with machine specific patches | ||
| 62 | PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" | ||
| 63 | # Machines with machine specific config files (tslib.sh) | ||
| 64 | PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}" | ||
| 65 | PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}" | ||
| 66 | PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}" | ||
| 67 | PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}" | ||
| 68 | PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}" | ||
| 69 | PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}" | ||
| 70 | PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}" | ||
| 71 | PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}" | ||
| 72 | PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}" | ||
| 73 | PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}" | ||
| 74 | |||
| 75 | PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" | 45 | PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" |
| 76 | DEBIAN_NOAUTONAME_tslib-conf = "1" | 46 | DEBIAN_NOAUTONAME_tslib-conf = "1" |
| 77 | DEBIAN_NOAUTONAME_tslib-tests = "1" | 47 | DEBIAN_NOAUTONAME_tslib-tests = "1" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf deleted file mode 100644 index e18b911199..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | Section "Device" | ||
| 2 | Identifier "Intel Graphics Driver" | ||
| 3 | Driver "intel" | ||
| 4 | EndSection | ||
| 5 | |||
| 6 | Section "Monitor" | ||
| 7 | Identifier "Generic Monitor" | ||
| 8 | Option "DPMS" | ||
| 9 | EndSection | ||
| 10 | |||
| 11 | Section "Screen" | ||
| 12 | Identifier "Default Screen" | ||
| 13 | Device "Intel Graphics Driver" | ||
| 14 | Monitor "Generic Monitor" | ||
| 15 | DefaultDepth 24 | ||
| 16 | EndSection | ||
| 17 | |||
| 18 | Section "ServerLayout" | ||
| 19 | Identifier "Default Layout" | ||
| 20 | Screen "Default Screen" | ||
| 21 | EndSection | ||
| 22 | |||
| 23 | Section "ServerFlags" | ||
| 24 | Option "DontZap" "0" | ||
| 25 | Option "AutoAddDevices" "False" | ||
| 26 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf deleted file mode 100644 index ae8a395a05..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | |||
| 2 | Section "Files" | ||
| 3 | EndSection | ||
| 4 | |||
| 5 | Section "InputDevice" | ||
| 6 | Identifier "Generic Keyboard" | ||
| 7 | Driver "kbd" | ||
| 8 | Option "CoreKeyboard" | ||
| 9 | Option "XkbRules" "xorg" | ||
| 10 | Option "XkbModel" "pc105" | ||
| 11 | Option "XkbLayout" "us" | ||
| 12 | EndSection | ||
| 13 | |||
| 14 | Section "InputDevice" | ||
| 15 | Identifier "Configured Mouse" | ||
| 16 | Driver "mouse" | ||
| 17 | Option "CorePointer" | ||
| 18 | Option "Device" "/dev/input/mice" | ||
| 19 | Option "Protocol" "ImPS/2" | ||
| 20 | Option "ZAxisMapping" "4 5" | ||
| 21 | Option "Emulate3Buttons" "true" | ||
| 22 | EndSection | ||
| 23 | |||
| 24 | Section "Device" | ||
| 25 | Identifier "OMAPFB Graphics Controller" | ||
| 26 | Driver "omapfb" | ||
| 27 | EndSection | ||
| 28 | |||
| 29 | Section "Monitor" | ||
| 30 | Identifier "Generic Monitor" | ||
| 31 | Option "DPMS" | ||
| 32 | EndSection | ||
| 33 | |||
| 34 | Section "Screen" | ||
| 35 | Identifier "Default Screen" | ||
| 36 | Device "OMAPFB Graphics Controller" | ||
| 37 | Monitor "Generic Monitor" | ||
| 38 | EndSection | ||
| 39 | |||
| 40 | Section "ServerLayout" | ||
| 41 | Identifier "Default Layout" | ||
| 42 | Screen "Default Screen" | ||
| 43 | InputDevice "Generic Keyboard" | ||
| 44 | InputDevice "Configured Mouse" | ||
| 45 | Option "AllowEmptyInput" "no" | ||
| 46 | EndSection | ||
| 47 | |||
