On Tuesday 13 December 2005 00:06, Jarod Wilson wrote: > On Monday 12 December 2005 19:50, Anduin Withers wrote: > > > > I know gcc 4.1 is not out yet but Red Hat is confident enough it's > > > > been pushed to Fedora Core Devel (my distro). [...] > I figured it might be fixed in SVN > already, just having a bitch of a time getting a stable gcc 4.1 system > using the Fedora devel tree (its broken as sin right now for numerous > packages, and FC5 test1 is a train wreck), so I haven't even got around to > trying to compile anything with gcc 4.1 yet. I'm almost there though. Once > I am, I'll see what I can do to patch up the 0.18 tree...
Got it all patched up (locally) and it builds just fine. A few minor differences from the svn devel branch patch, but pretty trivial. I'll test it out for a bit before I commit it. Patch attached for those that would like to test as well. -- Jarod Wilson [EMAIL PROTECTED]
diff -ur mythtv-0.18.1-orig/libs/libmyth/jsmenu.h mythtv-0.18.1/libs/libmyth/jsmenu.h
--- mythtv-0.18.1-orig/libs/libmyth/jsmenu.h 2004-10-14 10:02:01.000000000 -0700
+++ mythtv-0.18.1/libs/libmyth/jsmenu.h 2005-12-13 11:52:23.000000000 -0800
@@ -76,7 +76,7 @@
void ButtonUp(int button);
void AxisChange(int axis, int value);
- void JoystickMenuClient::EmitKey(QString code);
+ void EmitKey(QString code);
int ReadConfig(QString config_file);
private:
diff -ur mythtv-0.18.1-orig/libs/libmythsoundtouch/SoundTouch.h mythtv-0.18.1/libs/libmythsoundtouch/SoundTouch.h
--- mythtv-0.18.1-orig/libs/libmythsoundtouch/SoundTouch.h 2005-12-13 12:02:20.000000000 -0800
+++ mythtv-0.18.1/libs/libmythsoundtouch/SoundTouch.h 2005-12-13 11:52:42.000000000 -0800
@@ -159,7 +159,7 @@
static const char *getVersionString();
/// Get SoundTouch library version Id
- static uint SoundTouch::getVersionId();
+ static uint getVersionId();
/// Sets new rate control value. Normal rate = 1.0, smaller values
/// represent slower rate, larger faster rates.
diff -ur mythtv-0.18.1-orig/libs/libmythtv/avformatdecoder.cpp mythtv-0.18.1/libs/libmythtv/avformatdecoder.cpp
--- mythtv-0.18.1-orig/libs/libmythtv/avformatdecoder.cpp 2005-12-13 12:02:20.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/avformatdecoder.cpp 2005-12-13 11:56:23.000000000 -0800
@@ -24,6 +24,13 @@
extern pthread_mutex_t avcodeclock;
+int get_avf_buffer_xvmc(struct AVCodecContext *c, AVFrame *pic);
+int get_avf_buffer(struct AVCodecContext *c, AVFrame *pic);
+void release_avf_buffer(struct AVCodecContext *c, AVFrame *pic);
+void release_avf_buffer_xvmc(struct AVCodecContext *c, AVFrame *pic);
+void render_slice_xvmc(struct AVCodecContext *s, const AVFrame *src,
+ int offset[4], int y, int type, int height);
+
class AvFormatDecoderPrivate
{
public:
diff -ur mythtv-0.18.1-orig/libs/libmythtv/channel.h mythtv-0.18.1/libs/libmythtv/channel.h
--- mythtv-0.18.1-orig/libs/libmythtv/channel.h 2005-01-07 16:22:58.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/channel.h 2005-12-13 13:16:30.000000000 -0800
@@ -34,9 +34,9 @@
bool CheckSignal(int msecWait = 5000,
int requiredSignalPercentage = 65,
int input = 0);
- unsigned short *Channel::GetV4L1Field(int attrib,
+ unsigned short *GetV4L1Field(int attrib,
struct video_picture &vid_pic);
- int Channel::ChangeColourAttribute(int attrib, const char *name, bool up);
+ int ChangeColourAttribute(int attrib, const char *name, bool up);
int ChangeColour(bool up);
int ChangeBrightness(bool up);
int ChangeContrast(bool up);
diff -ur mythtv-0.18.1-orig/libs/libmythtv/dtvrecorder.h mythtv-0.18.1/libs/libmythtv/dtvrecorder.h
--- mythtv-0.18.1-orig/libs/libmythtv/dtvrecorder.h 2005-04-13 20:28:43.000000000 -0700
+++ mythtv-0.18.1/libs/libmythtv/dtvrecorder.h 2005-12-13 13:14:26.000000000 -0800
@@ -16,7 +16,7 @@
class DTVRecorder: public RecorderBase
{
public:
- DTVRecorder::DTVRecorder() :
+ DTVRecorder() :
_first_keyframe(0), _position_within_gop_header(0),
_keyframe_seen(false), _last_keyframe_seen(0), _last_gop_seen(0),
_last_seq_seen(0), _stream_fd(-1), _error(false),
diff -ur mythtv-0.18.1-orig/libs/libmythtv/firewirerecorder.h mythtv-0.18.1/libs/libmythtv/firewirerecorder.h
--- mythtv-0.18.1-orig/libs/libmythtv/firewirerecorder.h 2005-03-11 11:18:51.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/firewirerecorder.h 2005-12-13 13:18:52.000000000 -0800
@@ -31,10 +31,10 @@
void StartRecording(void);
bool Open(void);
void ProcessTSPacket(unsigned char *tspacket, int len);
- void FirewireRecorder::SetOptionsFromProfile(RecordingProfile *profile,
- const QString &videodev,
- const QString &audiodev,
- const QString &vbidev, int ispip);
+ void SetOptionsFromProfile(RecordingProfile *profile,
+ const QString &videodev,
+ const QString &audiodev,
+ const QString &vbidev, int ispip);
void SetOption(const QString &name, const QString &value);
void SetOption(const QString &name, int value);
diff -ur mythtv-0.18.1-orig/libs/libmythtv/mpeg/tspacket.h mythtv-0.18.1/libs/libmythtv/mpeg/tspacket.h
--- mythtv-0.18.1-orig/libs/libmythtv/mpeg/tspacket.h 2004-12-07 18:04:08.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/mpeg/tspacket.h 2005-12-13 12:00:49.000000000 -0800
@@ -139,6 +139,7 @@
static const unsigned int SIZE = 188;
static const unsigned int PAYLOAD_SIZE = SIZE-HEADER_SIZE;
+ static const TSPacket *NULL_PACKET;
private:
unsigned char _tspayload[184];
};
diff -ur mythtv-0.18.1-orig/libs/libmythtv/nuppeldecoder.h mythtv-0.18.1/libs/libmythtv/nuppeldecoder.h
--- mythtv-0.18.1-orig/libs/libmythtv/nuppeldecoder.h 2005-02-22 21:04:36.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/nuppeldecoder.h 2005-12-13 12:01:13.000000000 -0800
@@ -55,8 +55,8 @@
QString GetEncodingType(void);
private:
- inline bool NuppelDecoder::ReadFileheader(struct rtfileheader *fileheader);
- inline bool NuppelDecoder::ReadFrameheader(struct rtframeheader *frameheader);
+ inline bool ReadFileheader(struct rtfileheader *fileheader);
+ inline bool ReadFrameheader(struct rtframeheader *frameheader);
bool DecodeFrame(struct rtframeheader *frameheader,
unsigned char *lstrm, VideoFrame *frame);
diff -ur mythtv-0.18.1-orig/libs/libmythtv/NuppelVideoRecorder.h mythtv-0.18.1/libs/libmythtv/NuppelVideoRecorder.h
--- mythtv-0.18.1-orig/libs/libmythtv/NuppelVideoRecorder.h 2005-03-18 22:51:41.000000000 -0800
+++ mythtv-0.18.1/libs/libmythtv/NuppelVideoRecorder.h 2005-12-13 11:53:24.000000000 -0800
@@ -104,7 +104,7 @@
void doVbiThread(void);
private:
- inline void NuppelVideoRecorder::WriteFrameheader(rtframeheader *fh);
+ inline void WriteFrameheader(rtframeheader *fh);
void InitBuffers(void);
void InitFilters(void);
diff -ur mythtv-0.18.1-orig/libs/libmythtv/videosource.h mythtv-0.18.1/libs/libmythtv/videosource.h
--- mythtv-0.18.1-orig/libs/libmythtv/videosource.h 2005-05-04 12:33:00.000000000 -0700
+++ mythtv-0.18.1/libs/libmythtv/videosource.h 2005-12-13 13:05:06.000000000 -0800
@@ -27,9 +27,9 @@
static bool isCardPresent(const QString &strType);
static DVB_TYPES cardDVBType(unsigned nVideoDev);
static DVB_TYPES cardDVBType(unsigned nVideoDev, QString &name);
- static int CardUtil::videoDeviceFromCardID(unsigned nCardID);
- static bool CardUtil::isDVB(unsigned nCardID);
- static DISEQC_TYPES CardUtil::diseqcType(unsigned nCardID);
+ static int videoDeviceFromCardID(unsigned nCardID);
+ static bool isDVB(unsigned nCardID);
+ static DISEQC_TYPES diseqcType(unsigned nCardID);
};
class VideoSource;
pgpC0ci2u5j7Y.pgp
Description: PGP signature
_______________________________________________ mythtv-dev mailing list [email protected] http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
