Skip to content
Snippets Groups Projects

Update libhybris and add more related packages

Merged Imported Administrator requested to merge hybris-pr into master

This is resubmission of pmbootstrap!1522 (closed) and does the following:

  • update libhybris
    • change _rev to latest git commit (there was a mistake before)
    • update custom patch for EGL integration with Xorg (fixes QML apps and Blink rendering)
    • install EGL libs into /usr/lib/libhybris-egl as was discussed before to avoid conflicts with MESA
  • package lxc-android configs from Halium - mounts Android filesystems and allows to start minimalistic Android system in LXC container
  • package xf86-video-hwcomposer and dependencies - allows Xorg to render via Android HWComposer API and utilize EGL via libhybris
Edited by Administrator

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator added 1 commit · Imported

    added 1 commit

    • 54fa36a2 - Fix dependencies and indentation for hybris-related packages

    Compare with previous version

    By NotKit on 2018-09-25T21:50:00

  • Administrator added 1 commit · Imported

    added 1 commit

    • 35642479 - Fix dependencies and indentation for hybris-related packages

    Compare with previous version

    By NotKit on 2018-09-25T21:57:27

  • Author Owner

    @ollieparanoid The pipeline fails with ERROR: Can't build 'libhybris' for architecture x86_64 and in the package APKBUILD there is arch="armhf aarch64". I think the CI should check the package architecture and build the package with --arch, if it's possible, otherwise try to build only the packages with noarch or those which contains x86_64. What you think?

    By Daniele Debernardi on 2018-09-26T23:32:54

  • Author Owner

    FYI there are i386 devices that can also use libhybris (e.g. ASUS Zenfone 5 )

    By Luca Weiss on 2018-09-27T00:40:06

  • Author Owner

    @drebrez: pmbootstrap should do that by default. My guess - without having looked much at the patch yet - is that an aport depending on libhybris did not have x86_64 disabled. That way, pmbootstrap would try to build that other program for x86_64 by default, going through the dependencies and building them for x86_64 as well, and finally complaining about libhybris not being available for that arch.

    FYI there are i386 devices that can also use libhybris (e.g. ASUS Zenfone 5 )

    Good point. IIRC libhybris did not simply build for x86, so I disabled it. Maybe because the Android image it needs was not packaged for x86 (at least in pmOS).

    By Oliver Smith on 2018-09-27T07:28:08

  • Administrator added 1 commit · Imported

    added 1 commit

    • 5f050d3c - Enable libhybris to build for x86, but limit X driver to arm/arm64

    Compare with previous version

    By NotKit on 2018-09-29T18:02:38

  • Administrator added 1 commit · Imported

    added 1 commit

    • ac59f9ce - xf86-video-hwcomposer: add android-headers-7.1 to deps

    Compare with previous version

    By NotKit on 2018-09-29T20:42:38

  • Administrator added 1 commit · Imported

    added 1 commit

    • 1f851cc8 - xf86-video-hwcomposer: add android-headers-7.1 to deps

    Compare with previous version

    By NotKit on 2018-09-29T20:46:08

  • Administrator added 1 commit · Imported

    added 1 commit

    • ae5aaf9d - xf86-video-hwcomposer: add android-headers-7.1 to deps

    Compare with previous version

    By NotKit on 2018-09-29T20:52:50

  • Administrator added 1 commit · Imported

    added 1 commit

    • 6b8c083d - xf86-video-hwcomposer: add android-headers-7.1 to deps

    Compare with previous version

    By NotKit on 2018-09-29T20:56:30

  • Administrator added 1 commit · Imported

    added 1 commit

    • 106837a2 - xf86-video-hwcomposer: add android-headers-* to deps

    Compare with previous version

    By NotKit on 2018-09-29T21:12:25

  • Administrator unmarked as a Work In Progress · Imported

    unmarked as a Work In Progress

    By NotKit on 2018-09-29T22:03:16

  • Administrator changed the description · Imported

    changed the description

    By NotKit on 2018-09-29T22:03:16

  • Administrator changed the description · Imported

    changed the description

    By Oliver Smith on 2018-10-02T04:43:46

  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2018-10-02T04:43:52

  • Author Owner

    Code reviewed, looks good to me. Thanks for all the excellent work you have put into this @NotKit! :tada:

    PS: In case you did not see, I'm mostly dealing with #103 (closed) right now, that's why it's taking me a bit longer to do the MR reviews.

    By Oliver Smith on 2018-10-02T04:45:39

  • Administrator added 28 commits · Imported

    added 28 commits

    • 106837a2...75124bb5 - 19 commits from branch postmarketOS:master
    • 6215cf74 - Package Halium's Android LXC container configs
    • c99abc3f - Install libhybris EGL/GLES libs into /usr/lib/libhybris-egl
    • 7ff5e9fb - Add xf86-video-hwcomposer for libhybris adaptations
    • a34c95b8 - xf86-video-hwcomposer: update to latest git, change provided configs
    • efa214f3 - libhybris: update X11 EGL platform patch
    • c8fa88a5 - Fix build deps for drihybris and glamor-hybris
    • 604ad022 - Fix dependencies and indentation for hybris-related packages
    • faeeff70 - Enable libhybris to build for x86, but limit X driver to arm/arm64
    • 511b26ff - xf86-video-hwcomposer: add android-headers-* to deps

    Compare with previous version

    By Oliver Smith on 2018-10-02T04:45:47

  • Administrator enabled an automatic merge when the pipeline for 511b26ff succeeds · Imported

    enabled an automatic merge when the pipeline for 511b26ff succeeds

    By Oliver Smith on 2018-10-02T04:46:03

  • Administrator merged · Imported

    merged

    By Oliver Smith on 2018-10-02T05:09:28

Please register or sign in to reply
Loading