libsdl patch failure

libsdl patch failure

[Koen Kooi]

Hi,

Is anyone else seeing this:

OTE: package libsdl-1.2.14-r5: task do_unpack: Started
NOTE: package libsdl-1.2.14-r5: task do_unpack: Succeeded
NOTE: Running task 1611 of 1622 (ID: 1, /OE/tentacle/sources/openembedded-core/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb, do_patch)
NOTE: package libsdl-1.2.14-r5: task do_patch: Started
ERROR: Command Error: exit status: 1  Output:
Applying patch add.XGetRequest.symbol.patch
missing header for unified diff at line 11 of patch
can't find file to patch at input line 11
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|_XGetRequest API was backported to libx11-1.4.4 in:
|http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91
|
|This breaks e.g. libsdl-image build with:
|| /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libSDL.so: undefined reference to `_XGetRequest'
|
|For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251
|
|Upstream-Status: Accepted
|
--------------------------
No file to patch.  Skipping patch.
patch: **** missing line number at line 11: @@ -, +, @@

Patch add.XGetRequest.symbol.patch does not apply (enforce with -f)


regards,

Keon

Re: libsdl patch failure

[Paul Eggleton]

On Wednesday 22 February 2012 17:40:03 Koen Kooi wrote:
> Is anyone else seeing this:
> 
> OTE: package libsdl-1.2.14-r5: task do_unpack: Started
> NOTE: package libsdl-1.2.14-r5: task do_unpack: Succeeded
> NOTE: Running task 1611 of 1622 (ID: 1,
> /OE/tentacle/sources/openembedded-core/meta/recipes-graphics/libsdl/libsdl_
> 1.2.14.bb, do_patch) NOTE: package libsdl-1.2.14-r5: task do_patch: Started
> ERROR: Command Error: exit status: 1  Output:
> Applying patch add.XGetRequest.symbol.patch
> missing header for unified diff at line 11 of patch
> can't find file to patch at input line 11

FWIW I did just build libsdl-nativesdk and did not have this problem...

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: libsdl patch failure

[Koen Kooi]

Op 22 feb. 2012, om 18:05 heeft Paul Eggleton het volgende geschreven:

> On Wednesday 22 February 2012 17:40:03 Koen Kooi wrote:
>> Is anyone else seeing this:
>> 
>> OTE: package libsdl-1.2.14-r5: task do_unpack: Started
>> NOTE: package libsdl-1.2.14-r5: task do_unpack: Succeeded
>> NOTE: Running task 1611 of 1622 (ID: 1,
>> /OE/tentacle/sources/openembedded-core/meta/recipes-graphics/libsdl/libsdl_
>> 1.2.14.bb, do_patch) NOTE: package libsdl-1.2.14-r5: task do_patch: Started
>> ERROR: Command Error: exit status: 1  Output:
>> Applying patch add.XGetRequest.symbol.patch
>> missing header for unified diff at line 11 of patch
>> can't find file to patch at input line 11
> 
> FWIW I did just build libsdl-nativesdk and did not have this problem...

Are you using 'git' as PATCHTOOL or plain patch? 'patch' on my debian system chokes, while 'git apply' works fine. I've sent a patch to make it work with either.

regards,

Koen

Re: libsdl patch failure

[Martin Jansa]

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

On Thu, Feb 23, 2012 at 06:44:29PM +0100, Koen Kooi wrote:
> 
> Op 22 feb. 2012, om 18:05 heeft Paul Eggleton het volgende geschreven:
> 
> > On Wednesday 22 February 2012 17:40:03 Koen Kooi wrote:
> >> Is anyone else seeing this:
> >> 
> >> OTE: package libsdl-1.2.14-r5: task do_unpack: Started
> >> NOTE: package libsdl-1.2.14-r5: task do_unpack: Succeeded
> >> NOTE: Running task 1611 of 1622 (ID: 1,
> >> /OE/tentacle/sources/openembedded-core/meta/recipes-graphics/libsdl/libsdl_
> >> 1.2.14.bb, do_patch) NOTE: package libsdl-1.2.14-r5: task do_patch: Started
> >> ERROR: Command Error: exit status: 1  Output:
> >> Applying patch add.XGetRequest.symbol.patch
> >> missing header for unified diff at line 11 of patch
> >> can't find file to patch at input line 11
> > 
> > FWIW I did just build libsdl-nativesdk and did not have this problem...
> 
> Are you using 'git' as PATCHTOOL or plain patch? 'patch' on my debian system chokes, while 'git apply' works fine. I've sent a patch to make it work with either.

I also haven't seen patch failing.

I'm not setting PATCHTOOL, but I have PATCHRESOLVE = "noop" if that
implies some other tool.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: libsdl patch failure

[Paul Eggleton]

On Thursday 23 February 2012 22:04:32 Martin Jansa wrote:
> > Are you using 'git' as PATCHTOOL or plain patch? 'patch' on my debian
> > system chokes, while 'git apply' works fine. I've sent a patch to make it
> > work with either.
> I also haven't seen patch failing.
> 
> I'm not setting PATCHTOOL, but I have PATCHRESOLVE = "noop" if that
> implies some other tool.

I'm not setting it either, which means it will be using the default (which is 
quilt according to a git grep). I have to admit I was not even aware of this 
option until now.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre