22 Commits
dora ... daisy

Author SHA1 Message Date
fdf3472dbc libdri2: added missing pkgconfig inherit
Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>
(cherry picked from commit 0ed1eadb95)
2014-11-11 20:03:54 +01:00
b89a9af8bd Merge pull request #72 from net147/daisy
[daisy] sunxi-mali: set LICENSE to Proprietary
2014-09-29 08:02:59 +02:00
10cbdb0e70 sunxi-mali: set LICENSE to Proprietary
Fixes the following warning:
"WARNING: sunxi-mali: No generic license file exists for:
proprietary-binary in any provider"

Signed-off-by: Jonathan Liu <net147@gmail.com>
2014-09-29 14:01:58 +10:00
41596163b4 Fix build and usage of sunxi-mali 2014-09-11 14:26:46 +00:00
869df3ec12 Fix the SHA1 revision to point to the correct commit 2014-09-04 08:10:07 +00:00
23be71c68c Update mali and disable dbg package for sunxi-mali
Latest sunxi-mali was failing when splitting package and creating the
-dbg package for Mali.so. Debug package is now disabled for sunxi-mali.
It's proprietary anyway and we can't do anything about it.
2014-09-04 07:49:25 +00:00
d5624f4b42 README: update email
Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>
2014-07-26 14:39:31 +02:00
620311104b Merge pull request #57 from RehiveTech/fix-sunxi-board-fex
Simple fixes for sunxi-board-fex
2014-04-23 18:18:19 +02:00
8f1f5535ab sunxi-board-fex: trivial: Remove invalid comment
Signed-off-by: Tomas Novotny <novotny@rehivetech.com>
2014-04-23 16:56:02 +02:00
969a4e6b0b sunxi-board-fex: Fix recipe versioning
Git repository sunxi-boards is not versioned. For now there is no
tracking of a git revision in the recipe. This patch fixes it. Related
discussion:
http://article.gmane.org/gmane.comp.handhelds.openembedded/62130

Signed-off-by: Tomas Novotny <novotny@rehivetech.com>
2014-04-23 16:46:51 +02:00
00b9ae419e Merge pull request #56 from koenkooi/ubootmachine-fix
machines: sync u-boot config name with boards.cfg
2014-04-16 09:48:29 +02:00
944e8111b8 machines: sync u-boot config name with boards.cfg
Recent u-boots (e.g. 2014.04-rc) need the _config appended to work, so
add that and sync the names with boards.cfg as well.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2014-04-12 19:14:36 +02:00
ec4b40754e Update libump: remove PE 2014-04-11 07:49:41 +02:00
1d2299057b Sunxi-mali depends on libump 2014-04-08 15:05:53 +00:00
3867ea9cb3 Add libump from here : https://github.com/linux-sunxi/libump 2014-04-08 15:05:08 +00:00
1b5c971774 Detect x11 and wayland support in distro and install framebuffer libs in case of wayland and x11 ones otherwise. 2014-04-08 10:07:15 +00:00
f1e777d552 Merge pull request #55 from koenkooi/kernel-update
linux 3.4: update to latest git
2014-04-08 11:35:47 +02:00
070639d970 linux 3.4: update to latest git
Changes include, but are not limited to:

* 32bit hdmi audio support
* MMC support for sun41
* SPI fixes
* AXP thermal support

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2014-04-08 09:55:42 +02:00
c59ae55bd0 Merge pull request #54 from vonfritz/upstream-master
remove unnedded patches and confs
2014-04-07 01:19:28 +02:00
9eb93456ae Merge pull request #53 from SaskatoonTechworks/fix_princ
Remove PRINCs
2014-03-28 18:35:19 +01:00
cafb3cec05 Remove PRINCs
The PR server is expected to be used now, so use it
for all meta-sunxi's bbappends.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
2014-03-25 16:13:55 -06:00
9bf053c15a remove unnedded patches and confs 2014-03-23 10:18:57 +01:00
17 changed files with 37 additions and 44 deletions

View File

@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "cubieboard"
UBOOT_MACHINE = "Cubieboard_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa7.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "cubieboard2"
UBOOT_MACHINE = "Cubieboard2_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa7.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "cubietruck"
UBOOT_MACHINE = "Cubietruck_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "mele_a1000"
UBOOT_MACHINE = "Mele_A1000_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "mele_a1000g"
UBOOT_MACHINE = "Mele_A1000G_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -11,7 +11,7 @@ require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "a10-olinuxino-lime"
UBOOT_MACHINE = "A10-OLinuXino-Lime_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

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

View File

@ -10,7 +10,7 @@ require conf/machine/include/tune-cortexa8.inc
require conf/machine/include/sunxi.inc
require conf/machine/include/sunxi-mali.inc
UBOOT_MACHINE = "a13-olinuxino"
UBOOT_MACHINE = "A13-OLinuXino_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -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"
UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"

View File

@ -4,10 +4,11 @@ DESCRIPTION = "Handler for Allwinner's FEX files"
LICENSE = "CC0-1.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
DEPENDS = "sunxi-tools-native"
PV = "1.0"
PR = "r6"
PV = "1.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
# Increase PV with SRCREV change
SRCREV = "5e63e3da42254d3c23eb6436a03ed1d32fb11e98"
S = "${WORKDIR}/git"
@ -52,6 +53,4 @@ do_package_write_rpm[noexec] = "1"
do_package_write_deb[noexec] = "1"
do_populate_sysroot[noexec] = "1"
# Remember to add machine entry to IMAGE_DEPENDS in sdcard_image-a10.bbclass
# when adding new machines.
COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a10s|olinuxino-a10|olinuxino-a13|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"

View File

@ -1,12 +1,10 @@
DESCRIPTION = "libGLES for the A10/A13 Allwinner processor with Mali 400 (X11)"
LICENSE = "proprietary-binary"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://README;md5=1b81a178e80ee888ee4571772699ab2c"
COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|cubietruck|olinuxino-a10|olinuxino-a13|olinuxino-a20)"
DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2 libump"
# These libraries shouldn't get installed in world builds unless something
# explicitly depends upon them.
EXCLUDE_FROM_WORLD = "1"
@ -26,8 +24,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@
PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2,"
do_configure() {
DESTDIR=${D}/ VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make config
}
do_install() {
@ -35,21 +34,21 @@ 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/
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 -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}
@ -61,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
@ -72,7 +72,7 @@ do_install() {
FILES_${PN} += "${libdir}/lib*.so"
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"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

View File

@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=edf7fb6071cae7ec80d537a05ee17198
inherit autotools
PE = "1"
PV = "r4p0-00rel0+git${SRCPV}"
SRCREV_pn-${PN} = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"

View File

@ -1,6 +1,4 @@
FILESEXTRAPATHS := "${THISDIR}/${PN}"
PRINC := "${@int(PRINC) + 1}"
SRC_URI += "file://tslib.patch"

View File

@ -13,5 +13,5 @@ SRCREV_pn-${PN} = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"
S = "${WORKDIR}/git"
inherit autotools
inherit autotools pkgconfig

View File

@ -5,11 +5,11 @@ DESCRIPTION = "X.Org X server -- A10/A13 display driver"
LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://COPYING;md5=f91dc3ee5ce59eb4b528e67e98a31266"
DEPENDS += "sunxi-mali libump"
DEPENDS += "sunxi-mali"
PE = "3"
PV = "0.5.1+git${SRCPV}"
SRCREV_pn-${PN} = "4c7313c6db9ee770f39740c735268c88fcd136cf"
PV = "0.3.1+git${SRCPV}"
SRCREV_pn-${PN} = "eed17d5586c3b4dfcf0b5976e8b947b171d4897c"
SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
file://20-fbturbo.conf"

View File

@ -1,4 +1 @@
FILESEXTRAPATHS := "${THISDIR}/${PN}"
PRINC := "${@int(PRINC) + 1}"

View File

@ -7,8 +7,8 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a10|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"
PV = "3.4.79"
# Last tested version by myself"
SRCREV_pn-${PN} = "8ea347bcb4b4a5e50ec0343afac579e933ce8402"
# Last tested version by myself
SRCREV_pn-${PN} = "b6eb2b9b770537ff320c52342174d2bed56b574d"
MACHINE_KERNEL_PR_append = "a"