twin-image & orpheus patch for gcc 4.3

twin-image & orpheus patch for gcc 4.3

[Lucian Ion]

[-- Attachment #1: Type: text/plain, Size: 3123 bytes --]

Hi,

I couldn't build twin-image today.

Then I found this patch:
http://bugs.gentoo.org/61223

I've attached the solution to fix the problem.

orpheus-gcc-3.4.patch

diff -Naur old/mixerctl.cc new/mixerctl.cc
--- orpheus-1.5/src/mixerctl.cc 2004-09-04 02:44:12.797543753 +0200
+++ orpheus-1.5/src/mixerctl.cc 2004-09-04 02:44:47.889365170 +0200
@@ -50,7 +50,7 @@

     if((fd = ::open(devname.c_str(), O_RDWR)) != -1) {
        if(ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) != -1) {
-           for(ct = ctVolume; ct != channeltype_end; (int) ct += 1) {
+           for(ct = ctVolume; ct != channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
                if((1 << (int) ct) & devmask) {
                    channels.insert(ct);
                }
diff -Naur old/uitext.cc new/uitext.cc
--- orpheus-1.5/src/uitext.cc   2004-09-04 01:48:30.955457434 +0200
+++ orpheus-1.5/src/uitext.cc   2004-09-04 02:42:30.689719181 +0200
@@ -577,14 +577,14 @@
                        autosavepl = !autosavepl;
                        break;
                    case 41:
-                       if(++((int) playmode) == PlayMode_size)
+                       if(((int) playmode + 1) == PlayMode_size)
                            playmode = Normal;
                        break;
                    case 42:
                        autoplay = !autoplay;
                        break;
                    case 43:
-                       if(++((int) sortorder) == SortOrder_size)
+                       if(((int) sortorder + 1) == SortOrder_size)
                            sortorder = byFileName;
                        break;
                    case 44:
@@ -719,7 +719,7 @@
     while(!finished) {
        m.clear();

-       for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; (int) ct += 1) {
+       for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
            if(chavail.count(ct)) {
                val = mix.readlevel(ct);
                if(val >= 0) {


Regards,
Lucian Ion
Software Engineer
Microsol Ltd.

_______________________________________________________________________

This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to which they are addressed.

If you have received this email in error please notify the originator of the message. 
This footer also confirms that this email message has been scanned for the presence of computer viruses.

Any views expressed in this message are those of the individual sender, except where the sender specifies and with authority, states them to be the views of Microsol.

If you have received this mail in error you are requested to e-mail us (info@microsol.ie) or by telephoning Microsol on +353 14153700.

Please Visit our website at
http://www.microsol.com

_______________________________________________________________________

This email has been scanned for all viruses.
_______________________________________________________________________

[-- Attachment #2: orpheus.tar.bz2 --]
[-- Type: application/octet-stream, Size: 17266 bytes --]

Re: twin-image & orpheus patch for gcc 4.3

[Stefan Schmidt]

Hello.

On Thu, 2009-05-28 at 15:09, Lucian Ion wrote:
> 
> I couldn't build twin-image today.
> 
> Then I found this patch:
> http://bugs.gentoo.org/61223
> 
> I've attached the solution to fix the problem.
> 
> orpheus-gcc-3.4.patch

Sorry for the very late reply. I just stumpled over it in our patchwork setup.

The patch you sent is going to be applied directly to orpheus. What we would
need for OE is a patch that adds it into our tree and modifies the recipe to
apply it. Care to resend such a patch?

regards
Stefan Schmidt