Dxr3 patch

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i have
this error : 1
out of 3 hunks FAILED
– saving rejects to file configure.in.rej***************
*** 1698,1703 ****
case “$target” in
--linux*)
ARCH=linux
CheckDummyVideo
CheckDiskAudio
CheckDLOPEN
— 1719,1725 ----
case “$target” in
--linux*)
ARCH=linux

  •     CheckDxr3Video
        CheckDummyVideo
        CheckDiskAudio
        CheckDLOPEN
    

I’m a newbie in compilation and can’t understand what i have to change.
Thanks
Eric

-------------- next part --------------
A non-text attachment was scrubbed…
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Ceci est une partie de message num?riquement sign?e.
URL: http://lists.libsdl.org/pipermail/sdl-libsdl.org/attachments/20040909/ea312f10/attachment.pgp

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i have
this error : 1

This is a shot in the dark because I’ve only ever used SDL release
versions…

Isn’t that patch for SDL 1.2.6?On Sep 9, 2004, at 1:19 AM, Eric Tanguy wrote:

Eric Tanguy wrote:

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i have
this error : 1
out of 3 hunks FAILED
– saving rejects to file configure.in.rej


*** 1698,1703 ****
case “$target” in
--linux*)
ARCH=linux
CheckDummyVideo
CheckDiskAudio
CheckDLOPEN
— 1719,1725 ----
case “$target” in
--linux*)
ARCH=linux

  •     CheckDxr3Video
       CheckDummyVideo
       CheckDiskAudio
       CheckDLOPEN
    

I’m a newbie in compilation and can’t understand what i have to change.

You just have to add a line containing “CheckDxr3Video” after the line
"ARCH=linux"

Stephane

Eric Tanguy wrote:

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i have
this error : 1
out of 3 hunks FAILED
– saving rejects to file configure.in.rej


*** 1698,1703 ****
case “$target” in
--linux*)
ARCH=linux
CheckDummyVideo
CheckDiskAudio
CheckDLOPEN
— 1719,1725 ----
case “$target” in
--linux*)
ARCH=linux

  •     CheckDxr3Video
       CheckDummyVideo
       CheckDiskAudio
       CheckDLOPEN
    

I’m a newbie in compilation and can’t understand what i have to change.

You just have to add a line containing “CheckDxr3Video” after the line
"ARCH=linux"

Stephane

I’m not sure to well understand your answer : in which file i have to add
CheckDxr3Video ? In the patch file ??
Thanks
Eric

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i
have this error : 1

This is a shot in the dark because I’ve only ever used SDL release
versions…

Isn’t that patch for SDL 1.2.6?

Yes that patch is for SDL 1.2.6 but in Fedora Core 2 the SDL version is
1.2.7 so i try to adapt it to this version.
Thanks
Eric> On Sep 9, 2004, at 1:19 AM, Eric Tanguy wrote:

Eric Tanguy wrote:

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i have
this error : 1
out of 3 hunks FAILED
– saving rejects to file configure.in.rej


*** 1698,1703 ****
case “$target” in
--linux*)
ARCH=linux
CheckDummyVideo
CheckDiskAudio
CheckDLOPEN
— 1719,1725 ----
case “$target” in
--linux*)
ARCH=linux

  •     CheckDxr3Video
       CheckDummyVideo
       CheckDiskAudio
       CheckDLOPEN
    

I’m a newbie in compilation and can’t understand what i have to change.

You just have to add a line containing “CheckDxr3Video” after the line
"ARCH=linux"

Stephane

I’m not sure to well understand your answer : in which file i have to add
CheckDxr3Video ? In the patch file ??

No, the reject is called configure.in.rej, thus you should add the changes to configure.in
So :

  • open configure.in in an editor
  • look for the “case target…” statemement around line 1700
  • add “CheckDxr3Video” after “ARCH=linux”

Stephane

Eric Tanguy wrote:

I’m trying to apply SDL-1.2.6-dxr3-ffmpeg.patch to SDL 1.2.7 but i
have

this error : 1
out of 3 hunks FAILED
– saving rejects to file configure.in.rej


*** 1698,1703 ****
case “$target” in
--linux*)
ARCH=linux
CheckDummyVideo
CheckDiskAudio
CheckDLOPEN
— 1719,1725 ----
case “$target” in
--linux*)
ARCH=linux

  •     CheckDxr3Video
       CheckDummyVideo
       CheckDiskAudio
       CheckDLOPEN
    

I’m a newbie in compilation and can’t understand what i have to
change.

You just have to add a line containing “CheckDxr3Video” after the
line “ARCH=linux”

Stephane

I’m not sure to well understand your answer : in which file i have to
add CheckDxr3Video ? In the patch file ??

No, the reject is called configure.in.rej, thus you should add the
changes to configure.in So :

  • open configure.in in an editor
  • look for the “case target…” statemement around line 1700
  • add “CheckDxr3Video” after “ARCH=linux”

Stephane

Ok but there a lot of other lines in the patch file, so i have to delete
these lines from the patch file before trying to apply it one more time ?
Thanks
Eric

Ok but there a lot of other lines in the patch file, so i have to delete
these lines from the patch file before trying to apply it one more time ?

No. Here is how applying a patch works :

  • you use the “patch” command to apply a patch. The parts that can be applied automatically are applied to the source and the corresponding lines are modified/added/removed.
  • the parts that can’t be applied automatically end up in .rej files (this is not always the case, most of the time patches apply cleanly). They have to be dealt with by hand.

So applying a full patch means doing both. Which means that you shouldn’t remove the changes already in place, since they are the first part. Now you have to do the second one : look at what you have in the .rej files, and apply it to the corresponding files. In your case it’s quite simple since it only involves adding a single line in configure.in as described previously.

Stephane

Thank you very much I will try it soon!
Eric>>

Ok but there a lot of other lines in the patch file, so i have to
delete these lines from the patch file before trying to apply it one
more time ?

No. Here is how applying a patch works :

  • you use the “patch” command to apply a patch. The parts that can be
    applied automatically are applied to the source and the corresponding
    lines are modified/added/removed. - the parts that can’t be applied
    automatically end up in .rej files (this is not always the case, most of
    the time patches apply cleanly). They have to be dealt with by hand.

So applying a full patch means doing both. Which means that you
shouldn’t remove the changes already in place, since they are the first
part. Now you have to do the second one : look at what you have in the
.rej files, and apply it to the corresponding files. In your case it’s
quite simple since it only involves adding a single line in configure.in
as described previously.

Stephane


SDL mailing list
SDL at libsdl.org
http://www.libsdl.org/mailman/listinfo/sdl