Attachment #76963 for bug #118829

View | Details | Raw Unified | Return to bug 118829
Collapse All | Expand All

Lines 7-13 Link Here

(-)filters/adjust/adjust.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/bobdeint/bobdeint.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/convert/convert.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/crop/crop.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/denoise3d/denoise3d.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/force/force.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-12 Link Here

(-)filters/invert/invert.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/kerneldeint/kerneldeint.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/linearblend/linearblend.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11	INCLUDEPATH += ../..	11	INCLUDEPATH += ../..
12		12
13	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	13	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/onefield/onefield.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 7-13 Link Here

(-)filters/postprocess/postprocess.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec	10	INCLUDEPATH += ../../libs/libmythtv ../.. ../../libs/libavcodec
11	DEPENDPATH += ../../libs/libmythtv ../../libs/libavcodec	11	DEPENDPATH += ../../libs/libmythtv ../../libs/libavcodec
12		12
13	LIBS += -L../../libs/libavcodec	13	LIBS += -L../../libs/libavcodec

Lines 7-13 Link Here

(-)filters/quickdnr/quickdnr.pro (-1 / +1 lines)
7	target.path = $${PREFIX}/lib/filters	7	target.path = $${PREFIX}/lib/filters
8	INSTALLS = target	8	INSTALLS = target
9		9
10	INCLUDEPATH += ../../libs/libmythtv	10	INCLUDEPATH += ../../libs/libmythtv ../..
11		11
12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes	12	QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes	13	QMAKE_CFLAGS_DEBUG += -Wno-missing-prototypes

Lines 103-108 Link Here

(-)libs/libmyth/libmyth.pro (+2 lines)
103	LIBS += $$ALSA_LIBS	103	LIBS += $$ALSA_LIBS
104	}	104	}
105		105
		106	SOURCES += uclibc-extras.c
		107
106	using_joystick_menu {	108	using_joystick_menu {
107	DEFINES += USE_JOYSTICK_MENU	109	DEFINES += USE_JOYSTICK_MENU
108	HEADERS += jsmenu.h jsmenuevent.h	110	HEADERS += jsmenu.h jsmenuevent.h




#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"


#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;

// Loop through the file system table and add any supported devices.
bool MediaMonitor::addFSTab()
{
    SETMEP;
    
    // Attempt to open the file system descriptor entry.
    if (SET) 
    {
        perror(ERRORTYPE);
        cerr << "MediaMonitor::addFSTab - Failed to open "
                _PATH_FSTAB
                " for reading." << endl;

    else 
    {
        // Add all the entries
        while ((mep = GETNEXT) != NULL)
            (void) addDevice(mep);
        
        END;
    }

    if (m_Devices.isEmpty())

}

// 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
{
#ifdef __UCLIBC__
    if (mep == NULL)
        return false;
#endif
    QString devicePath( mep->FSNAMESPEC );
    //cout << "addDevice - " << devicePath << endl;

    MythMediaDevice* pDevice = NULL;

    if (mep == NULL)
       return false;

    if (stat(mep->FSNAMESPEC, &sbuf) < 0)
       return false;   

    //  Can it be mounted?  
    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->MNTOPTS, MNTTYPE_ISO9660) && 
            strstr(mep->TYPE, MNTTYPE_SUPERMOUNT) ) 
          {
             is_supermount = true;
          }

          }
     }

     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;

     if (!is_supermount) 
     {
         if (is_cdrom)
             pDevice = MythCDROM::get(this, QString(mep->SPECFSNAME),
                                     is_supermount, m_AllowEject);
     }
     else 
     {
         char *dev;
         int len = 0;
         dev = strstr(mep->MNTOPTS, SUPER_OPT_DEV);
         dev += sizeof(SUPER_OPT_DEV)-1;
         while (dev[len] != ',' && dev[len] != ' ' && dev[len] != 0)
             len++;

        
     if (pDevice) 
     {
         pDevice->setMountPath(mep->FILEDIR);
         VERBOSE(VB_ALL, QString("Mediamonitor: Adding %1")
                         .arg(pDevice->getDevicePath()));
         if (pDevice->testMedia() == MEDIAERR_OK) 

    QString devicePath( devPath );
    //cout << "addDevice - " << devicePath << endl;

    SETMEP;
    char lpath[PATH_MAX];

    // Resolve the simlink for the device.

        lpath[len] = 0;

    // Attempt to open the file system descriptor entry.
    if (SET) 
    {
        perror(ERRORTYPE);
        cerr << "MediaMonitor::addDevice - Failed to open "
                _PATH_FSTAB
                " for reading." << endl;

    else 
    {
        // Loop over the file system descriptor entry.
        while ((mep = GETNEXT) != NULL)  
        {
//             cout << "***************************************************" << endl;
//              cout << "devicePath == " << devicePath << endl;
//              cout << "mep->FSNAMESPEC == " << mep->FSNAMESPEC << endl;
//              cout << "lpath == " << lpath << endl; 
//              cout << "strcmp(devicePath, mep->FSNAMESPEC) == " << strcmp(devicePath, mep->FSNAMESPEC) << endl;
//              cout << "len ==" << len << 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->FSNAMESPEC) != 0) && 
                 (len && (strcmp(lpath, mep->FSNAMESPEC) != 0)))
                continue;

        }

        END;
    }

    if (mep) 

Lines 5-11 Link Here

(-)libs/libmyth/mythmediamonitor.h (-2 / +12 lines)
5	#include <qvaluelist.h>	5	#include <qvaluelist.h>
6	#include <qguardedptr.h>	6	#include <qguardedptr.h>
7	#include <qthread.h>	7	#include <qthread.h>
		8	#ifndef __UCLIBC__
8	#include <fstab.h>	9	#include <fstab.h>
		10	#else /* __UCLIBC__ */
		11	#include <mntent.h>
		12	#ifndef _PATH_FSTAB
		13	#define _PATH_FSTAB "/etc/fstab"
		14	#endif /* _PATH_FSTAB */
		15	#endif /* __UCLIBC__ */
		16
9		17
10	const int kMediaEventType = 30042;	18	const int kMediaEventType = 30042;
11		19
Lines 28-35 Link Here
28	QGuardedPtr<MythMediaDevice> m_Device;	36	QGuardedPtr<MythMediaDevice> m_Device;
29	};	37	};
30		38
31	struct mntent;
32
33	class MonitorThread : public QThread	39	class MonitorThread : public QThread
34	{	40	{
35	public:	41	public:
Lines 51-57 Link Here
51	bool addFSTab(void);	57	bool addFSTab(void);
52	void addDevice(MythMediaDevice* pDevice);	58	void addDevice(MythMediaDevice* pDevice);
53	bool addDevice(const char* dev);	59	bool addDevice(const char* dev);
		60	#ifndef __UCLIBC__
54	bool addDevice(struct fstab* mep);	61	bool addDevice(struct fstab* mep);
		62	#else /* __UCLIBC__ */
		63	bool addDevice(struct mntent* mep);
		64	#endif /* __UCLIBC__ */
55		65
56	bool isActive(void) const { return m_Active; }	66	bool isActive(void) const { return m_Active; }
57	void checkDevices(void);	67	void checkDevices(void);




#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__ */

Lines 9-14 Link Here

(-)libs/libmythmpeg2/libmythmpeg2.pro (+2 lines)
9		9
10	VERSION = 0.17.0	10	VERSION = 0.17.0
11		11
		12	INCLUDEPATH += ../..
		13
12	QMAKE_CFLAGS_RELEASE += -fPIC -fno-common	14	QMAKE_CFLAGS_RELEASE += -fPIC -fno-common
13	QMAKE_CFLAGS_DEBUG += -fPIC -fno-common	15	QMAKE_CFLAGS_DEBUG += -fPIC -fno-common
14		16

Lines 10-13 Link Here

(-)mythtv.pro (-1 / +1 lines)
10	}	10	}
11		11
12	# Directories	12	# Directories
13	SUBDIRS += libs filters programs themes setup i18n	13	SUBDIRS += libs filters programs themes setup

Lines 1-4 Link Here

(-)programs/mythbackend/mythbackend.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs	1	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..
2		2
3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
4	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-4 Link Here

(-)programs/mythcommflag/mythcommflag.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
2		2
3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
4	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-4 Link Here

(-)programs/mythepg/mythepg.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
2		2
3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
4	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-4 Link Here

(-)programs/mythfilldatabase/mythfilldatabase.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs	1	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..
2	DEPENDPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs/libavcodec	2	DEPENDPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs/libavcodec
3	DEPENDPATH += ../../libs/libavformat	3	DEPENDPATH += ../../libs/libavformat
4		4

Lines 1-4 Link Here

(-)programs/mythjobqueue/mythjobqueue.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
2		2
3	LIBS += -L../../libs/libavcodec -L../../libs/libavformat	3	LIBS += -L../../libs/libavcodec -L../../libs/libavformat
4	LIBS += -L../../libs/libmyth -L../../libs/libmythtv	4	LIBS += -L../../libs/libmyth -L../../libs/libmythtv

Lines 1-4 Link Here

(-)programs/mythlcd/mythlcd.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
2		2
3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
4	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-4 Link Here

(-)programs/mythprogfind/mythprogfind.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../..
2		2
3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
4	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-5 Link Here

(-)programs/mythtranscode/mythtranscode.pro (-1 / +1 lines)
1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../../libs/libmythtv \	1	INCLUDEPATH += ../../libs/ ../../libs/libmyth ../../libs/libmythtv \
2	../../libs/libavcodec ../../libs/libavformat	2	../../libs/libavcodec ../../libs/libavformat ../..
3		3
4	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	4	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
5	LIBS += -L../../libs/libavformat	5	LIBS += -L../../libs/libavformat

Line 1 Link Here

(-)programs/mythtv/mythtv.pro (+2 lines)
		1	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs
		2	INCLUDEPATH += ../../libs/libmythtv ../../libs/libmyth ../../libs ../..
1	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec	3	LIBS += -L../../libs/libmyth -L../../libs/libmythtv -L../../libs/libavcodec
2	LIBS += -L../../libs/libavformat	4	LIBS += -L../../libs/libavformat

Lines 1-6 Link Here

(-)programs/mythtvosd/mythtvosd.pro (+2 lines)
1	include ( ../../config.mak )	1	include ( ../../config.mak )
2	include ( ../../settings.pro )	2	include ( ../../settings.pro )
3		3
		4	INCLUDEPATH += ../..
		5
4	TEMPLATE = app	6	TEMPLATE = app
5	CONFIG += thread	7	CONFIG += thread
6	TARGET = mythtvosd	8	TARGET = mythtvosd

Lines 27-32 Link Here

(-)settings.pro (+2 lines)
27	QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS	27	QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
28	QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC	28	QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
29	QMAKE_CXXFLAGS += $$ECXXFLAGS	29	QMAKE_CXXFLAGS += $$ECXXFLAGS
		30	QMAKE_CXXFLAGS += -include uclibc-hack.h
30		31
31	profile:CONFIG += release	32	profile:CONFIG += release
32		33
Lines 42-47 Link Here
42	QMAKE_CFLAGS_SHLIB = -DPIC -fPIC	43	QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
43	QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}	44	QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
44	QMAKE_CFLAGS += $$ECFLAGS	45	QMAKE_CFLAGS += $$ECFLAGS
		46	QMAKE_CFLAGS += -include uclibc-hack.h
45		47
46	# figure out defines	48	# figure out defines
47		49

Lines 1-7 Link Here

(-)setup/setup.pro (-1 / +1 lines)
1	TARGET = mythtv-setup	1	TARGET = mythtv-setup
2	target.path = $${PREFIX}/bin	2	target.path = $${PREFIX}/bin
3		3
4	INCLUDEPATH += ../libs/libmythtv ../libs ../libs/libmyth	4	INCLUDEPATH += ../libs/libmythtv ../libs ../libs/libmyth ..
5		5
6	LIBS += -L../libs/libmyth -L../libs/libmythtv -L../libs/libavcodec	6	LIBS += -L../libs/libmyth -L../libs/libmythtv -L../libs/libavcodec
7	LIBS += -L../libs/libavformat	7	LIBS += -L../libs/libavformat

Lines 1-6 Link Here

(-)themes/themes.pro (+2 lines)
1	include ( ../config.mak )	1	include ( ../config.mak )
2	include ( ../settings.pro )	2	include ( ../settings.pro )
3		3
		4	INCLUDEPATH += ..
		5
4	QMAKE_STRIP = echo	6	QMAKE_STRIP = echo
5		7
6	TEMPLATE = app	8	TEMPLATE = app

Line 0 Link Here

(-)uclibc-hack.h (+11 lines)
	1	#ifndef _UCLIBC_HACK_H
	2	#define _UCLIBC_HACK_H 1
	3
	4	#include <math.h>
	5
	6	static inline float _uc_hack_roundf(float d) {
	7	return floor(d) + (d - floor(d) < 0.5 ? 0 : 1);
	8	}
	9
	10	#define roundf(x) (_uc_hack_roundf((x)))
	11	#endif

Return to bug 118829

Lines 5-16 Link Here

(-)libs/libmyth/mythmediamonitor.cpp (-32 / +72 lines)
5	#include <fcntl.h>	5	#include <fcntl.h>
6	#include <dirent.h>	6	#include <dirent.h>
7	#include <cstdio>	7	#include <cstdio>
8	#include <fstab.h>
9	#include <iostream>	8	#include <iostream>
10	#include <sys/types.h>	9	#include <sys/types.h>
11	#include <sys/stat.h>	10	#include <sys/stat.h>
12	#include <unistd.h>	11	#include <unistd.h>
13		12
		13	#ifdef __UCLIBC__
		14	#include <mntent.h>
		15	#ifndef _PATH_FSTAB
		16	#define _PATH_FSTAB "/etc/fstab"
		17	#endif
		18	#else
		19	#include <fstab.h>
		20	#endif
		21
14	#include "config.h"	22	#include "config.h"
15	#include "mythcontext.h"	23	#include "mythcontext.h"
16		24
Lines 40-45 Link Here
40	#endif	48	#endif
41	#define SUPER_OPT_DEV "dev="	49	#define SUPER_OPT_DEV "dev="
42		50
		51	#ifdef __UCLIBC__
		52	#define SETMEP FILE fstab; struct mntent mep = NULL;
		53	#define SET (fstab = setmntent (_PATH_FSTAB, "r")) < 0
		54	#define ERRORTYPE "setmntend"
		55	#define GETNEXT getmntent(fstab)
		56	#define END endmntent(fstab);
		57	#define FSNAMESPEC mnt_fsname
		58	#define MNTOPTS mnt_opts
		59	#define TYPE mnt_type
		60	#define SPECFSNAME mnt_fsname
		61	#define FILEDIR mnt_dir
		62	#else
		63	#define SETMEP struct fstab * mep = NULL
		64	#define SET !setfsent()
		65	#define ERRORTYPE "setfsent"
		66	#define GETNEXT getfsent()
		67	#define END endfsent()
		68	#define FSNAMESPEC fs_spec
		69	#define MNTOPTS fs_mntops
		70	#define TYPE vfstype
		71	#define SPECFSNAME fs_spec
		72	#define FILEDIR fs_file
		73	#endif
		74
43	using namespace std;	75	using namespace std;
44		76
45	MediaMonitor *theMonitor = NULL;	77	MediaMonitor *theMonitor = NULL;
Lines 93-104 Link Here
93	// Loop through the file system table and add any supported devices.	125	// Loop through the file system table and add any supported devices.
94	bool MediaMonitor::addFSTab()	126	bool MediaMonitor::addFSTab()
95	{	127	{
96	struct fstab * mep = NULL;	128	SETMEP;
97		129
98	// Attempt to open the file system descriptor entry.	130	// Attempt to open the file system descriptor entry.
99	if (!setfsent())	131	if (SET)
100	{	132	{
101	perror("setfsent");	133	perror(ERRORTYPE);
102	cerr << "MediaMonitor::addFSTab - Failed to open "	134	cerr << "MediaMonitor::addFSTab - Failed to open "
103	_PATH_FSTAB	135	_PATH_FSTAB
104	" for reading." << endl;	136	" for reading." << endl;
Lines 107-116 Link Here
107	else	139	else
108	{	140	{
109	// Add all the entries	141	// Add all the entries
110	while ((mep = getfsent()) != NULL)	142	while ((mep = GETNEXT) != NULL)
111	(void) addDevice(mep);	143	(void) addDevice(mep);
112		144
113	endfsent();	145	END;
114	}	146	}
115		147
116	if (m_Devices.isEmpty())	148	if (m_Devices.isEmpty())
Lines 128-136 Link Here
128	}	160	}
129		161
130	// Given a fstab entry to a media device determine what type of device it is	162	// Given a fstab entry to a media device determine what type of device it is
		163	#ifdef __UCLIBC__
		164	bool MediaMonitor::addDevice(struct mntent * mep)
		165	#else
131	bool MediaMonitor::addDevice(struct fstab * mep)	166	bool MediaMonitor::addDevice(struct fstab * mep)
		167	#endif
132	{	168	{
133	QString devicePath( mep->fs_spec );	169	#ifdef __UCLIBC__
		170	if (mep == NULL)
		171	return false;
		172	#endif
		173	QString devicePath( mep->FSNAMESPEC );
134	//cout << "addDevice - " << devicePath << endl;	174	//cout << "addDevice - " << devicePath << endl;
135		175
136	MythMediaDevice* pDevice = NULL;	176	MythMediaDevice* pDevice = NULL;
Lines 142-159 Link Here
142	if (mep == NULL)	182	if (mep == NULL)
143	return false;	183	return false;
144		184
145	if (stat(mep->fs_spec, &sbuf) < 0)	185	if (stat(mep->FSNAMESPEC, &sbuf) < 0)
146	return false;	186	return false;
147		187
148	// Can it be mounted?	188	// Can it be mounted?
149	if ( ! ( ((strstr(mep->fs_mntops, "owner") &&	189	if ( ! ( ((strstr(mep->MNTOPTS, "owner") &&
150	(sbuf.st_mode & S_IRUSR)) \|\| strstr(mep->fs_mntops, "user")) &&	190	(sbuf.st_mode & S_IRUSR)) \|\| strstr(mep->MNTOPTS, "user")) &&
151	(strstr(mep->fs_vfstype, MNTTYPE_ISO9660) \|\|	191	(strstr(mep->TYPE, MNTTYPE_ISO9660) \|\|
152	strstr(mep->fs_vfstype, MNTTYPE_UDF) \|\|	192	strstr(mep->TYPE, MNTTYPE_UDF) \|\|
153	strstr(mep->fs_vfstype, MNTTYPE_AUTO)) ) )	193	strstr(mep->TYPE, MNTTYPE_AUTO)) ) )
154	{	194	{
155	if ( strstr(mep->fs_mntops, MNTTYPE_ISO9660) &&	195	if ( strstr(mep->MNTOPTS, MNTTYPE_ISO9660) &&
156	strstr(mep->fs_vfstype, MNTTYPE_SUPERMOUNT) )	196	strstr(mep->TYPE, MNTTYPE_SUPERMOUNT) )
157	{	197	{
158	is_supermount = true;	198	is_supermount = true;
159	}	199	}
Lines 163-172 Link Here
163	}	203	}
164	}	204	}
165		205
166	if (strstr(mep->fs_mntops, MNTTYPE_ISO9660) \|\|	206	if (strstr(mep->MNTOPTS, MNTTYPE_ISO9660) \|\|
167	strstr(mep->fs_vfstype, MNTTYPE_ISO9660) \|\|	207	strstr(mep->TYPE, MNTTYPE_ISO9660) \|\|
168	strstr(mep->fs_vfstype, MNTTYPE_UDF) \|\|	208	strstr(mep->TYPE, MNTTYPE_UDF) \|\|
169	strstr(mep->fs_vfstype, MNTTYPE_AUTO))	209	strstr(mep->TYPE, MNTTYPE_AUTO))
170	{	210	{
171	is_cdrom = true;	211	is_cdrom = true;
172	//cout << "Device is a CDROM" << endl;	212	//cout << "Device is a CDROM" << endl;
Lines 175-188 Link Here
175	if (!is_supermount)	215	if (!is_supermount)
176	{	216	{
177	if (is_cdrom)	217	if (is_cdrom)
178	pDevice = MythCDROM::get(this, QString(mep->fs_spec),	218	pDevice = MythCDROM::get(this, QString(mep->SPECFSNAME),
179	is_supermount, m_AllowEject);	219	is_supermount, m_AllowEject);
180	}	220	}
181	else	221	else
182	{	222	{
183	char *dev;	223	char *dev;
184	int len = 0;	224	int len = 0;
185	dev = strstr(mep->fs_mntops, SUPER_OPT_DEV);	225	dev = strstr(mep->MNTOPTS, SUPER_OPT_DEV);
186	dev += sizeof(SUPER_OPT_DEV)-1;	226	dev += sizeof(SUPER_OPT_DEV)-1;
187	while (dev[len] != ',' && dev[len] != ' ' && dev[len] != 0)	227	while (dev[len] != ',' && dev[len] != ' ' && dev[len] != 0)
188	len++;	228	len++;
Lines 202-208 Link Here
202		242
203	if (pDevice)	243	if (pDevice)
204	{	244	{
205	pDevice->setMountPath(mep->fs_file);	245	pDevice->setMountPath(mep->FILEDIR);
206	VERBOSE(VB_ALL, QString("Mediamonitor: Adding %1")	246	VERBOSE(VB_ALL, QString("Mediamonitor: Adding %1")
207	.arg(pDevice->getDevicePath()));	247	.arg(pDevice->getDevicePath()));
208	if (pDevice->testMedia() == MEDIAERR_OK)	248	if (pDevice->testMedia() == MEDIAERR_OK)
Lines 224-230 Link Here
224	QString devicePath( devPath );	264	QString devicePath( devPath );
225	//cout << "addDevice - " << devicePath << endl;	265	//cout << "addDevice - " << devicePath << endl;
226		266
227	struct fstab * mep = NULL;	267	SETMEP;
228	char lpath[PATH_MAX];	268	char lpath[PATH_MAX];
229		269
230	// Resolve the simlink for the device.	270	// Resolve the simlink for the device.
Lines 233-241 Link Here
233	lpath[len] = 0;	273	lpath[len] = 0;
234		274
235	// Attempt to open the file system descriptor entry.	275	// Attempt to open the file system descriptor entry.
236	if (!setfsent())	276	if (SET)
237	{	277	{
238	perror("setfsent");	278	perror(ERRORTYPE);
239	cerr << "MediaMonitor::addDevice - Failed to open "	279	cerr << "MediaMonitor::addDevice - Failed to open "
240	_PATH_FSTAB	280	_PATH_FSTAB
241	" for reading." << endl;	281	" for reading." << endl;
Lines 244-268 Link Here
244	else	284	else
245	{	285	{
246	// Loop over the file system descriptor entry.	286	// Loop over the file system descriptor entry.
247	while ((mep = getfsent()) != NULL)	287	while ((mep = GETNEXT) != NULL)
248	{	288	{
249	// cout << "***************************************************" << endl;	289	// cout << "***************************************************" << endl;
250	// cout << "devicePath == " << devicePath << endl;	290	// cout << "devicePath == " << devicePath << endl;
251	// cout << "mep->fs_spec == " << mep->fs_spec << endl;	291	// cout << "mep->FSNAMESPEC == " << mep->FSNAMESPEC << endl;
252	// cout << "lpath == " << lpath << endl;	292	// cout << "lpath == " << lpath << endl;
253	// cout << "strcmp(devicePath, mep->fs_spec) == " << strcmp(devicePath, mep->fs_spec) << endl;	293	// cout << "strcmp(devicePath, mep->FSNAMESPEC) == " << strcmp(devicePath, mep->FSNAMESPEC) << endl;
254	// cout << "len ==" << len << endl;	294	// cout << "len ==" << len << endl;
255	// cout << "strcmp(lpath, mep->fs_spec)==" << strcmp(lpath, mep->fs_spec) << endl;	295	// cout << "strcmp(lpath, mep->FSNAMESPEC)==" << strcmp(lpath, mep->FSNAMESPEC) << endl;
256	// cout <<endl << endl;	296	// cout <<endl << endl;
257		297
258	// Check to see if this is the same as our passed in device.	298	// Check to see if this is the same as our passed in device.
259	if ((strcmp(devicePath, mep->fs_spec) != 0) &&	299	if ((strcmp(devicePath, mep->FSNAMESPEC) != 0) &&
260	(len && (strcmp(lpath, mep->fs_spec) != 0)))	300	(len && (strcmp(lpath, mep->FSNAMESPEC) != 0)))
261	continue;	301	continue;
262		302
263	}	303	}
264		304
265	endfsent();	305	END;
266	}	306	}
267		307
268	if (mep)	308	if (mep)

Line 0 Link Here

(-)libs/libmyth/uclibc-extras.c (+32 lines)
	1	#ifdef __UCLIBC__
	2	#include <stdio.h>
	3
	4	// Quick and dirty getloadavg() replacement
	5	int getloadavg (double loadavg[], int nelem)
	6	{
	7	FILE * pla;
	8
	9	if (nelem < 0)
	10	return -1;
	11	pla = fopen ("/proc/loadavg", "r");
	12	if (pla == NULL)
	13	return -1;
	14
	15	switch (nelem)
	16	{
	17	case 0:
	18	break;
	19	case 1:
	20	nelem = fscanf (pla, "%lf ", &loadavg[0]);
	21	case 2:
	22	nelem = fscanf (pla, "%lf %lf ", &loadavg[0], &loadavg[1]);
	23	case 3:
	24	default:
	25	nelem = fscanf (pla, "%lf %lf %lf ", &loadavg[0], &loadavg[1], &loadavg[2]);
	26	}
	27
	28	fclose (pla);
	29
	30	return nelem;
	31	}
	32	#endif /* __UCLIBC__ */