summaryrefslogtreecommitdiffstats
path: root/meta-ivi-common
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-02-26 06:25:50 +0100
committerGerrit Code Review <gerrit@172.30.200.200>2016-03-14 13:32:23 +0000
commitb3a5a720f96df72810b01d2c1d599015924811e0 (patch)
tree6d1343b2c7e0da70819efc79608b8703ab7f1e9b /meta-ivi-common
parentd33e1cc64a0b204bbacca793569b581024133061 (diff)
Temporary build fix for the wandboard
This temporary fix conditional to the wandboard is used to overcome a build breakage in the examples of wayland-ivi-extension. Change-Id: If5eccbce94e8aeb73cf303c72284510f966714f3 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-ivi-common')
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch13
-rw-r--r--meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb2
2 files changed, 15 insertions, 0 deletions
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
new file mode 100644
index 000000000..86b448be1
--- /dev/null
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3610fa9..8b4614d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ add_subdirectory(ivi-layermanagement-api/ilmCommon)
+ add_subdirectory(ivi-layermanagement-api/ilmClient)
+ add_subdirectory(ivi-layermanagement-api/ilmControl)
+ add_subdirectory(ivi-layermanagement-api/test)
+-add_subdirectory(ivi-layermanagement-examples)
++#add_subdirectory(ivi-layermanagement-examples)
+
+ if(WITH_ILM_INPUT)
+ add_subdirectory(ivi-input-api/ilmInput)
diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
index 56bb560ad..7bc619072 100644
--- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
+++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
@@ -10,6 +10,8 @@ DEPENDS = "weston"
SRC_URI = "git://git.projects.genivi.org/${PN}.git \
file://apply_weston-1.5.x.patch \
"
+SRC_URI_append_wandboard = "file://wandboard_fix_build.patch"
+
SRCREV = "8f0874b606b8e2a9385af947728905735bad3939"
S = "${WORKDIR}/git"
href='#n268'>268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430