omxplayer: Install fonts directory in datadir

Change-Id: I8a31cad4f1e84083729c4400526d21d2e573834e
Signed-off-by: Sébastien Mennetrier <s.mennetrier@innotis.org>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>

recipes-graphics/mesa/mesa_9.1.6.bbappend

@@ -1,34 +1,36 @@
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 #
 # FIXME
-# We may a way to disable EGL and GL ES2, these are provided by userland package
+# We need a way to disable EGL and GL ES2, these are provided by userland package
 #
 python __anonymous () {
     import re
 
-    # Remove egl and gles2 configure options
-    extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
-    take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1']
-    put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1']
-    pattern = re.compile("--with-egl-platforms")
-    new_extra_oeconf = []
-    for i in extra_oeconf:
-        if i not in take_out and not pattern.match(i):
+    machine = d.getVar('MACHINE', True)
+    if machine == 'raspberrypi':
+        # Remove egl and gles2 configure options
+        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
+        take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1']
+        put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1']
+        pattern = re.compile("--with-egl-platforms")
+        new_extra_oeconf = []
+        for i in extra_oeconf:
+            if i not in take_out and not pattern.match(i):
+                new_extra_oeconf.append(i)
+        for i in put_in:
             new_extra_oeconf.append(i)
-    for i in put_in:
-        new_extra_oeconf.append(i)
-    d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
+        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
 
-    # Remove egl and gles2 from provides
-    provides = d.getVar('PROVIDES', True).split()
-    take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1']
-    new_provides = []
-    for i in provides:
-        if i not in take_out:
-            new_provides.append(i)
-    d.setVar('PROVIDES', ' '.join(new_provides))
+        # Remove egl and gles2 from provides
+        provides = d.getVar('PROVIDES', True).split()
+        take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1']
+        new_provides = []
+        for i in provides:
+            if i not in take_out:
+                new_provides.append(i)
+        d.setVar('PROVIDES', ' '.join(new_provides))
 
-    # We are now machine specific
-    d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
+        # We are now machine specific
+        d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
 }

recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend

@@ -6,7 +6,7 @@ PRINC := "${@int(PRINC) + 5}"
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
-SRC_URI_append_raspberrypi = " file://xorg.conf.d/* "
+SRC_URI_append_raspberrypi = " file://xorg.conf.d/10-evdev.conf "
 
 do_install_append_raspberrypi () {
 	install -d ${D}/${sysconfdir}/X11/xorg.conf.d/

recipes-multimedia/omxplayer/omxplayer_git.bb

@@ -52,9 +52,12 @@ do_compile() {
 
 do_install() {
 	oe_runmake dist
+	mkdir -p ${D}${datadir}/fonts/truetype/freefont/
+	install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/
 }
 
 FILES_${PN} = "${bindir}/omxplayer* \
-               ${libdir}/omxplayer/lib*${SOLIBS}"
+               ${libdir}/omxplayer/lib*${SOLIBS} \
+               ${datadir}/fonts"
 
 FILES_${PN}-dev += "${libdir}/omxplayer/*.so"