aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/mythtv
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-02-24 21:01:42 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-02-25 20:36:17 +0100
commit930f35b6a90752e05aca4e3d03141d4a4d876eb1 (patch)
tree5923c5e975014b37b44682b2351ab8e995e94669 /recipes/mythtv
parent19033af8c5c25c7f8c7da33e91f0c8cefa32bb94 (diff)
downloadopenembedded-930f35b6a90752e05aca4e3d03141d4a4d876eb1.tar.gz
mythtv: removed some more unneeded/old files
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/mythtv')
-rw-r--r--recipes/mythtv/files/prefix-etc.patch11
-rw-r--r--recipes/mythtv/mythplugins/MythBackend.php.patch13
-rw-r--r--recipes/mythtv/mythtv/configure.patch148
-rw-r--r--recipes/mythtv/mythtv/ifdef-qt.diff13
-rw-r--r--recipes/mythtv/mythtv_svn.bb89
5 files changed, 0 insertions, 274 deletions
diff --git a/recipes/mythtv/files/prefix-etc.patch b/recipes/mythtv/files/prefix-etc.patch
deleted file mode 100644
index fd6aaf9179..0000000000
--- a/recipes/mythtv/files/prefix-etc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mythtv/libs/libmyth/oldsettings.cpp.old 2004-09-24 22:09:11.000000000 +0100
-+++ mythtv/libs/libmyth/oldsettings.cpp 2004-09-24 22:09:38.000000000 +0100
-@@ -116,7 +116,7 @@
- if (ReadSettings(setname))
- result = true;
-
-- setname = prefix + "/etc/mythtv/" + filename;
-+ setname = "/etc/mythtv/" + filename;
- if (ReadSettings(setname))
- result = true;
-
diff --git a/recipes/mythtv/mythplugins/MythBackend.php.patch b/recipes/mythtv/mythplugins/MythBackend.php.patch
deleted file mode 100644
index 95cf86e49f..0000000000
--- a/recipes/mythtv/mythplugins/MythBackend.php.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mythplugins-0.22rc1/mythweb/classes/MythBackend.php
-===================================================================
---- mythplugins-0.22rc1.orig/mythweb/classes/MythBackend.php
-+++ mythplugins-0.22rc1/mythweb/classes/MythBackend.php
-@@ -111,7 +111,7 @@ class MythBackend {
- }
-
- public function setTimezone() {
-- if (!is_string($_SESSION['backend']['timezone']['value']) || $_SESSION['backend']['timezone']['last_check_time'] - time() > 60*60*24) {
-+ if (!is_string($_SESSION['backend']['timezone']['value']) || time() - $_SESSION['backend']['timezone']['last_check_time'] () > 60*60*24) {
- $response = $this->sendCommand('QUERY_TIME_ZONE');
- $timezone = str_replace(' ', '_', $response[0]);
- $_SESSION['backend']['timezone']['value'] = $timezone;
diff --git a/recipes/mythtv/mythtv/configure.patch b/recipes/mythtv/mythtv/configure.patch
deleted file mode 100644
index c95a785d6c..0000000000
--- a/recipes/mythtv/mythtv/configure.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- /tmp/configure 2008-07-22 10:27:56.000000000 +0200
-+++ mythtv/configure 2008-07-22 17:53:20.000000000 +0200
-@@ -476,12 +476,13 @@
- }
-
- check_cmd(){
-- log "$@"
-+ echo "Checking $@"
-+ log "$@"
- "$@" >>$logfile 2>&1
- }
-
- check_cc(){
-- log check_cc "$@"
-+ log check_cc "$@"
- cat >$TMPC
- log_file $TMPC
- check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
-@@ -1117,11 +1118,11 @@
- fi
-
- # machine
--arch=`uname -m`
-+disabled cross_compile && arch=`uname -m`
- arch_raw="$arch"
- cpu="generic"
- cpu_override="no"
--processor=`uname -p 2>/dev/null`
-+disabled cross_compile && processor=`uname -p 2>/dev/null`
- processor_flags=""
- tune="generic"
-
-@@ -1185,7 +1186,7 @@
- lamemp3="yes"
- lirc="yes"
- mac_bundle="no"
--opengl="yes"
-+opengl="no"
- v4l="yes"
- x11="yes"
- x11_include_path="/usr/X11R6/include"
-@@ -1214,7 +1215,7 @@
- # build settings
- SHFLAGS='-shared -Wl,-soname,$@'
- VHOOKSHFLAGS='$(SHFLAGS)'
--LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
-+#LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
- FFSERVERLDFLAGS=-Wl,-E
- LDCONFIG="ldconfig"
- LIBPREF="lib"
-@@ -1714,7 +1715,7 @@
-
- has_library()
- {
-- if test -f /etc/ld.so.conf ; then
-+ if test -f /etc/ld.so.conf && disabled cross_compile ; then
- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
- else
- LIBPATHS=''
-@@ -1725,7 +1726,7 @@
- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-
- # recurse down just one level, should be enough in most cases
-- if test -f /etc/ld.so.conf ; then
-+ if test -f /etc/ld.so.conf && disabled cross_compile ; then
- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"`
- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
- for x in $SRCH ; do
-@@ -1734,29 +1735,31 @@
- done
- fi
-
-- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
-+ enabled cross_compile || LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
-
-- HAS_IT="no"
-+ HAS_IT="yes"
- for LIBPATH in $LIBPATHS ; do
- if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
- HAS_IT="yes"
- fi
- done
-+ echo "$1: $HAS_IT"
- expr $HAS_IT : "yes" > /dev/null
- }
-
- has_header()
- {
-- HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
-+ enabled cross_compile || HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
- INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
- HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
-
-- HAS_IT="no"
-+ HAS_IT="yes"
- for HPATH in $HPATHS ; do
- if test x`ls $HPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
- HAS_IT="yes"
- fi
- done
-+ echo "$1: $HAS_IT"
- expr $HAS_IT : "yes" > /dev/null
- }
-
-@@ -1863,13 +1866,15 @@
- if test x"$cmov" = x"default"; then
- disable cmov
- if enabled cpu_override; then
-- is_x86_cmov_cpu "$cpu" && enable cmov
-+ disabled cross_compile && is_x86_cmov_cpu "$cpu" && enable cmov
- disabled cmov || is_x86_slow_cmov_cpu "$cpu" || enable fast_cmov
- elif expr "$processor_flags" : ".*cmov" > /dev/null ; then
-- enable cmov
-+ disabled cross_compile && enable cmov
- fi
- fi
-
-+enabled cross_compile && disable cmov
-+
- # use different default ARCHFLAGS for CPU missing cmov (Via C3 ...)
- if test x"$arch" = x"x86_32" && disabled cmov && disabled cpu_override; then
- ARCHFLAGS="-march=i586"
-@@ -2254,7 +2259,7 @@
- EOF
-
- if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
--$TMPE && cpuclipspositive="yes"
-+enabled cross_compile || $TMPE && cpuclipspositive="yes"
- fi
-
- # test negative wrap
-@@ -2269,7 +2274,7 @@
- EOF
-
- if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
--$TMPE && cpuclipsnegative="yes"
-+enabled cross_compile || $TMPE && cpuclipsnegative="yes"
- fi
-
- # test for distcc
-@@ -2718,6 +2723,7 @@
-
- check_header GL/gl.h
- has_library libGL || has_library libopengl32 || disable opengl
-+enabled cross_compile && disable opengl
-
- VENDOR_XVMC_LIBS=""
- check_header X11/extensions/XvMClib.h
diff --git a/recipes/mythtv/mythtv/ifdef-qt.diff b/recipes/mythtv/mythtv/ifdef-qt.diff
deleted file mode 100644
index bdefee11df..0000000000
--- a/recipes/mythtv/mythtv/ifdef-qt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- /tmp/mythmainwindow.cpp 2008-07-22 18:19:06.000000000 +0200
-+++ mythtv/libs/libmythui/mythmainwindow.cpp 2008-07-22 18:19:26.000000000 +0200
-@@ -4,7 +4,10 @@
-
- #include <algorithm>
-
-+#ifdef USE_OPENGL_PAINTER
- #include <QGLWidget>
-+endif
-+
- #include <QApplication>
- #include <QTimer>
- #include <QDesktopWidget>
diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb
deleted file mode 100644
index f0d802a4a2..0000000000
--- a/recipes/mythtv/mythtv_svn.bb
+++ /dev/null
@@ -1,89 +0,0 @@
-require mythtv.inc
-
-inherit qmake2 qt4x11
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.21+0.22rc+svnr${SRCPV}"
-PR = "r0"
-REALPV = "0.22"
-
-SRCREV = "20947"
-SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
-
-S = "${WORKDIR}/mythtv"
-
-QMAKE_PROFILES = "mythtv.pro"
-
-mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
-PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
-
-FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
-FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
-FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
-FILES_mythtv-bin = "${bindir}/*"
-FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
-FILES_mythtv-data = "${datadir}"
-RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGES_DYNAMIC = "mythtv-theme-*"
-
-python __anonymous () {
- import bb
-
- mythlibs = bb.data.getVar('mythlibs', d).split()
- pv = bb.data.expand(bb.data.getVar("REALPV", d), d)
-
- for m in mythlibs:
- bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
- bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d)
-
- packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split())
-
- bb.data.setVar("PACKAGES", packages, d)
-}
-
-EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8"
-EXTRA_MYTHTVCONF ?= ""
-
-EXTRA_OECONF = " \
- --cross-prefix=${TARGET_PREFIX} \
- --sysroot=${STAGING_DIR_HOST} \
- --prefix=${prefix} \
- \
- --arch=${TARGET_ARCH} \
- --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
- --extra-cxxflags="${TARGET_CXXFLAGS} ${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 --qmake=qmake2 \
- --disable-altivec \
- --disable-opengl \
- --disable-stripping \
- --disable-xvmc \
- --enable-v4l \
- --enable-audio-oss \
- --enable-dvb \
- --enable-libmp3lame \
- --dvb-path=${STAGING_INCDIR} \
- --without-bindings=perl,python \
- ${EXTRA_OECONF}
-}
-
-python populate_packages_prepend () {
- new_packages = []
-
- def the_hook(file, pkg, pattern, format, basename):
- new_packages.append(pkg)
-
- do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True)
-
- bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d)
-}