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

6 files changed, 0 insertions, 193 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
-
diff --git a/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch b/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
deleted file mode 100644
index d920cade2e..0000000000
--- a/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: libs/libavcodec/xvmc_render.h
-===================================================================
-RCS file: /var/lib/mythcvs/mythtv/libs/libavcodec/xvmc_render.h,v
-retrieving revision 1.5
-diff -u -r1.5 xvmc_render.h
---- libs/libavcodec/xvmc_render.h	13 Sep 2004 06:09:22 -0000	1.5
-+++ libs/libavcodec/xvmc_render.h	18 Sep 2004 19:37:35 -0000
-@@ -10,7 +10,7 @@
- 
- #ifdef USING_XVMC_VLD
- #include <stdint.h>
--#include <X11/extensions/viaXvMC.h>
-+#include <X11/extensions/vldXvMC.h>
- #endif
- 
- //the surface should be shown, video driver manipulate this
-Index: libs/libmythtv/XvMCSurfaceTypes.h
-===================================================================
-RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/XvMCSurfaceTypes.h,v
-retrieving revision 1.3
-diff -u -r1.3 XvMCSurfaceTypes.h
---- libs/libmythtv/XvMCSurfaceTypes.h	13 Sep 2004 06:09:23 -0000	1.3
-+++ libs/libmythtv/XvMCSurfaceTypes.h	18 Sep 2004 19:37:36 -0000
-@@ -7,7 +7,7 @@
- 
- extern "C" {
- #ifdef USING_XVMC_VLD
--#include <X11/extensions/viaXvMC.h>
-+#include <X11/extensions/vldXvMC.h>
- #endif
- #include "../libavcodec/xvmc_render.h"
- }
-Index: libs/libmythtv/dvbdiseqc.cpp
-===================================================================
-RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbdiseqc.cpp,v
-retrieving revision 1.7
-diff -u -r1.7 dvbdiseqc.cpp
---- libs/libmythtv/dvbdiseqc.cpp	6 Aug 2004 17:34:55 -0000	1.7
-+++ libs/libmythtv/dvbdiseqc.cpp	18 Sep 2004 19:37:36 -0000
-@@ -29,6 +29,7 @@
-  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <math.h>
- #include <iostream>
- #include "pthread.h"
- #include "qsqldatabase.h"
-Index: libs/libmythtv/videoout_xvmc.cpp
-===================================================================
-RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/videoout_xvmc.cpp,v
-retrieving revision 1.36
-diff -u -r1.36 videoout_xvmc.cpp
---- libs/libmythtv/videoout_xvmc.cpp	13 Sep 2004 06:09:24 -0000	1.36
-+++ libs/libmythtv/videoout_xvmc.cpp	18 Sep 2004 19:37:39 -0000
-@@ -32,7 +32,7 @@
- 
- extern "C" {
- #ifdef USING_XVMC_VLD
--#include <X11/extensions/viaXvMC.h>
-+#include <X11/extensions/vldXvMC.h>
- #endif
- #include "../libavcodec/avcodec.h"
- #include "../libavcodec/xvmc_render.h"
diff --git a/mythtv/mythtv_0.16+cvs20040918.bb b/mythtv/mythtv_0.16+cvs20040918.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mythtv/mythtv_0.16+cvs20040918.bb
+++ /dev/null
diff --git a/mythtv/mythtv_0.16.bb b/mythtv/mythtv_0.16.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mythtv/mythtv_0.16.bb
+++ /dev/null
diff --git a/mythtv/mythtv_cvs.bb b/mythtv/mythtv_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mythtv/mythtv_cvs.bb
+++ /dev/null