libdri2: added missing pkgconfig inherit

Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>
(cherry picked from commit 0ed1eadb95)

conf/machine/include/sunxi.inc

@@ -14,5 +14,3 @@ IMAGE_CLASSES += "sdcard_image-sunxi"
 IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"

conf/machine/olinuxino-a10.conf

@@ -17,4 +17,8 @@ UBOOT_LOADADDRESS = "0x40008000"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
+MACHINE_EXTRA_RRECOMMENDS += "\
+ kernel-module-sw-ahci-platform \
+"
+
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"

conf/machine/olinuxino-a10s.conf

@@ -10,7 +10,7 @@ require conf/machine/include/tune-cortexa8.inc
 require conf/machine/include/sunxi.inc
 
 
-UBOOT_MACHINE = "A10s-OLinuXino-Micro_config"
+UBOOT_MACHINE = "A10s-OLinuXino-M_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

conf/machine/olinuxino-a20.conf

@@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa7.inc
 require conf/machine/include/sunxi.inc
 require conf/machine/include/sunxi-mali.inc
 
-UBOOT_MACHINE = "A20-OLinuXino-Micro_config"
+UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

conf/machine/olinuxino-a20lime.conf

@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Olimex A20-OLinuXino Lime (4GB) Board
-#@DESCRIPTION: Machine configuration for the Olimex A20-OLinuXino Lime Board, based on Allwinner A20 CPU
-#https://github.com/OLIMEX/OLINUXINO
-
-require conf/machine/include/tune-cortexa7.inc
-require conf/machine/include/sunxi.inc
-require conf/machine/include/sunxi-mali.inc
-
-UBOOT_MACHINE = "A20-OLinuXino-Lime_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"

conf/machine/olinuxino-a20som.conf

@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Olimex A20-SOM
-#@DESCRIPTION: Machine configuration for the Olimex A20-SOM Evaluation Board, based on Allwinner A20 CPU
-#https://github.com/OLIMEX/SOM
-
-require conf/machine/include/tune-cortexa7.inc
-require conf/machine/include/sunxi.inc
-require conf/machine/include/sunxi-mali.inc
-
-UBOOT_MACHINE = "Olimex_A20-SOM_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"

recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb

@@ -9,7 +9,7 @@ PR = "r0"
 
 SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
 # Increase PV with SRCREV change
-SRCREV = "442f0669fec0689dda3e529bcd8be9e554868b5f"
+SRCREV = "5e63e3da42254d3c23eb6436a03ed1d32fb11e98"
 
 S = "${WORKDIR}/git"
 SUNXI_FEX_FILE_mele = "sys_config/a10/mele_a1000.fex"
@@ -18,8 +18,6 @@ SUNXI_FEX_FILE_olinuxino-a10s = "sys_config/a10s/a10s-olinuxino-m.fex"
 SUNXI_FEX_FILE_olinuxino-a10 = "sys_config/a10/a10-olinuxino-lime.fex"
 SUNXI_FEX_FILE_olinuxino-a13 = "sys_config/a13/a13-olinuxino.fex"
 SUNXI_FEX_FILE_olinuxino-a20 = "sys_config/a20/a20-olinuxino_micro.fex"
-SUNXI_FEX_FILE_olinuxino-a20som = "sys_config/a20/olimex_a20_som.fex"
-SUNXI_FEX_FILE_olinuxino-a20lime = "sys_config/a20/a20-olinuxino_lime.fex"
 SUNXI_FEX_FILE_cubieboard = "sys_config/a10/cubieboard.fex"
 SUNXI_FEX_FILE_cubieboard2 = "sys_config/a20/cubieboard2.fex"
 SUNXI_FEX_FILE_cubietruck= "sys_config/a20/cubietruck.fex"
@@ -55,4 +53,4 @@ do_package_write_rpm[noexec] = "1"
 do_package_write_deb[noexec] = "1"
 do_populate_sysroot[noexec] = "1"
 
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a10s|olinuxino-a10|olinuxino-a13|olinuxino-a20|olinuxino-a20som|olinuxino-a20lime|cubieboard|cubieboard2|cubietruck)"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a10s|olinuxino-a10|olinuxino-a13|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"

recipes-bsp/u-boot/u-boot_git.bb

@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 # No patches for other machines yet
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a10|olinuxino-a20|olinuxino-a20som|olinuxino-a20lime|cubieboard|cubieboard2|cubietruck)"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a10|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"
 
 DEFAULT_PREFERENCE_mele= "1"
 DEFAULT_PREFERENCE_meleg= "1"
@@ -12,8 +12,6 @@ DEFAULT_PREFERENCE_olinuxino-a13= "1"
 DEFAULT_PREFERENCE_olinuxino-a10s= "1"
 DEFAULT_PREFERENCE_olinuxino-a10= "1"
 DEFAULT_PREFERENCE_olinuxino-a20= "1"
-DEFAULT_PREFERENCE_olinuxino-a20som= "1"
-DEFAULT_PREFERENCE_olinuxino-a20lime= "1"
 DEFAULT_PREFERENCE_cubieboard="1"
 DEFAULT_PREFERENCE_cubieboard2="1"
 DEFAULT_PREFERENCE_cubietruck="1"
@@ -21,8 +19,8 @@ DEFAULT_PREFERENCE_cubietruck="1"
 SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
 
 PE = "1"
-PV = "v2014.04+git${SRCPV}"
+PV = "v2013.10+v2014.01-rc1"
-SRCREV = "ee425f94b488a4304c136a171bb8fdec0d835032"
+SRCREV = "d854c4de2f57107e35893c591f856f8f6d0ccc5d"
 
 
 S = "${WORKDIR}/git"

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "libGLES for the A10/A13 Allwinner processor with Mali 400 (X11)"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://README;md5=1b81a178e80ee888ee4571772699ab2c"
 
-COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|cubietruck|olinuxino-a10|olinuxino-a13|olinuxino-a20|olinuxino-a20som|olinuxino-a20lime)"
+COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|cubietruck|olinuxino-a10|olinuxino-a13|olinuxino-a20)"
 
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.
@@ -13,8 +13,8 @@ PROVIDES = "virtual/libgles1 virtual/libgles2 virtual/egl"
 inherit distro_features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-SRCREV_pn-${PN} = "d343311efc8db166d8371b28494f0f27b6a58724"
+SRCREV_pn-${PN} = "95bbd40135f96b473d4c713317e485d0049580cd"
-SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git"
+SRC_URI = "gitsm://github.com/raoulh/sunxi-mali.git"
 
 S = "${WORKDIR}/git"
 
@@ -24,16 +24,34 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@
 PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
 PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2,"
 
-INHIBIT_PACKAGE_STRIP = "1"
 
 do_configure() {
          DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make config
 }
 
 do_install() {
+
+    make -f Makefile.pc
+
+    # install headers
+    install -d -m 0755                                ${D}${includedir}/EGL
+    install -m 0755 ${S}/include/EGL/*.h              ${D}${includedir}/EGL/
+    install -d -m 0755                                ${D}${includedir}/GLES
+    install -m 0755 ${S}/include/GLES/*.h             ${D}${includedir}/GLES/
+    install -d -m 0755                                ${D}${includedir}/GLES2
+    install -m 0755 ${S}/include/GLES2/*.h            ${D}${includedir}/GLES2/
+    install -d -m 0755                                ${D}${includedir}/KHR
+    install -m 0755 ${S}/include/KHR/*.h              ${D}${includedir}/KHR/
+
+    # Copy the .pc files
+    install -d -m 0755                                ${D}${libdir}/pkgconfig
+    install -m 0644  ${S}/egl.pc                      ${D}${libdir}/pkgconfig/
+    install -m 0644  ${S}/gles_cm.pc                  ${D}${libdir}/pkgconfig/
+    install -m 0644  ${S}/glesv2.pc                   ${D}${libdir}/pkgconfig/
+
     install -d ${D}${libdir}
     install -d ${D}${includedir}
-
+    
     make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install
     make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install -C include
 
@@ -42,6 +60,7 @@ do_install() {
 
     mv ${D}${libdir}/libMali.so ${D}${libdir}/libMali.so.3
     ln -sf libMali.so.3 ${D}${libdir}/libMali.so
+    ln -sf libUMP.so.3 ${D}${libdir}/libUMP.so
 
     for flib in libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0 ; do
         rm ${D}${libdir}/$flib
@@ -51,6 +70,9 @@ do_install() {
 
 # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
 FILES_${PN} += "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig/*"
 # These are closed binaries generated elsewhere so don't check ldflags & text relocations
-INSANE_SKIP_${PN} = "dev-so ldflags textrel"
+INSANE_SKIP_${PN} = "dev-so ldflags textrel split-strip"
+
+# Inhibit warnings about files being stripped, we can't do anything about it.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

recipes-graphics/tslib/tslib_1.1.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
 SRC_URI += "file://tslib.patch"
 

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

@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS := "${THISDIR}/${PN}"

recipes-kernel/linux/linux_3.4.bb

@@ -2,23 +2,20 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a10|olinuxino-a20|olinuxino-a20som|olinuxino-a20lime|cubieboard|cubieboard2|cubietruck)"
+KERNEL_IMAGETYPE = "uImage"
 
-PV = "3.4.90"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a10|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"
-PR = "r1"
+
+PV = "3.4.79"
 # Last tested version by myself
-SRCREV_pn-${PN} = "e37d760b363888f3a65cd6455c99a75cac70a7b8"
+SRCREV_pn-${PN} = "b6eb2b9b770537ff320c52342174d2bed56b574d"
 
 MACHINE_KERNEL_PR_append = "a"
 
 SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
-        http://archlinuxarm.org/builder/src/0001-cgroup-add-xattr-support-sunxi.patch;name=cgroup-patch \
         file://defconfig \
         "
 
-SRC_URI[cgroup-patch.md5sum] = "4aa5087e3396f3179b61ccd478e9e604"
-SRC_URI[cgroup-patch.sha256sum] = "f9f9cb55eb6f8abf322830afd7a5f4a090e539add75e0ed1f1016b5351a9b533"
-
 S = "${WORKDIR}/git"
 
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"

recipes-support/sunxi-tools/sunxi-tools_git.bb

@@ -1,4 +1,4 @@
-DESCRIPTION = "Tools to help hacking Allwinner A10 and A20"
+DESCRIPTION = "Tools to help hacking Allwinner A10"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"