diff options
Diffstat (limited to 'recipes')
32 files changed, 463 insertions, 79 deletions
diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb index bcdba45d9f..d4c6347aeb 100644 --- a/recipes/angstrom/angstrom-uboot-scripts.bb +++ b/recipes/angstrom/angstrom-uboot-scripts.bb @@ -1,5 +1,7 @@ DESCRIPTION = "Various uboot scripts" +PR = "r1" + DEPENDS = "u-boot-mkimage-native" SRC_URI = "file://*.cmd" diff --git a/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd index 3ba551e015..79287445e1 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd @@ -1,4 +1,4 @@ setenv vram '16M' -setenv dvimode 'hd720 mem=88M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M' +setenv dvimode 'hd720 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M' run loaduimage run mmcboot diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd index 8991e704a4..cd43f1f03b 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd @@ -1,4 +1,4 @@ mmcinit fatload mmc 0 0x82000000 uImage -setenv bootargs 'console=tty1 omapfb.vrfb=1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' +setenv bootargs 'console=tty1 omapfb.vrfb=1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=99M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' bootm diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd index 4702d3f393..0a9c743bc9 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd @@ -1,4 +1,4 @@ mmcinit fatload mmc 0 0x82000000 uImage -setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=16M omapfb.vram=0:8M,1:4M,2:4M' +setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=99M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' bootm diff --git a/recipes/busybox/busybox-1.11.3/iptunnel.patch b/recipes/busybox/busybox-1.11.3/iptunnel.patch new file mode 100644 index 0000000000..18734fc527 --- /dev/null +++ b/recipes/busybox/busybox-1.11.3/iptunnel.patch @@ -0,0 +1,11 @@ +diff -Nurd busybox-1.11.3.orig//networking/libiproute/iptunnel.c busybox-1.11.3/networking/libiproute/iptunnel.c +--- busybox-1.11.3.orig//networking/libiproute/iptunnel.c 2009-10-29 12:49:58.000000000 +0100 ++++ busybox-1.11.3/networking/libiproute/iptunnel.c 2009-10-29 12:50:33.000000000 +0100 +@@ -21,6 +21,7 @@ + #ifndef __constant_htons + #define __constant_htons htons + #endif ++#include <asm/byteorder.h> + #include <linux/if_tunnel.h> + + #include "ip_common.h" /* #include "libbb.h" is inside */ diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 0ff65a41bc..753b402bee 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r22" +INC_PR = "r23" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb index 293608bcb3..0ec753f951 100644 --- a/recipes/busybox/busybox_1.11.3.bb +++ b/recipes/busybox/busybox_1.11.3.bb @@ -7,6 +7,7 @@ SRC_URI = "\ file://udhcpscript.patch;patch=1 \ file://B921600.patch;patch=1 \ file://fdisk_lineedit_segfault.patch;patch=1 \ + file://iptunnel.patch;patch=1 \ file://busybox-appletlib-dependency.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb new file mode 100644 index 0000000000..d3358a64e3 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia_svn.bb @@ -0,0 +1,35 @@ +# cdparanoia OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +PR ="r0" +LICENSE="GPL" + +PV = "10.2+svn${SRCREV}" + +SRC_URI="svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \ + file://fixes10.patch;patch=1 \ + file://Makefile.in.patch;patch=1 \ + file://interface_Makefile.in.patch;patch=1 \ + file://paranoia_Makefile.in.patch;patch=1 " + +S="${WORKDIR}/cdparanoia" + +PARALLEL_MAKE = "" + +inherit autotools + +do_install() { + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install +} + +do_stage() { + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} +} diff --git a/recipes/fastjar/fastjar-native.inc b/recipes/fastjar/fastjar-native.inc index df4d260713..e4d7084138 100644 --- a/recipes/fastjar/fastjar-native.inc +++ b/recipes/fastjar/fastjar-native.inc @@ -1,18 +1,8 @@ -DESCRIPTION = "jar replacement written in C." -HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL" - -INC_PR = "r2" - DEPENDS = "zlib-native" -SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" - S = "${WORKDIR}/fastjar-${PV}" -inherit autotools native +inherit native do_configure () { gnu-configize || die "failure running gnu-configize" diff --git a/recipes/fastjar/fastjar-native_0.95.bb b/recipes/fastjar/fastjar-native_0.95.bb index 6d2cdb4f24..342bf7ccfc 100644 --- a/recipes/fastjar/fastjar-native_0.95.bb +++ b/recipes/fastjar/fastjar-native_0.95.bb @@ -1,3 +1,4 @@ +require fastjar.inc require fastjar-native.inc PR = "${INC_PR}.1" diff --git a/recipes/fastjar/fastjar-native_0.98.bb b/recipes/fastjar/fastjar-native_0.98.bb index 6d2cdb4f24..342bf7ccfc 100644 --- a/recipes/fastjar/fastjar-native_0.98.bb +++ b/recipes/fastjar/fastjar-native_0.98.bb @@ -1,3 +1,4 @@ +require fastjar.inc require fastjar-native.inc PR = "${INC_PR}.1" diff --git a/recipes/fastjar/fastjar.inc b/recipes/fastjar/fastjar.inc new file mode 100644 index 0000000000..7c5439edb4 --- /dev/null +++ b/recipes/fastjar/fastjar.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "jar replacement written in C." +HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "zlib" + +INC_PR = "r3" + +SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" + +inherit autotools + +PACKAGES =+ "${PN}-grepjar" +FILES_${PN}-grepjar = "${bindir}/grepjar" diff --git a/recipes/fastjar/fastjar_0.98.bb b/recipes/fastjar/fastjar_0.98.bb new file mode 100644 index 0000000000..35392f23ee --- /dev/null +++ b/recipes/fastjar/fastjar_0.98.bb @@ -0,0 +1 @@ +require fastjar.inc diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index 5d72eb8d02..9b69f3a609 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" -INC_PR = "r6" +INC_PR = "r7" PACKAGES_DYNAMIC = "gst-plugin-*" @@ -35,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale') and not pkg.count('-static'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) diff --git a/recipes/images/ti-demo-x11-image.bb b/recipes/images/ti-demo-x11-image.bb new file mode 100644 index 0000000000..e37d183be9 --- /dev/null +++ b/recipes/images/ti-demo-x11-image.bb @@ -0,0 +1,31 @@ +# TI X11 demo image + +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" + +ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH = "exquisite exquisite-themes exquisite-theme-angstrom" + +export IMAGE_BASENAME = "ti-demo-x11-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + ${ANGSTROM_EXTRA_INSTALL} \ + task-demo-x11 \ + ${SPLASH} \ + " + +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image + diff --git a/recipes/mythtv/mythplugins/configure.patch b/recipes/mythtv/mythplugins/configure.patch index 6eae691e9a..fd747a92e5 100644 --- a/recipes/mythtv/mythplugins/configure.patch +++ b/recipes/mythtv/mythplugins/configure.patch @@ -7,7 +7,7 @@ Index: mythplugins-0.22rc1/configure if test "$taglib" = "yes" ; then - echo "INCLUDEPATH += `taglib-config --prefix`/include/taglib" >> ./mythmusic/mythmusic/config.pro -+ echo "INCLUDEPATH += ${STAGING_INCDIR}/taglib" >> ./mythmusic/mythmusic/config.pro ++ echo "INCLUDEPATH += `taglib-config --cflags | sed 's:-I::'`" >> ./mythmusic/mythmusic/config.pro fi fi diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb index 12d6f268da..63ef18ffec 100644 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -1,19 +1,16 @@ # todo: add mythweb -# todo: fix and add mythmusic # todo: fix and add zoneminder -#ALLOW_EMPTY_${PN} = "1" DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ - mythgame mythmovies mythnews mythvideo mythweather" + mythgame mythmusic mythmovies mythnews mythvideo mythweather" PV = "0.21+0.22rc2" -PR = "r0" +PR = "r1" #DEFAULT_PREFERENCE = "-1" QMAKE_PROFILES = "mythplugins.pro" SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ - file://MythBackend.php.patch;patch=1 \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ file://configure.patch;patch=1 \ @@ -24,15 +21,12 @@ S = "${WORKDIR}/mythplugins-0.22rc2" inherit qmake2 qt4x11 # zoneminder needs sql files -# mythmusic has a problem with cdparanoia and private; from the cdparanoia buglist -# 'private' as a reserved keyword now being enforced by GCC 4.3, causes a build failure (patched in SVN). EXTRA_OECONF = " \ --cross-prefix=${TARGET_PREFIX} \ --sysroot=${STAGING_DIR_HOST} \ --prefix=${prefix} \ --with-libdir-name=${STAGING_LIBDIR} \ --disable-opengl \ - --disable-mythmusic \ --disable-mythzoneminder \ \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -54,6 +48,7 @@ PACKAGES =+ "mytharchive mytharchive-dbg \ mythgallery mythgallery-dbg \ mythgame mythgame-dbg \ mythmovies mythmovies-dbg \ + mythmusic mythmusic-dbg \ mythnews mythnews-dbg \ mythvideo mythvideo-dbg \ mythweather mythweather-dbg" @@ -118,6 +113,72 @@ FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \ " FILES_mythmovies-dbg = "${bindir}/.debug/ignyte \ ${libdir}/mythtv/plugins/.debug/libmythmovies.so" +FILES_mythmusic = "${libdir}/mythtv/plugins/libmythmusic.so \ + ${datadir}/mythtv/mythmusic/* \ + ${datadir}/mythtv/i18n/mythmusic* \ + ${datadir}/mythtv/music_settings.xml \ + ${datadir}/mythtv/musicmenu.xml \ + ${datadir}/mythtv/themes/default/selectionbar.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_reg.png \ + ${datadir}/mythtv/themes/default/music-sel-bg.png \ + ${datadir}/mythtv/themes/default/mm_rip_banner.png \ + ${datadir}/mythtv/themes/default/mm_prev_on.png \ + ${datadir}/mythtv/themes/default/next_button_off.png \ + ${datadir}/mythtv/themes/default/mm_next_pushed.png \ + ${datadir}/mythtv/themes/default/stop_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_folder.png \ + ${datadir}/mythtv/themes/default/mm_left_arrow.png \ + ${datadir}/mythtv/themes/default/rew_button_on.png \ + ${datadir}/mythtv/themes/default/next_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_trans_background.png \ + ${datadir}/mythtv/themes/default/prev_button_off.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_sel.png \ + ${datadir}/mythtv/themes/default/ff_button_off.png \ + ${datadir}/mythtv/themes/default/mm_volume_tick.png \ + ${datadir}/mythtv/themes/default/stop_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress-fg.png \ + ${datadir}/mythtv/themes/default/mm_rip_background.png \ + ${datadir}/mythtv/themes/default/rew_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_next_off.png \ + ${datadir}/mythtv/themes/default/mm_next_on.png \ + ${datadir}/mythtv/themes/default/pause_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_nothumb.png \ + ${datadir}/mythtv/themes/default/stop_button_on.png \ + ${datadir}/mythtv/themes/default/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default/mm_prev_pushed.png \ + ${datadir}/mythtv/themes/default/pause_button_on.png \ + ${datadir}/mythtv/themes/default/play_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_progress_foreground.png \ + ${datadir}/mythtv/themes/default/pause_button_off.png \ + ${datadir}/mythtv/themes/default/play_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress_background.png \ + ${datadir}/mythtv/themes/default/mm_up_arrow.png \ + ${datadir}/mythtv/themes/default/prev_button_on.png \ + ${datadir}/mythtv/themes/default/mm_volume_background.png \ + ${datadir}/mythtv/themes/default/ff_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_prev_off.png \ + ${datadir}/mythtv/themes/default/miniplayer_background.png \ + ${datadir}/mythtv/themes/default/mm_progress-bg.png \ + ${datadir}/mythtv/themes/default/track_info_background.png \ + ${datadir}/mythtv/themes/default/mm_waiting.png \ + ${datadir}/mythtv/themes/default/play_button_on.png \ + ${datadir}/mythtv/themes/default/prev_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_right_arrow.png \ + ${datadir}/mythtv/themes/default/ff_button_on.png \ + ${datadir}/mythtv/themes/default/mm_down_arrow.png \ + ${datadir}/mythtv/themes/default/next_button_on.png \ + ${datadir}/mythtv/themes/default/mm_rating.png \ + ${datadir}/mythtv/themes/default/rew_button_off.png \ + ${datadir}/mythtv/themes/default/mm-titlelines.png \ + ${datadir}/mythtv/themes/default-wide/music-sel-bg.png \ + ${datadir}/mythtv/themes/default-wide/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default-wide/mm_volume_background.png \ + ${datadir}/mythtv/themes/default-wide/mm_waiting.png \ + ${datadir}/mythtv/themes/default-wide/mm-titlelines.png \ + ${datadir}/mythtv/themes/default/music-ui.xml \ + ${datadir}/mythtv/themes/default-wide/music-ui.xml \ + " +FILES_mythmusic-dbg = "${libdir}/mythtv/plugins/.debug/libmythmusic.so" FILES_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \ ${datadir}/mythtv/mythnews/* \ ${datadir}/mythtv/i18n/mythnews* \ diff --git a/recipes/mythtv/myththemes_0.21+0.22rc2.bb b/recipes/mythtv/myththemes_0.21+0.22rc2.bb new file mode 100644 index 0000000000..a3be987fe9 --- /dev/null +++ b/recipes/mythtv/myththemes_0.21+0.22rc2.bb @@ -0,0 +1,19 @@ +inherit qmake2 + +PV = "0.21+0.22rc2" +PR = "r0" + +FILES_${PN} =+ "${datadir}" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2" + +S = "${WORKDIR}/myththemes-0.22rc2" + +do_configure() { + ${S}/configure --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} +} + +do_install () { + oe_runmake install INSTALL_ROOT=${D} +} + diff --git a/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat b/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat new file mode 100644 index 0000000000..eeb3fdc141 --- /dev/null +++ b/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat @@ -0,0 +1,22 @@ +#!/bin/sh +# +# install bc-cat module and create device nodes +# +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +case "$1" in + start) echo -n "install bc-cat kernel module... " + modprobe -f bc-cat + rm -rf /dev/bc_cat + mknod /dev/bc_cat c `awk "\\$2==\"bc_cat\" {print \\$1}" /proc/devices` 0 + echo "done" + ;; + stop) echo -n "removing bc-cat kernel module... " + rmmod bc-cat + echo "done" + rm -rf /dev/bc_cat + ;; + *) echo "$0 <start/stop>" + ;; +esac + diff --git a/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb b/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb new file mode 100644 index 0000000000..7f5cc70b5d --- /dev/null +++ b/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb @@ -0,0 +1,2 @@ +require bc-cat.inc + diff --git a/recipes/powervr-drivers/bc-cat.inc b/recipes/powervr-drivers/bc-cat.inc new file mode 100644 index 0000000000..4213113393 --- /dev/null +++ b/recipes/powervr-drivers/bc-cat.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "Video texture streaming via IMG 3rdparty bufferclass (bc-cat) module" +DEPENDS = "libgles-omap3" +inherit module + +SRC_URI="http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-${PV}.tar.gz \ + file://rc.bccat \ +" + +S=${WORKDIR}/bc-cat-${PV} + +PACKAGES += " ${PN}-tests" +INSANE_SKIP_${PN}-tests = True +INSANE_SKIP_${PN} = True +FILES_${PN} = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat/bc_cat.ko" +FILES_${PN}-tests = "/usr/demos/bc-cat/*" +RDEPENDS_${PN}-tests += "${PN}" + +inherit update-rc.d + +INITSCRIPT_NAME = "bccat-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." + +do_compile () { + # build kernel module + cd ${S}/module + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + make GSDK_KM_DIR=${STAGING_INCDIR} \ + KERNEL_DIR=${STAGING_KERNEL_DIR} \ + CROSS_COMPILE=${TARGET_PREFIX} + + # build test application + cd ${S}/test + make GSDK_KM_DIR=${STAGING_INCDIR} \ + KERNEL_DIR=${STAGING_KERNEL_DIR} \ + CROSS_COMPILE=${TARGET_PREFIX} \ + X11BUILD=1 +} + +do_install () { + # install kernel module + install -d ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat + cp ${S}/module/bc_cat.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/rc.bccat ${D}${sysconfdir}/init.d/bccat-init + + # install test app + install -d ${D}/usr/demos/bc-cat + cp ${S}/test/gles1_bc_mmap ${D}/usr/demos/bc-cat/ + cp ${S}/test/gles1_bc_webcam ${D}/usr/demos/bc-cat/ +} + diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 23c084c207..1f098da1fe 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -111,7 +111,7 @@ do_install () { install -d ${D}${sysconfdir} echo "[default]" > ${D}${sysconfdir}/powervr.ini - echo "WindowSystem=libpvrPVR2D_FLIPWSEGL.so" >> ${D}${sysconfdir}/powervr.ini + echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so" >> ${D}${sysconfdir}/powervr.ini install -d ${D}${prefix}/demos/OGLES/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Binaries/CommonX11/Demos/* ${D}${prefix}/demos/OGLES/ @@ -129,6 +129,9 @@ do_stage () { cp -pP ${BINLOCATION}/*.a ${STAGING_LIBDIR} install -d ${STAGING_INCDIR} + cp -pPR ${S}/GFX_Linux_KM/include4 ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_KM/services4 ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${STAGING_INCDIR}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${STAGING_INCDIR}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb index 3a90c4e68a..8b51813389 100644 --- a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb +++ b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "1" # download required binary distribution from: # http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_00_00_09.bin -PR = "r1" +PR = "r2" SGXPV = "3_00_00_09" IMGPV = "1.3.13.1832" diff --git a/recipes/taglib/taglib_1.5.bb b/recipes/taglib/taglib_1.5.bb index 507b8ce159..6c90d75ea4 100644 --- a/recipes/taglib/taglib_1.5.bb +++ b/recipes/taglib/taglib_1.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ file://add_missing_exports_fix.diff;patch=1 \ @@ -17,6 +17,7 @@ inherit cmake pkgconfig binconfig do_stage() { install -d ${STAGING_INCDIR}/${PN} install -m 0644 ${D}/${includedir}/${PN}/*.h ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/*.tcc ${STAGING_INCDIR}/${PN} oe_libinstall -C ${PN} -so libtag ${STAGING_LIBDIR} } diff --git a/recipes/tasks/task-demo-x11.bb b/recipes/tasks/task-demo-x11.bb new file mode 100644 index 0000000000..39b68e7b43 --- /dev/null +++ b/recipes/tasks/task-demo-x11.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Task for ti-demo-x11" + +PR = "r1" + +inherit task + +ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default" + +RDEPENDS_${PN} = "\ + task-base-extended \ + task-gstreamer-ti \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-zeroconf-audio \ + angstrom-led-config \ + gpe-scap \ + mime-support e-wm ${ECONFIG} \ + xterm \ + firefox midori \ + hicolor-icon-theme gnome-icon-theme \ + mplayer \ + angstrom-gnome-icon-theme-enable \ + picodlp-control \ + connman-gnome \ + gnome-bluetooth \ + alsa-utils-aplay \ + alsa-utils-alsamixer \ + libgles-omap3 \ + libgles-omap3-demos \ + libgles-omap3-tests \ + bc-cat-omap3-module-tests \ +" + +# Install all kernel modules +RRECOMMENDS_${PN} += " \ + kernel-modules \ + rt73-firmware \ + zd1211-firmware \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +RRECOMMENDS_${PN}_append_armv7a = " \ + gnash gnash-browser-plugin \ + omapfbplay \ +" + diff --git a/recipes/tasks/task-gstreamer-ti.bb b/recipes/tasks/task-gstreamer-ti.bb index cf05c7ce6b..e7e13e5635 100644 --- a/recipes/tasks/task-gstreamer-ti.bb +++ b/recipes/tasks/task-gstreamer-ti.bb @@ -1,18 +1,28 @@ -# Task for dsp accelerated gstreamer plugins +# Task for installing gstreamer plugins on TI platforms -PR = "r1" +PR = "r2" -DEPENDS = "gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-ffmpeg gstreamer-ti gst-openmax" +DEPENDS = "gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly" + +GST_CODEC_ELEMENT = " \ + gstreamer-ti \ + gstreamer-ti-demo-script \ +" + +GST_CODEC_ELEMENT_am3517-evm = "\ + gst-ffmpeg \ + gst-omapfb \ +" RDEPENDS_${PN} = " \ -gst-plugins-base-meta \ -gst-plugins-good-meta \ -gst-plugins-bad-meta \ -gst-plugins-ugly-meta \ -gst-ffmpeg \ -gst-openmax \ -gstreamer-ti \ + gst-plugins-base-meta \ + gst-plugins-good-meta \ + gst-plugins-bad-meta \ + gst-plugins-ugly-meta \ + ${GST_CODEC_ELEMENT} \ " inherit task +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch index 27e1c731f5..7a76f370bc 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch @@ -1,6 +1,6 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac --- ticodecplugin/configure.ac 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/configure.ac 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/configure.ac 2009-10-28 06:35:20.000000000 -0500 @@ -25,6 +25,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") @@ -10,14 +10,14 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac dnl check for tools AC_PROG_CC diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am ---- ticodecplugin/src/Makefile.am 2009-10-10 14:27:46.000000000 -0500 -+++ ticodecplugin.new/src/Makefile.am 2009-10-10 15:50:24.000000000 -0500 +--- ticodecplugin/src/Makefile.am 2009-10-28 06:27:14.000000000 -0500 ++++ ticodecplugin.new/src/Makefile.am 2009-10-28 06:35:20.000000000 -0500 @@ -4,16 +4,16 @@ plugin_LTLIBRARIES = libgstticodecplugin.la # sources used to compile this plug-in --libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c -+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c omapfb.c yuv.S +-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c ++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c omapfb.c yuv.S # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed @@ -34,18 +34,18 @@ diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am # XDC Configuration CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecplugin.c ---- ticodecplugin/src/gstticodecplugin.c 2009-10-10 14:27:46.000000000 -0500 -+++ ticodecplugin.new/src/gstticodecplugin.c 2009-10-10 15:52:51.000000000 -0500 -@@ -46,6 +46,7 @@ - #include "gsttividenc1.h" +--- ticodecplugin/src/gstticodecplugin.c 2009-10-28 06:27:14.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecplugin.c 2009-10-28 06:36:28.000000000 -0500 +@@ -47,6 +47,7 @@ #include "gsttiaudenc1.h" #include "gsttividresize.h" + #include "gsttidmaiperf.h" +#include "omapfb.h" /* entry point to initialize the plug-in * initialize the plug-in itself -@@ -153,6 +154,13 @@ - GST_TYPE_TIVIDRESIZE)) +@@ -161,6 +162,13 @@ + GST_TYPE_DMAIPERF)) return FALSE; + env_value = getenv("GST_omapdmaifbsink_DISABLE"); @@ -60,7 +60,7 @@ diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecp diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c --- ticodecplugin/src/omapfb.c 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.c 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/omapfb.c 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,1005 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1069,7 +1069,7 @@ diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c +} diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h --- ticodecplugin/src/omapfb.h 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.h 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/omapfb.h 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1215,7 +1215,7 @@ diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h +#endif /* GST_OMAPFB_H */ diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S --- ticodecplugin/src/yuv.S 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/yuv.S 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/yuv.S 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,117 @@ +/* + Copyright (C) 2008 Mans Rullgard diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh new file mode 100644 index 0000000000..9a19cf926b --- /dev/null +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# configure kernel modules for TI DSP based gstreamer plugin +# +# Default Memory Map +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 99 MB Linux +# 0x86300000 16 MB CMEM +# 0x87300000 13 MB CODEC SERVER +# + +# Disable XDM 0.9 elements +export GST_TI_TIViddec_DISABLED=1 +export GST_TI_TIAuddec_DISABLED=1 +export GST_TI_TIVidenc_DISABLED=1 +export GST_TI_TIImgdec_DISABLED=1 +export GST_TI_TIImgenc_DISABLED=1 + +load_module() { + # + # CMEM Allocation + # 1x5250000 Circular buffer + # 6x829440,1x691200 Video buffers (max D1 PAL) + # 1x345600 Underlying software components (codecs, etc.) + # 1x1 Dummy buffer used during final flush + modprobe cmemk allowOverlap=1 phys_start=0x86300000 phys_end=0x87300000 \ + pools=1x5250000,6x829440,1x345600,1x691200,1x1 + + # insert DSP/BIOS Link driver + modprobe dsplinkk + + # insert Local Power Manager driver + modprobe lpm_omap3530 + + # insert SDMA driver + modprobe sdmak +} + +unload_module() { + rmmod cmemk + rmmod lpm_omap3530 + rmmod dsplinkk + rmmod sdmak +} + +case "$1" in + start) + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + stop) + echo -n "Unloading kernel module ..." + unload_module + echo " done" + ;; + restart) + echo -n "Unloading kernel module ..." + unload_module + echo " done" + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + *) + echo "$0 <start/stop/restart>" + ;; +esac + diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index a916bae749..099ca1d91b 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -2,15 +2,19 @@ DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors" require ti-paths.inc +inherit update-rc.d inherit autotools DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" +GST_TI_RC_SCRIPT_armv7a="gstreamer-ti-omap3530-rc.sh" + # Fetch source from svn repo -SRCREV = "407" +SRCREV = "459" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ file://gstreamer-ti-tracker-462.patch;patch=1 \ file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch;patch=1 \ + file://${GST_TI_RC_SCRIPT} \ " SRC_URI_append_armv7a = " \ @@ -22,6 +26,8 @@ PR = "r37" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" +INITSCRIPT_NAME = "gstti-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." XDC_TARGET = gnu.targets.arm.GCArmv5T XDC_PLATFORM_dm6446-evm = ti.platforms.evmDM6446 @@ -58,6 +64,9 @@ do_install_prepend () { echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh fi chmod 0755 ${D}/${installdir}/gst -R + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/${GST_TI_RC_SCRIPT} ${D}${sysconfdir}/init.d/gstti-init } pkg_postinst_gstreamer-ti-demo-script () { @@ -75,7 +84,7 @@ gst-plugins-bad-meta \ gst-plugins-ugly-meta \ ti-dmai-apps" -FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" diff --git a/recipes/ti/ti-dsplink-module_1.61.3.bb b/recipes/ti/ti-dsplink-module_1.61.3.bb index c19ed7e8c7..2cdf1a8e28 100644 --- a/recipes/ti/ti-dsplink-module_1.61.3.bb +++ b/recipes/ti/ti-dsplink-module_1.61.3.bb @@ -8,7 +8,7 @@ DEPENDS += "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update # tconf from xdctools dislikes '.' in pwd :/ #This is a kernel module, don't set PR directly -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" PV = "1613" SRC_URI = "http://install.source.dir.local/dsplink_1_61_03.tar.gz \ @@ -40,6 +40,10 @@ STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" do_compile() { + # asm/page.h is gone with linux-libc-headers 2.6.31. + # We can safely sed it out since it has been empty for the past 2 years + sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c + # Run perl script to create appropriate makefiles (v1.60 and up) ( cd ${DSPLINK} diff --git a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf index 983bb0823a..446ac9777f 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf @@ -1,29 +1,24 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection +Section "Module" + Load "extmod" + Load "dbe" +EndSection -Section "Monitor" +Section "Monitor" Identifier "Builtin Default Monitor" -EndSection +EndSection -Section "Device" +Section "Device" Identifier "Builtin Default fbdev Device 0" Driver "omapfb" -EndSection +EndSection -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 2f6a33161b..ceaf199932 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r13" +PR = "r14" SRC_URI = "file://xorg.conf" |