diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2012-08-15 18:11:34 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2012-08-15 18:11:34 +0200 |
commit | fed17a27bb8dcaefd90b400602df3d19c018c4b9 (patch) | |
tree | f28ad96890b141c2238b204116148d3257ea7a5e /recipes | |
parent | 5739551f9517b4b1af153f81b2e13decd0265d3d (diff) |
L4T R15, oe-core Image V2.0Beta1
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/trdx-nv-binaries/files/nvsamples-oe.patch | 51 | ||||
-rw-r--r-- | recipes/trdx-nv-binaries/nvsamples.bb | 47 | ||||
-rw-r--r-- | recipes/trdx-nv-binaries/trdx-nv-binaries.bb | 3 | ||||
-rw-r--r-- | recipes/xorg-xserver/files/crash-hack.patch | 11 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend | 4 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend | 4 |
7 files changed, 121 insertions, 5 deletions
diff --git a/recipes/trdx-nv-binaries/files/nvsamples-oe.patch b/recipes/trdx-nv-binaries/files/nvsamples-oe.patch new file mode 100644 index 0000000..001c162 --- /dev/null +++ b/recipes/trdx-nv-binaries/files/nvsamples-oe.patch @@ -0,0 +1,51 @@ +diff -Naur nvsamples-1.0-r0.orig/nvsamples/make/nvdefs.mk nvsamples-1.0-r0/nvsamples/make/nvdefs.mk +--- nvsamples/make/nvdefs.mk.orig 2011-12-07 10:22:49.000000000 +0100 ++++ nvsamples/make/nvdefs.mk 2012-07-07 12:37:13.000000000 +0200 +@@ -1,4 +1,4 @@ +-NV_TOPDIR = $(HOME)/nvsamples ++NV_TOPDIR = $(WORKDIR)/nvsamples + NV_PLATFORM_DIR = $(NV_TOPDIR) + NV_KERNDIR = $(NV_TOPDIR)/../kernel + +@@ -42,17 +42,13 @@ + NV_PLATFORM_CPPFLAGS += -DKD + endif + +-NV_PLATFORM_LDFLAGS = ++NV_PLATFORM_LDFLAGS = -L/usr/X11R6.4/lib -lX11 -lICE -lSM + + NV_PLATFORM_SDK_INC_DIR = $(NV_TOPDIR)/include + NV_PLATFORM_SDK_LIB_DIR = $(NV_TOPDIR)/lib-target +-ROOTFS_LIB_DIR = $(NV_TOPDIR)/../T20_LinuxImageV1.0Beta4/rootfs/usr/lib + + NV_PLATFORM_SDK_INC = -I$(NV_PLATFORM_SDK_INC_DIR) +-NV_PLATFORM_SDK_LIB = -L$(NV_PLATFORM_SDK_LIB_DIR) \ +- -L$(ROOTFS_LIB_DIR) \ +- -Xlinker -rpath-link \ +- -Xlinker $(ROOTFS_LIB_DIR) ++NV_PLATFORM_SDK_LIB = -L$(NV_PLATFORM_SDK_LIB_DIR) + NV_PLATFORM_OPT = -Os -O2 + NV_PLATFORM_MATHLIB = -lm + NV_PLATFORM_THREADLIB = -lpthread +@@ -80,13 +76,13 @@ + + # compiler utilities + +-CROSSBIN = $(NV_TOPDIR)/../arm-2009q3/bin/arm-none-linux-gnueabi- +-CC = $(CROSSBIN)gcc +-CXX = $(CROSSBIN)g++ +-LD = $(CROSSBIN)gcc +-AR = $(CROSSBIN)ar +-RANLIB = $(CROSSBIN)ranlib +-STRIP = $(CROSSBIN)strip ++CROSSBIN = arm-angstrom-linux-gnueabi- ++CC ?= $(CROSSBIN)gcc ++CXX ?= $(CROSSBIN)g++ ++LD = $(CC) ++AR ?= $(CROSSBIN)ar ++RANLIB ?= $(CROSSBIN)ranlib ++STRIP ?= $(CROSSBIN)strip + + NV_CGDIR = $(NV_TOPDIR)/utils/Cg + HEXIFY = $(NV_CGDIR)/hexify.pl +Datei nvsamples-1.0-r0.orig/pseudo/pseudo.socket ist ein socket wÀhrend Datei nvsamples-1.0-r0/pseudo/pseudo.socket ein socket ist. diff --git a/recipes/trdx-nv-binaries/nvsamples.bb b/recipes/trdx-nv-binaries/nvsamples.bb new file mode 100644 index 0000000..d24b82e --- /dev/null +++ b/recipes/trdx-nv-binaries/nvsamples.bb @@ -0,0 +1,47 @@ +SECTION = "graphical/utils" +DESCRIPTION = "Nvidia samples for OpenGL ES, OpenGL ES headers" +LICENSE = "CLOSED" +DEPENDS = "trdx-nv-binaries" +RDEPENDS = "trdx-nv-binaries" + +PR = "r0" + +SRC_URI = "http://developer.toradex.com/files/toradex-dev/uploads/media/Colibri/Linux/Samples/nvsamples.tar.bz2 \ + file://nvsamples-oe.patch \ +" + +S = "${WORKDIR}/nvsamples" + +SRC_URI[md5sum] = "240b0beb0056dde2e6ac1538dc8b6684" +SRC_URI[sha256sum] = "2638beea80fd85fdc5f9443e6959c210e275e627f662266cd404ce7c68b0806d" + +#no gnu_hash in NVIDIA binaries, skip QA for this package +INSANE_SKIP_${PN} = "dev-so ldflags" + +FILES_${PN} += " \ + /home/root/textures/* \ +" + +do_compile () { + cd ${S}/samples/opengles2 + oe_runmake clean + oe_runmake WORKDIR=${WORKDIR} +} + +do_install () { +# install the sample code + install -d ${D}${bindir} + install -d ${D}/home/root/textures + install -m 0755 ${S}/samples/opengles2/ctree/ctree ${D}${bindir} + install -m 0644 ${S}/samples/opengles2/ctree/textures/* ${D}/home/root/textures + install -m 0755 ${S}/samples/opengles2/bubble/bubble ${D}${bindir} + install -m 0644 ${S}/samples/opengles2/bubble/textures/* ${D}/home/root/textures + install -m 0755 ${S}/samples/opengles2/gears/gears ${D}${bindir} + +# export OpenGL ES headers + for dir in EGL GLES2 KD KHR OpenMAX/il OpenMAX/ilclient + do + install -d ${D}${includedir}/$dir + install -m 0644 ${S}/include/$dir/* ${D}${includedir}/$dir + done +}
\ No newline at end of file diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb index a9aa513..ee9c8e1 100644 --- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb +++ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb @@ -1,6 +1,6 @@ DESCRIPTION = "binary files from Nvidia along with there configuration" LICENSE = "CLOSED" -PR = "r3" +PR = "r4" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -49,6 +49,7 @@ do_install_colibri-t20 () { install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/ install -m 0644 ${WORKDIR}/nvgstplayer.desktop ${D}/home/root/.local/share/applications/ ln -s libpcre.so.0.0.1 ${D}/usr/lib/libpcre.so.3 + ln -s libpcreposix.so.0.0.0 ${D}/usr/lib/libpcreposix.so.3 ln -s tegra_drv.abi11.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so ln -s libGLESv2.so ${D}/usr/lib//libGLESv2.so.2 ln -s libEGL.so ${D}/usr/lib/libEGL.so.1 diff --git a/recipes/xorg-xserver/files/crash-hack.patch b/recipes/xorg-xserver/files/crash-hack.patch new file mode 100644 index 0000000..0053a10 --- /dev/null +++ b/recipes/xorg-xserver/files/crash-hack.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.11.2/miext/damage/damage.c~ 2011-04-24 06:54:03.000000000 +0200 ++++ xorg-server-1.11.2/miext/damage/damage.c 2012-07-27 12:12:00.012473812 +0200 +@@ -596,6 +596,8 @@ + ScreenPtr pScreen = pDst->pDrawable->pScreen; + PictureScreenPtr ps = GetPictureScreen(pScreen); + damageScrPriv(pScreen); ++ //ugly hack, the xserver crashes when gtk programs use some fancy font rendering, this prevents this ++ maskFormat = 0; + + if (checkPictureDamage (pDst)) + { diff --git a/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend index 1615df3..883a3c2 100644 --- a/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1,5 +1,3 @@ -PRINC = "2" - -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" +PRINC = "3" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend b/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend new file mode 100644 index 0000000..77e6079 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend @@ -0,0 +1,4 @@ +# Ugly temporary hack to have Xserver not segfaulting +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://xserver-instrumented.patch;pnum=2" diff --git a/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend b/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend new file mode 100644 index 0000000..44ae424 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend @@ -0,0 +1,4 @@ +# Ugly temporary hack to have Xserver not segfaulting +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://crash-hack.patch" |