1 bsnes-0.079-gcc46.patch, 1.1 - query

[Julian Sikorski]

W dniu 04.07.2011 04:30, Kevin Kofler pisze:
> David Timms wrote:
> 
>> On 04/07/11 02:01, Julian Sikorski wrote:
>>
>>> - Updated the gcc-4.6 patch
>>>
>>> Index: bsnes-0.079-gcc46.patch
>>> ===================================================================
>>> RCS file: /cvs/free/rpms/bsnes/devel/bsnes-0.079-gcc46.patch,v
>>> retrieving revision 1.1
>>> retrieving revision 1.2
>>> diff -u -r1.1 -r1.2
>>> --- bsnes-0.079-gcc46.patch	20 Jun 2011 22:50:44 -0000	1.1
>>> +++ bsnes-0.079-gcc46.patch	3 Jul 2011 16:01:18 -0000	1.2
>>> @@ -10,42 +10,3 @@
>>>        case GameBoy::Input::Start:  return data&  0x80;
>>>        case GameBoy::Input::Select: return data&  0x40;
>>>        case GameBoy::Input::B:      return data&  0x20;
>>> -diff -up bsnes_v079-source/bsnes/ui/input/input.cpp.gcc46
>>> bsnes_v079-source/bsnes/ui/input/input.cpp
>>> ---- bsnes_v079-source/bsnes/ui/input/input.cpp.gcc46	2011-03-24
>>> 19:33:58.000000000 +0100
>>> -+++ bsnes_v079-source/bsnes/ui/input/input.cpp	2011-06-21
>>> 00:02:22.971853731 +0200 -@@ -82,7 +82,7 @@ void
>>> InputMapper::Gamepad::create(const - }
>>> -
>>> - int16_t InputMapper::Gamepad::poll(unsigned id) {
>>> --  switch(id) {
>>> -+  switch((SNES::Input::JoypadID)id) {
>>> -     case SNES::Input::JoypadID::Up:     return up.poll();
>>> -     case SNES::Input::JoypadID::Down:   return down.poll()& 
>>> !up.poll();
>>> -     case SNES::Input::JoypadID::Left:   return left.poll();
>>> -@@ -118,7 +118,7 @@ void InputMapper::Mouse::create(const ch
>>> - }
>> ...
>> Hi Julian, I'd like to get to know the package better while you are
>> still making changes. Do upstream develop on an earlier gcc ? Are they
>> reluctant to move to newer (eg what is deb/ubuntu using these days) ?
>>
>> What is the key to this patch (it looks like an input method is being
>> deleted, without looking into it further) ?
> 
> This is a diff of a diff. It means a hunk of the diff got removed, which 
> changed "switch(id)" to "switch((SNES::Input::JoypadID)id)". In other words, 
> upstream fixed one of the GCC 4.6 issues and as such a patch is no longer 
> needed for that part.
> 
>         Kevin Kofler
> 
> 
Exactly what Kevin said. Upstream uses gcc-4.5 and if you look into the
sources, the vanilla package tries to run "gcc-4.5" and not "gcc" in the
makefiles.

Julian