rpi: Fixed "Could not get DISPMANX objects." error

mpv-player · Aug 8, 2021 · e2fdca0 · e2fdca0
1 parent 8300830
commit e2fdca0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/wscript b/wscript
@@ -549,11 +549,17 @@ video_output_features = [
     }, {
         'name': '--rpi',
         'desc': 'Raspberry Pi support',
-        'func': check_egl_provider(name='brcmegl', check=any_check(
-            check_pkg_config('brcmegl'),
-            check_pkg_config('/opt/vc/lib/pkgconfig/brcmegl.pc')
-            )),
+        'func': check_egl_provider(name='brcmegl', check=compose_checks(
+            # RPI libraries need to be added in this order to initialize properly
+            any_check(check_pkg_config('mmal'), check_pkg_config('/opt/vc/lib/pkgconfig/mmal.pc')),
+            any_check(check_pkg_config('brcmegl'), check_pkg_config('/opt/vc/lib/pkgconfig/brcmegl.pc'))
+        )),
         'default': 'disable',
+    }, {
+        'name': '--rpi-mmal',
+        'desc': 'Raspberry Pi MMAL hwaccel',
+        'deps': 'rpi',
+        'func': check_true,
     } , {
         'name': '--egl',
         'desc': 'EGL 1.4',
@@ -798,12 +804,6 @@ hwaccel_features = [
         'desc': 'CUDA with graphics interop',
         'deps': '(gl || vulkan) && cuda-hwaccel',
         'func': check_true,
-    }, {
-        'name': '--rpi-mmal',
-        'desc': 'Raspberry Pi MMAL hwaccel',
-        'deps': 'rpi',
-        'func': any_check(check_pkg_config('mmal'),
-                          check_pkg_config('/opt/vc/lib/pkgconfig/mmal.pc')),
     }
 ]