aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-mythtv@grunau.be>2009-07-16 16:03:50 +0200
committerKoen Kooi <koen@openembedded.org>2009-07-16 16:03:50 +0200
commitaa55a8abaf9adebea97408b95abbe5849b1f9411 (patch)
treebedea413e1c869c6591214d69d900c18f6f73896
parent20f4fa12b285b8f41b1a215415a5732d633a0a83 (diff)
downloadopenembedded-aa55a8abaf9adebea97408b95abbe5849b1f9411.tar.gz
openembedded-aa55a8abaf9adebea97408b95abbe5849b1f9411.tar.bz2
openembedded-aa55a8abaf9adebea97408b95abbe5849b1f9411.zip
mythtv 0.22: bump SRCREV and fix configure options
-rw-r--r--recipes/mythtv/mythtv_svn.bb41
1 files changed, 16 insertions, 25 deletions
diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb
index 83ce8252fa..5272bb6e81 100644
--- a/recipes/mythtv/mythtv_svn.bb
+++ b/recipes/mythtv/mythtv_svn.bb
@@ -5,15 +5,12 @@ inherit qmake2 qt4x11
DEFAULT_PREFERENCE = "-1"
PV = "0.21+0.22rc+svnr${SRCREV}"
-PR = "r2"
+PR = "r0"
REALPV = "0.22"
-SRCREV = "17892"
+SRCREV = "20923"
SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
-SRC_URI += "file://configure.patch;patch=1 \
- "
-
S = "${WORKDIR}/mythtv"
QMAKE_PROFILES = "mythtv.pro"
@@ -47,38 +44,32 @@ python __anonymous () {
bb.data.setVar("PACKAGES", packages, d)
}
-EXTRA_OECONF_armv5te = " --enable-armv5te "
-EXTRA_OECONF_armv6 = " --enable-armv6 "
-EXTRA_OECONF_armv7a = " --enable-armv6"
-
-#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
-#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
-MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
-
-MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
-TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
-
-EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8"
+EXTRA_MYTHTVCONF ?= ""
+EXTRA_OECONF = " \
+ --cross-prefix=${TARGET_PREFIX} \
+ --prefix=${prefix} \
+ \
+ --arch=${TARGET_ARCH} \
+ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+ --extra-ldflags="${TARGET_LDFLAGS}" \
+ ${EXTRA_MYTHTVCONF} \
+"
do_configure_prepend() {
# it's not autotools anyway, so we call ./configure directly
find . -name "Makefile"|xargs rm -f
- ./configure --prefix=/usr \
- --mandir=/usr/man \
- --cpu=${MYTHTV_ARCH} \
- --arch=${MYTHTV_ARCH} \
+ ./configure --qmake=qmake2 \
--disable-altivec \
--disable-opengl-video \
- --disable-strip \
+ --disable-stripping \
+ --disable-xvmc \
--enable-v4l \
--enable-audio-oss \
- --enable-proc-opt \
--enable-dvb \
--enable-libmp3lame \
- --cross-compile \
--dvb-path=${STAGING_INCDIR} \
--with-bindings= \
${EXTRA_OECONF}