summaryrefslogtreecommitdiff
path: root/mythtv/files
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /mythtv/files
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'mythtv/files')
-rw-r--r--mythtv/files/prefix-etc.patch11
-rw-r--r--mythtv/files/settings.pro119
2 files changed, 0 insertions, 130 deletions
diff --git a/mythtv/files/prefix-etc.patch b/mythtv/files/prefix-etc.patch
deleted file mode 100644
index fd6aaf9179..0000000000
--- a/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/mythtv/files/settings.pro b/mythtv/files/settings.pro
deleted file mode 100644
index 816fd06887..0000000000
--- a/mythtv/files/settings.pro
+++ /dev/null
@@ -1,119 +0,0 @@
-#CONFIG += debug
-CONFIG += release
-
-PREFIX = /usr
-
-LIBVERSION = 0.16
-
-INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
-
-DEFINES += _GNU_SOURCE
-DEFINES += _FILE_OFFSET_BITS=64
-DEFINES += PREFIX=\"$${PREFIX}\"
-
-release {
- DEFINES += MMX
- QMAKE_CXXFLAGS_RELEASE = -O3 -march=i586 -fomit-frame-pointer
- macx {
- DEFINES -= MMX
- # Don't use -O3, it causes some Qt moc methods to go missing
- QMAKE_CXXFLAGS_RELEASE = -O2
- }
- QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
-}
-
-EXTRA_LIBS = -lfreetype -lmp3lame
-
-unix:linux*: {
- CONFIG += linux backend
- DEFINES += CONFIG_VIDEO4LINUX
-}
-unix:freebsd*: {
- CONFIG += freebsd backend
- DEFINES += CONFIG_VIDEO4LINUX
-}
-
-# X11 support
-CONFIG += using_x11
-
-# Default Xv support
-CONFIG += using_xv
-EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm
-
-# IVTV (PVR-x50) support. Disable if building on Windows.
-CONFIG += using_ivtv
-DEFINES += USING_IVTV
-
-# LCDProc support
-#DEFINES += LCD_DEVICE
-
-# Default audio output, OSS
-CONFIG += using_oss
-DEFINES += USING_OSS
-
-# Native ALSA support
-#CONFIG += using_alsa
-#ALSA_LIBS = -lasound
-
-# Native ARTS support
-#CONFIG += using_arts
-#ARTS_LIBS = -L/opt/kde3/lib -ldl -lartsc -lpthread
-#EXTRA_LIBS += -L/opt/kde3/lib -ldl -lartsc -lpthread
-#INCLUDEPATH += /opt/kde3/include
-# For Mandrake, use the following:
-#ARTS_LIBS = -ldl -lartsc -lpthread
-#EXTRA_LIBS += -ldl -lartsc -lpthread
-#INCLUDEPATH += /usr/include/artsc
-
-# DVB support
-CONFIG += using_dvb
-DEFINES += USING_DVB
-# Note: INCLUDEPATH should point to the directory with
-# 'linux/dvb/frontend.h', not the directory with frontend.h
-#INCLUDEPATH += /usr/src/linuxtv-dvb-1.0.1/include
-
-# Native lirc support
-CONFIG += using_lirc
-LIRC_LIBS = -llirc_client
-
-# XvMC support, modify as necessary.
-#CONFIG += using_xvmc
-#DEFINES += USING_XVMC
-#EXTRA_LIBS += -lXvMCNVIDIA -lXvMC
-
-# XvMC_VLD support, modify as necessary. Incompatible with normal XvMC support.
-CONFIG += using_xvmc using_xvmc_vld
-DEFINES += USING_XVMC USING_XVMC_VLD
-EXTRA_LIBS += -lviaXvMC -lXvMC
-
-# DirectFB support
-#CONFIG += using_directfb
-#EXTRA_LIBS += `directfb-config --libs`
-#QMAKE_CXXFLAGS += `directfb-config --cflags`
-
-# Windows support
-#CONFIG += win32
-#DEFINES += _WIN32
-
-# Mac OS X support
-macx {
- # For source that uses Qt, Q_OS_MACX is defined.
- # For source that uses config.h, CONFIG_DARWIN is defined.
- # For other source (e.g. libmythtv), we define this
- DEFINES += CONFIG_DARWIN
-}
-
-# DirectX support
-#CONFIG += using_directx
-#DEFINES += USING_DIRECTX
-
-# OpenGL support for vertical retrace sync
-#DEFINES += USING_OPENGL_VSYNC
-#EXTRA_LIBS += -lGL -lGLU
-#CONFIG += using_opengl
-
-# Allow use of XrandR to change display resolutions
-#CONFIG += using_xrandr
-#DEFINES += USING_XRANDR
-