[patch] enables mythtv to be compiled with uclibc

mythtv-0.18.1-uclibc.patch (text/plain), 21.12 KB, created by Brenden Conte on 2006-01-12 17:57:09 UTC

diff -Naur filters/adjust/adjust.pro filters/adjust/adjust.pro
--- filters/adjust/adjust.pro	2005-03-05 19:15:21 -0500
+++ filters/adjust/adjust.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/bobdeint/bobdeint.pro filters/bobdeint/bobdeint.pro
--- filters/bobdeint/bobdeint.pro	2005-03-05 19:15:21 -0500
+++ filters/bobdeint/bobdeint.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/convert/convert.pro filters/convert/convert.pro
--- filters/convert/convert.pro	2005-03-05 19:15:22 -0500
+++ filters/convert/convert.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/crop/crop.pro filters/crop/crop.pro
--- filters/crop/crop.pro	2005-03-05 19:15:22 -0500
+++ filters/crop/crop.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/denoise3d/denoise3d.pro filters/denoise3d/denoise3d.pro
--- filters/denoise3d/denoise3d.pro	2005-03-05 19:15:23 -0500
+++ filters/denoise3d/denoise3d.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/force/force.pro filters/force/force.pro
--- filters/force/force.pro	2005-03-05 19:15:23 -0500
+++ filters/force/force.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/invert/invert.pro filters/invert/invert.pro
--- filters/invert/invert.pro	2005-03-05 19:15:23 -0500
+++ filters/invert/invert.pro	2005-03-05 19:03:03 -0500
@@ -7,6 +7,6 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
[5~~[5~5~[5~ QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/kerneldeint/kerneldeint.pro filters/kerneldeint/kerneldeint.pro
--- filters/kerneldeint/kerneldeint.pro	2005-03-05 19:15:24 -0500
+++ filters/kerneldeint/kerneldeint.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/linearblend/linearblend.pro filters/linearblend/linearblend.pro
--- filters/linearblend/linearblend.pro	2005-03-05 19:15:24 -0500
+++ filters/linearblend/linearblend.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 INCLUDEPATH += ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
diff -Naur filters/onefield/onefield.pro filters/onefield/onefield.pro
--- filters/onefield/onefield.pro	2005-03-05 19:15:25 -0500
+++ filters/onefield/onefield.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur filters/postprocess/postprocess.pro filters/postprocess/postprocess.pro
--- filters/postprocess/postprocess.pro	2005-03-05 19:15:25 -0500
+++ filters/postprocess/postprocess.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec
+INCLUDEPATH += ../../libs/libmythtv ../.. ../../libs/libavcodec
 DEPENDPATH += ../../libs/libmythtv ../../libs/libavcodec
 
 LIBS += -L../../libs/libavcodec
diff -Naur filters/quickdnr/quickdnr.pro filters/quickdnr/quickdnr.pro
--- filters/quickdnr/quickdnr.pro	2005-03-05 19:15:26 -0500
+++ filters/quickdnr/quickdnr.pro	2005-03-05 19:03:03 -0500
@@ -7,7 +7,7 @@
 target.path = $${PREFIX}/lib/filters
 INSTALLS = target
 
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += ../../libs/libmythtv ../..
 
 QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
 QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes
diff -Naur libs/libmyth/libmyth.pro libs/libmyth/libmyth.pro
--- libs/libmyth/libmyth.pro	2005-03-05 19:16:04 -0500
+++ libs/libmyth/libmyth.pro	2005-03-05 19:03:03 -0500
@@ -103,6 +103,8 @@
     LIBS += $$ALSA_LIBS
 }
 
+    SOURCES += uclibc-extras.c
+
 using_joystick_menu {
     DEFINES += USE_JOYSTICK_MENU
     HEADERS += jsmenu.h jsmenuevent.h
diff -Naur libs/libmyth/mythmediamonitor.cpp libs/libmyth/mythmediamonitor.cpp
--- libs/libmyth/mythmediamonitor.cpp	2005-03-05 19:16:05 -0500
+++ libs/libmyth/mythmediamonitor.cpp	2005-03-05 19:11:05 -0500
@@ -5,12 +5,20 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <cstdio>
-#include <fstab.h>
 #include <iostream>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifdef __UCLIBC__
+#include <mntent.h>
+#ifndef _PATH_FSTAB
+#define _PATH_FSTAB "/etc/fstab"
+#endif
+#else
+#include <fstab.h>
+#endif
+
 #include "config.h"
 #include "mythcontext.h"
 
@@ -40,6 +48,30 @@
 #endif
 #define SUPER_OPT_DEV "dev="
 
+#ifdef __UCLIBC__
+#define SETMEP FILE *fstab; struct mntent * mep = NULL;
+#define SET (fstab = setmntent (_PATH_FSTAB, "r")) < 0
+#define ERRORTYPE "setmntend"
+#define GETNEXT getmntent(fstab)
+#define END endmntent(fstab);
+#define FSNAMESPEC mnt_fsname
+#define MNTOPTS mnt_opts
+#define TYPE mnt_type
+#define SPECFSNAME mnt_fsname
+#define FILEDIR mnt_dir
+#else
+#define SETMEP struct fstab * mep = NULL
+#define SET !setfsent()
+#define ERRORTYPE "setfsent"
+#define GETNEXT getfsent()
+#define END endfsent()
+#define FSNAMESPEC fs_spec
+#define MNTOPTS fs_mntops
+#define TYPE vfstype
+#define SPECFSNAME fs_spec
+#define FILEDIR fs_file
+#endif
+
 using namespace std;
 
 MediaMonitor *theMonitor = NULL;
@@ -93,12 +125,12 @@
 // Loop through the file system table and add any supported devices.
 bool MediaMonitor::addFSTab()
 {
-    struct fstab * mep = NULL;
+    SETMEP;
     
     // Attempt to open the file system descriptor entry.
-    if (!setfsent()) 
+    if (SET) 
     {
-        perror("setfsent");
+        perror(ERRORTYPE);
         cerr << "MediaMonitor::addFSTab - Failed to open "
                 _PATH_FSTAB
                 " for reading." << endl;
@@ -107,10 +139,10 @@
     else 
     {
         // Add all the entries
-        while ((mep = getfsent()) != NULL)
+        while ((mep = GETNEXT) != NULL)
             (void) addDevice(mep);
         
-        endfsent();
+        END;
     }
 
     if (m_Devices.isEmpty())
@@ -128,9 +160,17 @@
 }
 
 // Given a fstab entry to a media device determine what type of device it is 
+#ifdef __UCLIBC__
+bool MediaMonitor::addDevice(struct mntent * mep)
+#else
 bool MediaMonitor::addDevice(struct fstab * mep) 
+#endif
 {
-    QString devicePath( mep->fs_spec );
+#ifdef __UCLIBC__
+    if (mep == NULL)
+        return false;
+#endif
+    QString devicePath( mep->FSNAMESPEC );
     //cout << "addDevice - " << devicePath << endl;
 
     MythMediaDevice* pDevice = NULL;
@@ -142,18 +182,18 @@
     if (mep == NULL)
        return false;
 
-    if (stat(mep->fs_spec, &sbuf) < 0)
+    if (stat(mep->FSNAMESPEC, &sbuf) < 0)
        return false;   
 
     //  Can it be mounted?  
-    if ( ! ( ((strstr(mep->fs_mntops, "owner") && 
-        (sbuf.st_mode & S_IRUSR)) || strstr(mep->fs_mntops, "user")) && 
-        (strstr(mep->fs_vfstype, MNTTYPE_ISO9660) || 
-         strstr(mep->fs_vfstype, MNTTYPE_UDF) || 
-         strstr(mep->fs_vfstype, MNTTYPE_AUTO)) ) ) 
+    if ( ! ( ((strstr(mep->MNTOPTS, "owner") && 
+        (sbuf.st_mode & S_IRUSR)) || strstr(mep->MNTOPTS, "user")) && 
+        (strstr(mep->TYPE, MNTTYPE_ISO9660) || 
+         strstr(mep->TYPE, MNTTYPE_UDF) || 
+         strstr(mep->TYPE, MNTTYPE_AUTO)) ) ) 
     {
-       if ( strstr(mep->fs_mntops, MNTTYPE_ISO9660) && 
-            strstr(mep->fs_vfstype, MNTTYPE_SUPERMOUNT) ) 
+       if ( strstr(mep->MNTOPTS, MNTTYPE_ISO9660) && 
+            strstr(mep->TYPE, MNTTYPE_SUPERMOUNT) ) 
           {
              is_supermount = true;
           }
@@ -163,10 +203,10 @@
           }
      }
 
-     if (strstr(mep->fs_mntops, MNTTYPE_ISO9660)  || 
-         strstr(mep->fs_vfstype, MNTTYPE_ISO9660) || 
-         strstr(mep->fs_vfstype, MNTTYPE_UDF)     || 
-         strstr(mep->fs_vfstype, MNTTYPE_AUTO)) 
+     if (strstr(mep->MNTOPTS, MNTTYPE_ISO9660)  || 
+         strstr(mep->TYPE, MNTTYPE_ISO9660) || 
+         strstr(mep->TYPE, MNTTYPE_UDF)     || 
+         strstr(mep->TYPE, MNTTYPE_AUTO)) 
      {
          is_cdrom = true;
          //cout << "Device is a CDROM" << endl;
@@ -175,14 +215,14 @@
      if (!is_supermount) 
      {
          if (is_cdrom)
-             pDevice = MythCDROM::get(this, QString(mep->fs_spec),
+             pDevice = MythCDROM::get(this, QString(mep->SPECFSNAME),
                                      is_supermount, m_AllowEject);
      }
      else 
      {
          char *dev;
          int len = 0;
-         dev = strstr(mep->fs_mntops, SUPER_OPT_DEV);
+         dev = strstr(mep->MNTOPTS, SUPER_OPT_DEV);
          dev += sizeof(SUPER_OPT_DEV)-1;
          while (dev[len] != ',' && dev[len] != ' ' && dev[len] != 0)
              len++;
@@ -202,7 +242,7 @@
         
      if (pDevice) 
      {
-         pDevice->setMountPath(mep->fs_file);
+         pDevice->setMountPath(mep->FILEDIR);
          VERBOSE(VB_ALL, QString("Mediamonitor: Adding %1")
                          .arg(pDevice->getDevicePath()));
          if (pDevice->testMedia() == MEDIAERR_OK) 
@@ -224,7 +264,7 @@
     QString devicePath( devPath );
     //cout << "addDevice - " << devicePath << endl;
 
-    struct fstab * mep = NULL;
+    SETMEP;
     char lpath[PATH_MAX];
 
     // Resolve the simlink for the device.
@@ -233,9 +273,9 @@
         lpath[len] = 0;
 
     // Attempt to open the file system descriptor entry.
-    if (!setfsent()) 
+    if (SET) 
     {
-        perror("setfsent");
+        perror(ERRORTYPE);
         cerr << "MediaMonitor::addDevice - Failed to open "
                 _PATH_FSTAB
                 " for reading." << endl;
@@ -244,25 +284,25 @@
     else 
     {
         // Loop over the file system descriptor entry.
-        while ((mep = getfsent()) != NULL)  
+        while ((mep = GETNEXT) != NULL)  
         {
 //             cout << "***************************************************" << endl;
 //              cout << "devicePath == " << devicePath << endl;
-//              cout << "mep->fs_spec == " << mep->fs_spec << endl;
+//              cout << "mep->FSNAMESPEC == " << mep->FSNAMESPEC << endl;
 //              cout << "lpath == " << lpath << endl; 
-//              cout << "strcmp(devicePath, mep->fs_spec) == " << strcmp(devicePath, mep->fs_spec) << endl;
+//              cout << "strcmp(devicePath, mep->FSNAMESPEC) == " << strcmp(devicePath, mep->FSNAMESPEC) << endl;
 //              cout << "len ==" << len << endl;
-//              cout << "strcmp(lpath, mep->fs_spec)==" << strcmp(lpath, mep->fs_spec) << endl;
+//              cout << "strcmp(lpath, mep->FSNAMESPEC)==" << strcmp(lpath, mep->FSNAMESPEC) << endl;
 //              cout <<endl << endl;
 
             // Check to see if this is the same as our passed in device. 
-            if ((strcmp(devicePath, mep->fs_spec) != 0) && 
-                 (len && (strcmp(lpath, mep->fs_spec) != 0)))
+            if ((strcmp(devicePath, mep->FSNAMESPEC) != 0) && 
+                 (len && (strcmp(lpath, mep->FSNAMESPEC) != 0)))
                 continue;
 
         }
 
-        endfsent();
+        END;
     }
 
     if (mep) 
diff -Naur libs/libmyth/mythmediamonitor.h libs/libmyth/mythmediamonitor.h
--- libs/libmyth/mythmediamonitor.h	2005-03-05 19:16:08 -0500
+++ libs/libmyth/mythmediamonitor.h	2005-03-05 19:03:03 -0500
@@ -5,7 +5,15 @@
 #include <qvaluelist.h>
 #include <qguardedptr.h>
 #include <qthread.h>
+#ifndef __UCLIBC__
 #include <fstab.h>
+#else /* __UCLIBC__ */
+#include <mntent.h>
+#ifndef _PATH_FSTAB
+#define _PATH_FSTAB "/etc/fstab"
+#endif /* _PATH_FSTAB */
+#endif /* __UCLIBC__ */
+
 
 const int kMediaEventType = 30042;
 
@@ -28,8 +36,6 @@
     QGuardedPtr<MythMediaDevice> m_Device;
 };
 
-struct mntent;
-
 class MonitorThread : public QThread
 {
   public:
@@ -51,7 +57,11 @@
     bool addFSTab(void);
     void addDevice(MythMediaDevice* pDevice);
     bool addDevice(const char* dev);
+#ifndef __UCLIBC__
     bool addDevice(struct fstab* mep);
+#else /* __UCLIBC__ */
+    bool addDevice(struct mntent* mep);
+#endif /* __UCLIBC__ */
 
     bool isActive(void) const { return m_Active; }
     void checkDevices(void);
diff -Naur libs/libmyth/uclibc-extras.c libs/libmyth/uclibc-extras.c
--- libs/libmyth/uclibc-extras.c	1969-12-31 19:00:00 -0500
+++ libs/libmyth/uclibc-extras.c	2005-03-05 19:03:03 -0500
@@ -0,0 +1,32 @@
+#ifdef __UCLIBC__
+#include <stdio.h>
+
+// Quick and dirty getloadavg() replacement
+int getloadavg (double loadavg[], int nelem)
+{
+    FILE * pla;
+
+    if (nelem < 0)
+        return -1;
+    pla = fopen ("/proc/loadavg", "r");
+    if (pla == NULL)
+        return -1;
+
+    switch (nelem)
+    {
+        case 0:
+            break;
+        case 1:
+            nelem = fscanf (pla, "%lf ", &loadavg[0]);
+        case 2:
+            nelem = fscanf (pla, "%lf %lf ", &loadavg[0], &loadavg[1]);
+        case 3:
+        default:
+            nelem = fscanf (pla, "%lf %lf %lf ", &loadavg[0], &loadavg[1], &loadavg[2]);
+    }
+
+    fclose (pla);
+
+    return nelem;
+}
+#endif /* __UCLIBC__ */
diff -Naur libs/libmythmpeg2/libmythmpeg2.pro libs/libmythmpeg2/libmythmpeg2.pro
--- libs/libmythmpeg2/libmythmpeg2.pro	2005-03-05 19:16:09 -0500
+++ libs/libmythmpeg2/libmythmpeg2.pro	2005-03-05 19:03:03 -0500
@@ -9,6 +9,8 @@
 
 VERSION = 0.17.0 
 
+INCLUDEPATH += ../..
+
 QMAKE_CFLAGS_RELEASE += -fPIC -fno-common
 QMAKE_CFLAGS_DEBUG += -fPIC -fno-common
 
diff -Naur mythtv.pro mythtv.pro
--- mythtv.pro	2005-03-05 19:16:32 -0500
+++ mythtv.pro	2005-03-05 19:03:06 -0500
@@ -10,4 +10,4 @@
 }
 
 # Directories
-SUBDIRS += libs filters programs themes setup i18n
+SUBDIRS += libs filters programs themes setup 
diff -Naur programs/mythbackend/mythbackend.pro programs/mythbackend/mythbackend.pro
--- programs/mythbackend/mythbackend.pro	2005-03-05 19:16:34 -0500
+++ programs/mythbackend/mythbackend.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs
+INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythcommflag/mythcommflag.pro programs/mythcommflag/mythcommflag.pro
--- programs/mythcommflag/mythcommflag.pro	2005-03-05 19:16:35 -0500
+++ programs/mythcommflag/mythcommflag.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth
+INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythepg/mythepg.pro programs/mythepg/mythepg.pro
--- programs/mythepg/mythepg.pro	2005-03-05 19:16:36 -0500
+++ programs/mythepg/mythepg.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth
+INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythfilldatabase/mythfilldatabase.pro programs/mythfilldatabase/mythfilldatabase.pro
--- programs/mythfilldatabase/mythfilldatabase.pro	2005-03-05 19:16:36 -0500
+++ programs/mythfilldatabase/mythfilldatabase.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs
+INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..
 DEPENDPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs/libavcodec
 DEPENDPATH += ../../libs/libavformat
 
diff -Naur programs/mythjobqueue/mythjobqueue.pro programs/mythjobqueue/mythjobqueue.pro
--- programs/mythjobqueue/mythjobqueue.pro	2005-03-05 19:16:39 -0500
+++ programs/mythjobqueue/mythjobqueue.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth
+INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
 
 LIBS += -L../../libs/libavcodec -L../../libs/libavformat
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv
diff -Naur programs/mythlcd/mythlcd.pro programs/mythlcd/mythlcd.pro
--- programs/mythlcd/mythlcd.pro	2005-03-05 19:16:40 -0500
+++ programs/mythlcd/mythlcd.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth
+INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythprogfind/mythprogfind.pro programs/mythprogfind/mythprogfind.pro
--- programs/mythprogfind/mythprogfind.pro	2005-03-05 19:16:40 -0500
+++ programs/mythprogfind/mythprogfind.pro	2005-03-05 19:03:06 -0500
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth
+INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythtranscode/mythtranscode.pro programs/mythtranscode/mythtranscode.pro
--- programs/mythtranscode/mythtranscode.pro	2005-03-05 19:16:41 -0500
+++ programs/mythtranscode/mythtranscode.pro	2005-03-05 19:03:06 -0500
@@ -1,5 +1,5 @@
 INCLUDEPATH += ../../libs/ ../../libs/libmyth ../../libs/libmythtv \
-               ../../libs/libavcodec ../../libs/libavformat
+               ../../libs/libavcodec ../../libs/libavformat ../..
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat
diff -Naur programs/mythtv/mythtv.pro programs/mythtv/mythtv.pro
--- programs/mythtv/mythtv.pro     2006-01-12 14:07:21.701719705 -0500
+++ protrams/mythtv/mythtv.pro  2006-01-12 14:07:37.765277604 -0500
@@ -1,0 +1,2 @@
+INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs
+INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..

 LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
 LIBS += -L../../libs/libavformat

diff -Naur programs/mythtvosd/mythtvosd.pro programs/mythtvosd/mythtvosd.pro
--- programs/mythtvosd/mythtvosd.pro	2005-03-05 19:16:43 -0500
+++ programs/mythtvosd/mythtvosd.pro	2005-03-05 19:03:06 -0500
@@ -1,6 +1,8 @@
 include ( ../../config.mak )
 include ( ../../settings.pro )
 
+INCLUDEPATH += ../..
+
 TEMPLATE = app
 CONFIG += thread
 TARGET = mythtvosd
diff -Naur settings.pro settings.pro
--- settings.pro	2005-03-05 19:16:48 -0500
+++ settings.pro	2005-03-05 19:23:33 -0500
@@ -27,6 +27,7 @@
 QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
 QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
 QMAKE_CXXFLAGS += $$ECXXFLAGS
+QMAKE_CXXFLAGS += -include uclibc-hack.h
 
 profile:CONFIG += release
 
@@ -42,6 +43,7 @@
 QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
 QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
 QMAKE_CFLAGS += $$ECFLAGS
+QMAKE_CFLAGS += -include uclibc-hack.h
 
 # figure out defines 
 
diff -Naur setup/setup.pro setup/setup.pro
--- setup/setup.pro	2005-03-05 19:16:49 -0500
+++ setup/setup.pro	2005-03-05 19:03:06 -0500
@@ -1,7 +1,7 @@
 TARGET = mythtv-setup
 target.path = $${PREFIX}/bin
 
-INCLUDEPATH += ../libs/libmythtv ../libs ../libs/libmyth
+INCLUDEPATH += ../libs/libmythtv ../libs ../libs/libmyth ..
 
 LIBS += -L../libs/libmyth -L../libs/libmythtv -L../libs/libavcodec
 LIBS += -L../libs/libavformat
diff -Naur themes/themes.pro themes/themes.pro
--- themes/themes.pro	2005-03-05 19:17:58 -0500
+++ themes/themes.pro	2005-03-05 19:03:06 -0500
@@ -1,6 +1,8 @@
 include ( ../config.mak )
 include ( ../settings.pro )
 
+INCLUDEPATH += ..
+
 QMAKE_STRIP = echo
 
 TEMPLATE = app
diff -Naur uclibc-hack.h uclibc-hack.h
--- uclibc-hack.h	1969-12-31 19:00:00 -0500
+++ uclibc-hack.h	2005-03-05 19:03:06 -0500
@@ -0,0 +1,11 @@
+#ifndef _UCLIBC_HACK_H
+#define _UCLIBC_HACK_H 1
+
+#include <math.h>
+
+static inline float _uc_hack_roundf(float d) {
+	return floor(d) + (d - floor(d) < 0.5 ? 0 : 1);
+}
+
+#define roundf(x) (_uc_hack_roundf((x)))
+#endif