View | Details | Raw Unified
Collapse All | Expand All

(-) mythtv-0.19.orig/configure (-4 / +8 lines)
 Lines 21-26    Link Here 
compile_type="release"
compile_type="release"
prefix="/usr/local"
prefix="/usr/local"
libdir=""
libdir=""
libdir_name="lib"
mandir=""
mandir=""
bindir=""
bindir=""
cross_prefix=""
cross_prefix=""
 Lines 96-101    Link Here 
echo "  --compile-type=CTYPE     one of release, profile, debug [$compile_type]"
echo "  --compile-type=CTYPE     one of release, profile, debug [$compile_type]"
echo "                           NOTE: profile is for sampling profilers"
echo "                           NOTE: profile is for sampling profilers"
echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
echo "  --libdir-name=LIBNAME    search/install libraries in PREFIX/LIBNAME [$libdir_name]"
#echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
#echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
#echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
#echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
echo "  --disable-ccache         disable compiler cache (ccache)"
echo "  --disable-ccache         disable compiler cache (ccache)"
 Lines 606-611    Link Here 
  ;;  
  ;;  
  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
  ;;
  ;;
  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
  ;;
  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
  ;;
  ;;
  --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
  --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
 Lines 889-895    Link Here 
        done
        done
    fi
    fi
    LIBPATHS="`echo $LIBPATHS /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` "
    LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    HAS_IT="no"
    HAS_IT="no"
    for LIBPATH in $LIBPATHS ; do
    for LIBPATH in $LIBPATHS ; do
 Lines 904-910    Link Here 
{
{
    HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
    HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` "
    HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
    HAS_IT="no"
    HAS_IT="no"
    for HPATH in $HPATHS ; do
    for HPATH in $HPATHS ; do
 Lines 1918-1924    Link Here 
fi
fi
if test x"$libdir" = x""; then
if test x"$libdir" = x""; then
libdir="${prefix}/lib"
libdir="${prefix}/${libdir_name}"
fi
fi
if test x"$mandir" = x""; then
if test x"$mandir" = x""; then
 Lines 2235-2241    Link Here 
echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK
echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK
#echo "libdir=$libdir" >> $MYTH_CONFIG_MAK
echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK
#echo "bindir=$bindir" >> $MYTH_CONFIG_MAK
#echo "bindir=$bindir" >> $MYTH_CONFIG_MAK
#echo "mandir=$mandir" >> $MYTH_CONFIG_MAK
#echo "mandir=$mandir" >> $MYTH_CONFIG_MAK
#echo "MAKE=$make" >> $MYTH_CONFIG_MAK
#echo "MAKE=$make" >> $MYTH_CONFIG_MAK
(-) mythtv-0.19.orig/filters/filter-common.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
CONFIG -= moc qt
CONFIG -= moc qt
CONFIG += plugin thread
CONFIG += plugin thread
target.path = $${PREFIX}/lib/mythtv/filters
target.path = $${LIBDIR}/mythtv/filters
INSTALLS = target
INSTALLS = target
QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
(-) mythtv-0.19.orig/libs/libavcodec/libavcodec.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythavcodec-$$LIBVERSION
TARGET = mythavcodec-$$LIBVERSION
CONFIG += thread dll warn_off
CONFIG += thread dll warn_off
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
INCLUDEPATH = ../ ../../ ../libavutil
INCLUDEPATH = ../ ../../ ../libavutil
(-) mythtv-0.19.orig/libs/libavformat/libavformat.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythavformat-$$LIBVERSION
TARGET = mythavformat-$$LIBVERSION
CONFIG += thread dll warn_off
CONFIG += thread dll warn_off
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv
INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv
(-) mythtv-0.19.orig/libs/libavutil/libavutil.pro (-1 / +1 lines)
 Lines 5-11    Link Here 
TARGET = mythavutil-$$LIBVERSION
TARGET = mythavutil-$$LIBVERSION
CONFIG += thread dll warn_off
CONFIG += thread dll warn_off
CONFIG -= qt
CONFIG -= qt
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
INCLUDEPATH = ../ ../../
INCLUDEPATH = ../ ../../
(-) mythtv-0.19.orig/libs/libmyth/libmyth.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = myth-$$LIBVERSION
TARGET = myth-$$LIBVERSION
CONFIG += thread dll
CONFIG += thread dll
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
(-) mythtv-0.19.orig/libs/libmyth/mythcontext.cpp (-2 / +3 lines)
 Lines 186-191    Link Here 
    Settings *m_qtThemeSettings;
    Settings *m_qtThemeSettings;
    QString m_installprefix;
    QString m_installprefix;
    QString m_installlibdir;
    bool m_gui;
    bool m_gui;
    bool m_backend;
    bool m_backend;
 Lines 258-264    Link Here 
MythContextPrivate::MythContextPrivate(MythContext *lparent)
MythContextPrivate::MythContextPrivate(MythContext *lparent)
    : parent(lparent),
    : parent(lparent),
      m_settings(new Settings()), m_qtThemeSettings(new Settings()),
      m_settings(new Settings()), m_qtThemeSettings(new Settings()),
      m_installprefix(PREFIX),
      m_installprefix(PREFIX), m_installlibdir(LIBDIR),
      m_gui(false), m_backend(false), m_themeloaded(false),
      m_gui(false), m_backend(false), m_themeloaded(false),
      m_menuthemepathname(QString::null), m_themepathname(QString::null),
      m_menuthemepathname(QString::null), m_themepathname(QString::null),
      m_backgroundimage(NULL),
      m_backgroundimage(NULL),
 Lines 1120-1126    Link Here 
QString MythContext::GetLibraryDir(void) 
QString MythContext::GetLibraryDir(void) 
{ 
{ 
    return d->m_installprefix + "/lib/mythtv/"; 
    return d->m_installlibdir + "/mythtv/"; 
}
}
QString MythContext::GetThemesParentDir(void) 
QString MythContext::GetThemesParentDir(void) 
(-) mythtv-0.19.orig/libs/libmythmpeg2/libmythmpeg2.pro (-2 lines)
 Lines 4-11    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythmpeg2-$$LIBVERSION
TARGET = mythmpeg2-$$LIBVERSION
CONFIG += thread staticlib warn_off
CONFIG += thread staticlib warn_off
target.path = $${PREFIX}/lib
INSTALLS = target
QMAKE_CFLAGS_RELEASE += -DPIC -fPIC -fno-common
QMAKE_CFLAGS_RELEASE += -DPIC -fPIC -fno-common
QMAKE_CFLAGS_DEBUG += -DPIC -fPIC -fno-common
QMAKE_CFLAGS_DEBUG += -DPIC -fPIC -fno-common
(-) mythtv-0.19.orig/libs/libmythsamplerate/libmythsamplerate.pro (-2 lines)
 Lines 4-11    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythsamplerate-$$LIBVERSION
TARGET = mythsamplerate-$$LIBVERSION
CONFIG += thread staticlib warn_off
CONFIG += thread staticlib warn_off
target.path = $${PREFIX}/lib
INSTALLS = target
INCLUDEPATH += ../../ 
INCLUDEPATH += ../../ 
(-) mythtv-0.19.orig/libs/libmythsoundtouch/libmythsoundtouch.pro (-2 lines)
 Lines 4-11    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythsoundtouch-$$LIBVERSION
TARGET = mythsoundtouch-$$LIBVERSION
CONFIG += thread staticlib warn_off
CONFIG += thread staticlib warn_off
target.path = $${PREFIX}/lib
INSTALLS = target
INCLUDEPATH += ../../libs/libavcodec ../..
INCLUDEPATH += ../../libs/libavcodec ../..
(-) mythtv-0.19.orig/libs/libmythtv/libmythtv.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythtv-$$LIBVERSION
TARGET = mythtv-$$LIBVERSION
CONFIG += thread dll
CONFIG += thread dll
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
INCLUDEPATH += ../.. ..
INCLUDEPATH += ../.. ..
(-) mythtv-0.19.orig/libs/libmythui/libmythui.pro (-1 / +1 lines)
 Lines 4-10    Link Here 
TEMPLATE = lib
TEMPLATE = lib
TARGET = mythui-$$LIBVERSION
TARGET = mythui-$$LIBVERSION
CONFIG += debug thread dll 
CONFIG += debug thread dll 
target.path = $${PREFIX}/lib
target.path = $${LIBDIR}
INSTALLS = target
INSTALLS = target
INCLUDEPATH += ../libmyth
INCLUDEPATH += ../libmyth
(-) mythtv-0.19.orig/settings.pro (+1 lines)
 Lines 56-61    Link Here 
DEFINES += _GNU_SOURCE
DEFINES += _GNU_SOURCE
DEFINES += _FILE_OFFSET_BITS=64
DEFINES += _FILE_OFFSET_BITS=64
DEFINES += PREFIX=\"$${PREFIX}\"
DEFINES += PREFIX=\"$${PREFIX}\"
DEFINES += LIBDIR=\"$${LIBDIR}\"
# construct linking path
# construct linking path