Commit Graph

929 Commits

Author SHA1 Message Date
Richard Purdie
9e016c4b22 libcgroup/libxkbcommon: Use BPN in SRC_URI
If we don't do this, multilib and other varients using BBCLASSEXTEND
will fail.

(From OE-Core rev: 9a97367038a1e2431bf94211dabbc5aedbbee3bb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:08 +00:00
Saul Wold
113852387e mx: Update to 1.4.7
Source moved to GitHub

(From OE-Core rev: 1f2f35ba7607b503af2cdf51a459c6de786f554d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:06 +00:00
Laurentiu Palcu
bd6c5ffaf5 xf86-input-synaptics: add mtdev dependency
After upgrading xserver to 1.13, multitouch support is automatically
enabled in xf86-input-synaptics. Hence, the need for mtdev dependency.

(From OE-Core rev: 03d787efe0d83b20155508811f901b05a910940c)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:05 +00:00
Laurentiu Palcu
657ed11b29 fontconfig: upgrade to 2.10.1
A couple of changes:
 * licence snippet in fccache.c moved down the file;
 * new files appeared in this version, added them to fontconfig package

(From OE-Core rev: f6ca099d9cbd2ed1c181e8e91cc16d0550701f26)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:04 +00:00
Laurentiu Palcu
8b8fd8cc3a xcb-proto: upgrade to 1.8
(From OE-Core rev: dd378e8bd3419219585968158be1972bffa57247)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:04 +00:00
Laurentiu Palcu
2ef5965453 xf86-input-mouse: upgrade to 1.8.1
Licence chacksum changed because Red Hat added a copyright line.

(From OE-Core rev: 00c892acc24860c26fe658ff96cfa002a1c96410)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:03 +00:00
Laurentiu Palcu
9e4ef9e814 xf86-video-intel: upgrade to 2.20.12
(From OE-Core rev: 31ade27a9d6011ff3a96aa2ef81be662f83c640f)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:03 +00:00
Laurentiu Palcu
eed09cfb7f xf86-video-vesa: upgrade to 2.3.2
(From OE-Core rev: efdf6fc1cdbd5427eb94b034b2adc6a45a351b75)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:03 +00:00
Ross Burton
7e1e3066e3 mesa-demos: fix --with-glut check
The GLUT check was automatic and couldn't be disabled, so mesa-demos would gain
a GLUT dependency if it was present when built.

So, fix configure.ac so that --without-glut works as expected.

(From OE-Core rev: fa7fb44d1ca2b8a57509806bde19672c68ef157d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 22:32:08 +00:00
Ross Burton
1815a99f9f mesa: remove python2 detection hack
Our python-native is 2.7.3 which ships python2, and we've been patching it in to
earlier versions since September 2011.

(From OE-Core rev: 1961ea1493caf5fe2959db2a11831a4a5a17eaeb)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 13:36:39 +00:00
Ross Burton
e828faf027 xorg-driver-common: remove AC_CHECK_FILE workaround
The drivers don't generally use AC_CHECK_FILE anymore, so remove this
brute-force kludge. Any subsequent breakage can be worked-around in the recipe
and fixes submitted upstream.

(From OE-Core rev: 1b0d9cb1801a8eb68c82dfcda5a1da420ac8dd83)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 13:36:37 +00:00
Ross Burton
7ea8496ce0 meta: remove redundant _FOR_BUILD variables
(From OE-Core rev: acabd2158d9004dedfdfad8c170b77d32684f3fc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 13:36:37 +00:00
Robert Yang
cc1f50fca8 recipes-graphics: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.

[YOCTO #3297]

(From OE-Core rev: db1a03da3a6a6e7adb68e28883204adfaa8b3f47)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:29 +00:00
Daniel Stone
662a445b30 mesa: Build separate GLU library
Mesa has removed GLU from the core tree upstream, so remove it from the
Mesa build and add the separate tarball as a new recipe.

(From OE-Core rev: 4395691a44b198ba0b9a969cbade669e8de07a4f)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:25 +00:00
Richard Purdie
c1da202993 cogl/clutter: Explicitly depend on libdrm for GLX
cogl and clutter explicitly rely on libdrm being present when using the glx
backend. If its not listed in DEPENDS and an alternative to mesa is used, it
may not actually be present. This patch ensures it is and fixes a build
race condition which could see dependencies like clutter-box2d failing to
compile due to missing pkgconfig dependencies.

(From OE-Core rev: afb3ee76cef109c7ba4a760d834839ef277e30fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-25 17:50:18 +01:00
Ross Burton
662189deb6 xorg-driver: add xserver driver ABI dependencies
At build time extract the xserver driver ABI versions that we're building
against and add RDEPENDs on them, so the driver isn't used against an xserver
with a different ABI (which won't work).

(From OE-Core rev: a17faa832798f5c76e344d2662ffdb470974bfe3)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-24 12:50:47 +01:00
Ross Burton
3cabe899c1 libxkbcommon: new window system-independent XKB library
Used by Wayland, Clutter, and more.

(From OE-Core rev: 2e4b2d2b8d6f2aeb37654f305bcf6c1c2ffc04f9)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-24 12:50:44 +01:00
Richard Purdie
fa471acc00 qemugl: Remove since support for it was removed from qemu
(From OE-Core rev: 0195a08f77fe0e01b2d7548ccffeaf89d2d780e1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-24 12:50:44 +01:00
Denis 'GNUtoo' Carikli
72d7f8dc27 libsdl: fix inconditional alsa disabling.
Without that fix ALSA is inconditionally disabled,
  reguardless of the fact that alsa is in the distribution
  feature or not.

This patch has been tested on the om-gta04 target with both
  alsa distribution feature enabled(libsdl can then play sound),
  and disabled(it fails to play some sound trough alsa).

(From OE-Core rev: b635e47a2b8b711d5ddae3b3e5a5656402aee845)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-23 12:28:33 +01:00
Ross Burton
bc41dfb9cd xserver-xorg: add runtime provides for the driver ABI version
The xserver driver ABIs can and do change in a way that is unrelated to the
version of xserver, so it's entirely possible to build an image that has a
mismatch between the server ABI version and the version that the drivers were
built against.  xserver detects this and refuses to load the modules.

By adding RPROVIDEs to the xserver package that describe the ABI versions it has
(such as xorg-abi-video-13, xorg-abi-input-11), drivers can RDEPEND on the
version that they were built against.  This means that when the ABIs change,
there will be package dependency errors at image time instead of images that
build fine but don't work.

(From OE-Core rev: 8ef5f205aec04140198d5ba0f5c405ae6e977dbe)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-23 12:28:32 +01:00
Damien Lespiau
e7bae18e9d mtdev: New recipe for mtdev
(From OE-Core rev: 5ae7825ed7b8221d1c37e3d053404a3f2f7d27f2)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-23 12:28:31 +01:00
Ross Burton
8ce23f5695 xorg: remove XF86 BigFont extension
This has been disabled by default upstream since 2007, nothing uses it.

(From OE-Core rev: 06d27cf0fbcc4004e6f456880eca49893c9290bf)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-22 14:59:30 +01:00
Martin Jansa
fadb407901 PACKAGES_DYNAMIC: use += instead of = in most cases
* to keep ${PN}-locale from
  bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"

(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa
33b31640bf PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp
  ^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
  * made all those last '-' optional, use .* (or nothing)

(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Ross Burton
aee0f321ef xorg-proto: remove evieext
It was removed from xserver in 2008.

(From OE-Core rev: 574843864dcdb65d28bc2c3753339f123a9bc528)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:43 +01:00
Ross Burton
9b9fad3c5f xorg: remove xf86rushproto
The dependency in xserver is spurious and was removed in 2005.

(From OE-Core rev: aad06196254f1d08696ea0fcf50007ce3be933ac)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:43 +01:00
Daniel Stone
eb8a8fe503 libdrm: Add --disable-cairo-tests switch and update to upstream patch
Rather than implicitly relying on Cairo being disabled through not being
present, add a configure switch to forcibly disable it.

The updates the code to use a patch backported from upstream git
instead of our custom version.

(From OE-Core rev: fa9ccb23e5788f331cc868ce4bad4abd1eaeee9c)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:43 +01:00
Daniel Stone
4ebe9d1ebe libdrm: Bump git recipe to latest 2.4.39+ revision
(From OE-Core rev: 14c4c1de25b73c918a7ebb074359160290e9642f)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:42 +01:00
Ross Burton
3f516bbcc5 xorg: remove fontcache support
This was removed from the Xorg server in 2008.

(From OE-Core rev: 02fc0a197ca16e983becb0aedeb9238a0aeb6661)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:37 +01:00
Ross Burton
546f280184 libxfont: remove spurious dependency on fontcacheproto
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:36 +01:00
Ross Burton
d6dc72c048 xorg: remove all traces of XPrint
The XPrint server was removed from Xorg in 2008.

(From OE-Core rev: 5b3748d463a6666c0d8e2624092619da8d8e6328)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:36 +01:00
Ross Burton
f29e000832 xserver-xorg: use INC_PR in PR
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:36 +01:00
Ross Burton
1e533aec87 xorg: remove XTrap
This functionality was broken upstream so it was removed.

(From OE-Core rev: 7661d15957525885e5e9b1129da7a99eef19f4be)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:36 +01:00
Ross Burton
e7ee5be072 mesa: remove libegl-dbg, put all debugging into mesa-dri-dbg
(From OE-Core rev: c914495e1431ad56fcd81460fa4f675be3b4be3b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:35 +01:00
Ross Burton
9cc8a94fcc mesa: remove mesa-dri dependency in mesa-dri-dev
mesa-dri is empty, so instead of allowing an empty package, remove the default
dependency on mesa-dri and let the system not generate mesa-dri.

(From OE-Core rev: 5d6596321a996278ffbaa111247367ec9e50d721)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:35 +01:00
Ross Burton
30f53b5e0e xf86-video-intel: bump to latest release
(From OE-Core rev: fa248f86105ddd4a1b0be039ee8e85ab275c4e44)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:35 +01:00
Ross Burton
9d765590cf xserver-xorg: upgrade to 1.11.4
gcc-47-warning.patch was integrated, so drop.

Add pkgconfig-deps.patch, a backport of a commit to fix bad exposed library
dependencies (which resulted in the keyboard driver depending on pixman).

(From OE-Core rev: 723e81af2a5b07024ab744c14cdccc12f554ef12)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:34 +01:00
Ross Burton
c942d527cc xf86-input-keyboard: upgrade to 1.6.2
(From OE-Core rev: 1c2ffdf26bdb2e1443dddb143e0e96760e6572bf)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:33 +01:00
Ross Burton
545f680d5a xf86-video-fbdev: bump to 0.4.3
(From OE-Core rev: 6157644e3ca06a97bee2294d1a55c5c17b0f52b1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:14 +01:00
Ross Burton
f1d73fd0b2 xf86-input-evdev: bump to latest release
(From OE-Core rev: 1f73a2ded611de659be05efe734753f538fd84a1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:14 +01:00
Richard Purdie
7f4a8dd914 libdrm: Explicitly disable the cairo dependency
We don't want the cairo dependency. Unfortunately simply checking whether its present
isn't good enough. If its not in DEPENDS, it can disappear half way through building.
We therefore need to explictly disable it.

(From OE-Core rev: 51df11c5747f69b4112121df78fc1e10644d390a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-05 16:18:26 +01:00
Ross Burton
423bb6b276 xf86-video-intel: drop libxvmc dependency
xvmc is explicitly disabled, so remove the dependency.

(From OE-Core rev: eb96be4db46039752c44dc37ef676eaac04e3dba)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-03 13:33:25 +01:00
Daniel Stone
9c3e605390 libdrm: Remove Cairo dependency
This causes a build loop, when DRM depends on Cairo depends on Mesa
depends on DRM.  We can safely remove it as it's only one libdrm example
program which uses Cairo, which we won't be needing.  At least it's not
worth the build loop.

(From OE-Core rev: a6d305261dc925210185d8b70fb1a923e012153b)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02 17:11:27 +01:00
Matthew McClintock
6e8d68de7f libx11.inc: fix build issues for older CentOS distros
Fixes these sorts of issues present on older gcc (CentOS 5.x in this case)

| cc1: error: unrecognized command line option "-Werror=implicit"
| cc1: error: unrecognized command line option "-Werror=nonnull"
| cc1: error: unrecognized command line option "-Werror=init-self"
| cc1: error: unrecognized command line option "-Werror=main"
| cc1: error: unrecognized command line option "-Werror=missing-braces"
| cc1: error: unrecognized command line option "-Werror=sequence-point"
| cc1: error: unrecognized command line option "-Werror=return-type"
| cc1: error: unrecognized command line option "-Werror=trigraphs"
| cc1: error: unrecognized command line option "-Werror=array-bounds"
| cc1: error: unrecognized command line option "-Werror=write-strings"
| cc1: error: unrecognized command line option "-Werror=address"
| cc1: error: unrecognized command line option "-Werror=int-to-pointer-cast"
| cc1: error: unrecognized command line option "-Werror=pointer-to-int-cast"

Also fixes:

makekeys-makekeys.o: In function `main':
makekeys.c:(.text+0x85): undefined reference to `__isoc99_sscanf'
makekeys.c:(.text+0xa7): undefined reference to `__isoc99_sscanf'
collect2: ld returned 1 exit status
make: *** [makekeys] Error 1

Older libc do not have this defined, we can use the -D_GNU_SOURCE
to the compiler to prevent generating calls to this function and
make linking work

(From OE-Core rev: 83c560ae282c1a28fd2c311c66debd02a69f1678)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02 17:10:35 +01:00
Mark Hatle
6b76d9e764 libxcb: Update DEPENDS to avoid duplicate entries
Some items were listed multiple times in DEPENDS, avoid this situation.

Note, PR was not incremented as no change to the build process occurs.

(From OE-Core rev: e234af467eac7d0313fae3e87eb1b34725309bb5)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02 11:40:48 +01:00
Otavio Salvador
1ed2073a01 xserver-xorg: Remove RCONFLICTS against xserver-xorg
When merging the xserver-xorg fix the to use RDEPENDS in
xserver-xorg-module-exa the RCONFLICTS has not been removed by
mistake. This drops the RCONFLICTS to properly fix it.

(From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-28 15:19:43 +01:00
Otavio Salvador
b0f4a5bc23 xserver-xorg: Use rdepends to ensure xserver-xorg-module-exa match version
This fix the installation of xserver-xorg-module-exa package at rootfs
using opkg. It were failing as conflicts where not working properly.

(From OE-Core rev: 8fb19876215a8c7918361e8360c4342d1a933a93)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-28 11:07:42 +01:00
Ross Burton
629282ecd0 xserver-xorg: merge version-specific .inc into .bb
The version-specific .inc was shared with the xserver-xorg-lite package, but
that doesn't exist anymore.

(From OE-Core rev: 09b1bf350384722127ac9f098a72371cf27c3822)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-28 11:07:38 +01:00
Otavio Salvador
ea5913fa84 cogl: Add a missing depends on libxdamage
During a from scratch build test, cogl build failed due a missing
dependency on libxdamage.

(From OE-Core rev: 959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-28 11:07:37 +01:00
Martin Jansa
6d7e9d42eb xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa
* it doesn't make much sense with PV, because xserver-xorg-module-exa
  was introduced in
  http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
  so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4)
  and (< 1.11.2) is not good enough

* because we don't know how many PRINC are in BSP/DISTRO layers,
  then it's safer to RCONFLICTS with every older version then current
  EXTENDPKGV

Also fixes whitespace to work correctly with opkg

(From OE-Core rev: ed0216d29fc4355c5220f3ad51df04a63cacb0c3)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

--

* I haven't really tested this with IPK, since it was changed from
  RREPLACES to RCONFLICTS (because of RPM) and all my installed devices
  are already upgraded
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-27 15:21:54 +01:00