libgles-omap3: complete the previous commit, I suck at using git mergetool

15 files changed, 7 insertions, 361 deletions

diff --git a/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat b/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat
deleted file mode 100644
index eeb3fdc141..0000000000
--- a/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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
deleted file mode 100644
index 7f5cc70b5d..0000000000
--- a/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require bc-cat.inc
-
diff --git a/recipes/powervr-drivers/bc-cat.inc b/recipes/powervr-drivers/bc-cat.inc
deleted file mode 100644
index 4213113393..0000000000
--- a/recipes/powervr-drivers/bc-cat.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-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-3.00.00.09/rc.pvr b/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
deleted file mode 100755
index 1b3c274593..0000000000
--- a/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-CPUTYPE="$(cputype)"
-
-if [ "$1" = "" ]; then
-	echo PVR-INIT: Please use start, stop, or restart.
-	exit 1
-fi
-
-if [ "$1" = "stop" -o  "$1" = "restart" ]; then
-	echo Stopping PVR
-	#rmmod bc_example
-	rmmod omaplfb 2>/dev/null
-	rmmod pvrsrvkm 2>/dev/null
-fi
-
-if [ "$1" = "stop" ]; then
-	exit 0
-fi
-
-if [ $CPUTYPE = "OMAP3530" ]; then
-	echo Starting PVR
-	insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
-	#modprobe bc_example
-	modprobe omaplfb
-
-	pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
-
-	if [ -e /dev/pvrsrvkm ] ; then 
-		rm -f /dev/pvrsrvkm
-	fi
-
-	mknod /dev/pvrsrvkm c $pvr_maj 0 
-	chmod 666 /dev/pvrsrvkm
-
-	touch /etc/powervr-esrev
-
-	SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
-	ES_REVISION="$(cat /proc/cpuinfo | grep "CPU revision" | awk -F: '{print $2}')"
-
-	if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
-		echo -n "Starting SGX fixup for"
-		if [ "${ES_REVISION}" = " 3" ] ; then
-			echo " ES3.x"
-			cp -a /usr/lib/ES3.0/* /usr/lib
-			cp -a /usr/bin/ES3.0/* /usr/bin	
-		else
-			echo "ES 2.x"
-			cp -a /usr/lib/ES2.0/* /usr/lib
-			cp -a /usr/bin/ES2.0/* /usr/bin	
-		fi
-		echo "${ES_REVISION}" > /etc/powervr-esrev
-	fi
-	/usr/bin/pvrsrvinit
-else
-	echo No SGX hardware, not starting PVR
-fi
-
diff --git a/recipes/powervr-drivers/libgles-omap3-3.01.00.02/rc.pvr b/recipes/powervr-drivers/libgles-omap3-3.01.00.02/rc.pvr
deleted file mode 100755
index 2d34c4c0bc..0000000000
--- a/recipes/powervr-drivers/libgles-omap3-3.01.00.02/rc.pvr
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/usr/sbin
-
-BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
-YRES="$(fbset | grep geom | awk '{print $3}')"
-
-CPUTYPE="$(cputype)"
-
-if [ "$1" = "" ]; then
-	echo PVR-INIT: Please use start, stop, or restart.
-	exit 1
-fi
-
-if [ "$1" = "stop" -o  "$1" = "restart" ]; then
-	echo Stopping PVR
-	#rmmod bc_example
-	rmmod omaplfb 2>/dev/null
-	rmmod pvrsrvkm 2>/dev/null
-fi
-
-if [ "$1" = "stop" ]; then
-	exit 0
-fi
-
-if [ $BITSPERPIXEL = "32" ] ; then
-	fbset -rgba 8/16,8/8,8/0,8/24
-fi
-
-fbset -vyres $(expr $YRES \* 3) 
-
-if [ $CPUTYPE = "OMAP3530" ]; then
-	echo Starting PVR
-	insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
-	#modprobe bc_example
-	modprobe omaplfb
-
-	pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
-
-	if [ -e /dev/pvrsrvkm ] ; then 
-		rm -f /dev/pvrsrvkm
-	fi
-
-	mknod /dev/pvrsrvkm c $pvr_maj 0 
-	chmod 666 /dev/pvrsrvkm
-
-	touch /etc/powervr-esrev
-
-	SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
-	ES_REVISION="$(cat /proc/cpuinfo | grep "CPU revision" | awk -F: '{print $2}')"
-
-	if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
-		echo -n "Starting SGX fixup for"
-		if [ "${ES_REVISION}" = " 3" ] ; then
-			echo " ES3.x"
-			cp -a /usr/lib/ES3.0/* /usr/lib
-			cp -a /usr/bin/ES3.0/* /usr/bin	
-		else
-			echo "ES 2.x"
-			cp -a /usr/lib/ES2.0/* /usr/lib
-			cp -a /usr/bin/ES2.0/* /usr/bin	
-		fi
-		echo "${ES_REVISION}" > /etc/powervr-esrev
-	fi
-	/usr/bin/pvrsrvinit
-else
-	echo No SGX hardware, not starting PVR
-fi
-
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index dd222df411..334f55a92d 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -3,7 +3,7 @@ LICENCE = "proprietary-binary"
 
 COMPATIBLE_MACHINE = "(am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
 
-DEPENDS = "virtual/libx11  libxau libxdmcpdev"
+DEPENDS = "virtual/libx11 libxau libxdmcpdev"
 
 PROVIDES += "virtual/egl"
 
@@ -113,7 +113,7 @@ do_compile() {
 
 do_install () {
 	install -d ${D}${libdir}
-	install -m 0755 ${BINLOCATION}/*.so* ${D}${libdir}
+	cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
 	install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
 
 	install -d ${D}${bindir}/
@@ -152,10 +152,10 @@ do_install () {
 	install -d ${D}${bindir}/ES3.0
 	install -d ${D}${bindir}/ES2.0
 
-	cp ${S}/gfx_rel_es2.x/lib* ${D}${libdir}/ES2.0/
+	cp -pPR ${S}/gfx_rel_es2.x/lib* ${D}${libdir}/ES2.0/
 	cp ${S}/gfx_rel_es2.x//p[dv]* ${D}${bindir}/ES2.0/
 
-	cp ${D}${libdir}/lib*${IMGPV} ${D}${libdir}/ES3.0/
+	cp -pPR ${D}${libdir}/lib*${IMGPV} ${D}${libdir}/ES3.0/
 	cp ${D}${bindir}/p[dv]* ${D}${bindir}/ES3.0
 
 	install -d ${D}${prefix}/share/applications
@@ -202,8 +202,8 @@ FILES_${PN}-x11trainingcourses = "${bindir}/SGX/trainingcourses/X11/*"
 # The libs need the kernel-modules
 RRECOMMENDS_${PN} = "omap3-sgx-modules"
 
-# The initscript calls fbset
-RDEPENDS_${PN} += "fbset"
+# The initscript calls fbset, cputype calls devmem2
+RDEPENDS_${PN} += "fbset devmem2"
 
 #HACK! These are binaries, so we can't guarantee that LDFLAGS match :(
 INSANE_SKIP_${PN} = True
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.01.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.01.bb
deleted file mode 100644
index 1f7adfe980..0000000000
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.01.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libgles-omap3.inc
-
-SGXPV = "3_00_00_01"
-
-PR = "r7"
-
-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dev = "${includedir}"
-
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.05.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.05.bb
deleted file mode 100644
index 814ca04637..0000000000
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.05.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libgles-omap3.inc
-
-# Not released yet
-DEFAULT_PREFERENCE = "-1"
-PR = "r3"
-
-SGXPV = "3_00_00_05"
-IMGPV = "1.2.12.838"
-
-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dev = "${includedir}"
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.06.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.06.bb
deleted file mode 100644
index cc8ddca0f5..0000000000
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.06.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require libgles-omap3.inc
-
-# Not released yet
-#DEFAULT_PREFERENCE = "-1"
-PR = "r7"
-
-SGXPV = "3_00_00_06"
-IMGPV = "1.3.13.1397"
-
-do_accept_license() {
-    export HOME="${WORKDIR}"
-    echo "Y
-q
-Y
-${S}" | ${WORKDIR}/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin
-}
-
-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dev = "${includedir}"
-
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb
deleted file mode 100644
index 2256c5b032..0000000000
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libgles-omap3.inc
-
-DEFAULT_PREFERENCE = "1"
-
-SGXPV = "3_00_00_08"
-IMGPV = "1.3.13.1607"
-BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
-
-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dev = "${includedir}"
-
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
deleted file mode 100644
index 8b51813389..0000000000
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require libgles-omap3.inc
-
-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 = "r2"
-
-SGXPV = "3_00_00_09"
-IMGPV = "1.3.13.1832"
-BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
-
-# The ES2.x and ES3.x CPUs have different SGX hardware, so we need to install 2 sets of userspace
-do_install_append() {
-	install -d ${D}${libdir}/ES3.0
-	install -d ${D}${libdir}/ES2.0
-	install -d ${D}${bindir}/ES3.0
-	install -d ${D}${bindir}/ES2.0
-
-	cp ${S}/gfx_rel_es2.x/lib* ${D}${libdir}/ES2.0/
-	cp ${S}/gfx_rel_es2.x/p[dv]* ${D}${bindir}/ES2.0/
-
-	cp ${D}${libdir}/lib*${IMGPV} ${D}${libdir}/ES3.0/
-	cp ${D}${bindir}/p[dv]* ${D}${bindir}/ES3.0
-}
-
-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dev = "${includedir}"
-
diff --git a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
index 6d84f14d80..697c4685e1 100644
--- a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
+++ b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
@@ -2,7 +2,7 @@ BINLOCATION = "${S}/gfx_rel_es3.x"
 
 require libgles-omap3.inc
 
-PR = "r2"
+PR = "r3"
 
 # download required binary distribution from:
 # http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_02.bin
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.2.12.838.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.2.12.838.bb
deleted file mode 100644
index 6f57e532f0..0000000000
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.2.12.838.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-
-inherit module
-
-SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-${PV}.tar.bz2 \
-"
-
-MAKE_TARGETS = "BUILD=debug"
-
-do_compile_prepend() {
-	cd ${S}/eurasiacon/build/linux/omap3430_linux/kbuild/
-}
-
-do_install() {
-	cd ${S}/eurasiacon/build/linux/omap3430_linux/kbuild/
-	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-	cp ${WORKDIR}/${PN}-${PV}/eurasiacon/binary_omap3430_linux_debug/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-}
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
deleted file mode 100644
index 3f9a3cdc75..0000000000
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-
-inherit module
-
-SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-${PV}.tar.bz2 \
-           file://0001-Compile-fixes-for-DSS2.patch;patch=1 \
-           file://0001-New-build-system-for-SGX.patch;patch=1 \
-           file://spurious-irq-fix.diff;patch=1 \
-"
-
-PVRBUILD = "release"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD}"
-
-do_compile_prepend() {
-	find ${S} -name "*.*o" | xargs rm || true
-	if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 28 ] ; then
-		sed -i -e 's:omap_dispc_unregister_isr(OMAPLFBVSyncISR):omap_dispc_unregister_isr(OMAPLFBVSyncISR, psSwapChain, DISPC_IRQ_VSYNC):g' services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
-	fi
-}
-
-do_install() {
-	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-	cp ${S}/pvrsrvkm.ko ${S}/services4/3rdparty/dc_omap3430_linux/omaplfb.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-}
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
deleted file mode 100644
index 603c81f9a4..0000000000
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-
-inherit module
-
-SRC_URI = "file://omap3-sgx-modules-${PV}.tar.bz2 \
-           file://0002-Compile-fixes-for-DSS2.patch;patch=1 \
-           file://rotation-dss2.patch;patch=1 \
-           file://build_es3.x_sgx.patch;patch=1 \
-           file://proc-interface.patch;patch=1 \
-	   file://0001-Compile-fixes-for-recent-kernels.patch;patch=1 \
-"
-
-PVRBUILD = "release"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD}"
-
-do_install() {
-	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-	cp ${S}/pvrsrvkm.ko ${S}/services4/3rdparty/dc_omap3430_linux/omaplfb.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-}