diff options
| author | Paul Barker <pbarker@toganlabs.com> | 2017-11-30 13:40:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 13:40:44 +0000 |
| commit | 2323140c2a7570dfc4970b486bd572ea23ab6245 (patch) | |
| tree | 2981f0aaef00b08fa85def9a06ba12ad60e3159c | |
| parent | a1cfeb3324c458a73507e34ffcf28c25591b8052 (diff) | |
| parent | 4b13f74d9a986d58735107dc889a0e57bf1295b0 (diff) | |
| download | meta-raspberrypi-2323140c2a7570dfc4970b486bd572ea23ab6245.tar.gz | |
Merge pull request #165 from koenkooi/rocko-backports
Rocko backports
| -rw-r--r-- | recipes-graphics/userland/userland_git.bb | 2 | ||||
| -rw-r--r-- | recipes-multimedia/x264/x264_git.bbappend | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 1fc0717..d4624bf 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb | |||
| @@ -10,7 +10,7 @@ PR = "r5" | |||
| 10 | PROVIDES = "virtual/libgles2 \ | 10 | PROVIDES = "virtual/libgles2 \ |
| 11 | virtual/egl" | 11 | virtual/egl" |
| 12 | 12 | ||
| 13 | RPROVIDES_${PN} += "libgles2 egl" | 13 | RPROVIDES_${PN} += "libgles2 egl libegl" |
| 14 | 14 | ||
| 15 | COMPATIBLE_MACHINE = "^rpi$" | 15 | COMPATIBLE_MACHINE = "^rpi$" |
| 16 | 16 | ||
diff --git a/recipes-multimedia/x264/x264_git.bbappend b/recipes-multimedia/x264/x264_git.bbappend index c1cb3bc..505719e 100644 --- a/recipes-multimedia/x264/x264_git.bbappend +++ b/recipes-multimedia/x264/x264_git.bbappend | |||
| @@ -1 +1,2 @@ | |||
| 1 | EXTRA_OECONF_append_raspberrypi = " --disable-asm" | 1 | EXTRA_OECONF_append_raspberrypi = " --disable-asm" |
| 2 | EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" | ||