XBMC 64 bit, patching - Hunk #1 FAILED (Suse 11.1)

Hi folks. I jut realized how cool this application is!

I am trying to install it from source because the bug with the webserver seems to be fixed in the SVN version.

All the dependencies are fine. Checked it many times. I need to patch the make files, because:

x86_64 users need to export CFLAGS and apply a patch because a non standard libdir on ubuntu (the only one supported)

At the begining it is running fine

patching file xbmc/FileSystem/Makefile
patching file xbmc/linux/Makefile.in
patching file xbmc/Makefile

Then I receive here the following EM:

patching file xbmc/utils/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file xbmc/utils/Makefile.rej

The Makefile.rej

***************
*** 1,4 ****
- INCLUDES=-I. -I.. -I../linux -I../../guilib
  
  SRCS=AlarmClock.cpp \
       Archive.cpp \
--- 1,4 ----
+ INCLUDES=-I. -I.. -I../linux -I../../guilib -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
  
  SRCS=AlarmClock.cpp \
       Archive.cpp \

And if I try to make it, this is the output:
pastebin - collaborative debugging tool

Any suggestions? I’ve checked the some forums, could not find anything similar.

Hi
Can you post the Makefile and also the patch your using on pastebin?


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 1 day 22:15, 2 users, load average: 0.20, 0.14, 0.15
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

Of course I can! There is a link above with the instructions. But you can find the patch here:
pastebin - collaborative debugging tool

Makefile (xbmc/utils/Makefile) seems to be unchanged after the unsuccessful patching:

INCLUDES=-I. -I.. -I../../ -I../linux -I../../guilib

SRCS=AlarmClock.cpp \
     Archive.cpp \
     CharsetConverter.cpp \
     CriticalSection.cpp \
     DelayController.cpp \
     Event.cpp \
     fstrcmp.cpp \
     GUIInfoManager.cpp \
     HTMLTable.cpp \
     HTMLUtil.cpp \
     HttpHeader.cpp \
     IMDB.cpp \
     InfoLoader.cpp \
     log.cpp \
     MusicAlbumInfo.cpp \
     MusicInfoScraper.cpp \
     RegExp.cpp \
     RssReader.cpp \
     ScraperParser.cpp \
     SingleLock.cpp \
     Splash.cpp \
     Stopwatch.cpp \
     SystemInfo.cpp \
     TuxBoxUtil.cpp \
     UdpClient.cpp \
     Weather.cpp \
     Thread.cpp \
     SharedSection.cpp \
     Win32Exception.cpp \
     CPUInfo.cpp \
     PCMAmplifier.cpp \
     LabelFormatter.cpp \
     Network.cpp \
     BitstreamStats.cpp \
     PerformanceStats.cpp \
     PerformanceSample.cpp \
     LCDFactory.cpp \
     LCD.cpp \
     EventServer.cpp \
     EventPacket.cpp \
     EventClient.cpp \
     Socket.cpp \
     Fanart.cpp \
     ScraperUrl.cpp \
     MusicArtistInfo.cpp \
     RssFeed.cpp \
     Mutex.cpp \
     md5.cpp \
     ArabicShaping.cpp \
     AsyncFileCopy.cpp \
     DbusServer.cpp \
     Atomics.cpp \
     LockFree.cpp \
     StreamDetails.cpp

LIB=utils.a

include ../../Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Hi
It should be;


diff -uNr XBMC/xbmc/utils/Makefile old-XBMC/xbmc/utils/Makefile
--- XBMC/xbmc/utils/Makefile	2009-07-21 17:31:43.000000000 -0500
+++ old-XBMC/xbmc/utils/Makefile	2009-07-21 17:32:22.000000000
-0500
@@ -1,4 +1,4 @@
-    INCLUDES=-I. -I.. -I../../ -I../linux -I../../guilib
+    INCLUDES=-I. -I.. -I../linux -I../../guilib
-I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include

SRCS=AlarmClock.cpp \
Archive.cpp \

There is a subtle difference in your Makefile to the patch… Incase
of word wrap see here for the corrected one.


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 2 days 3:26, 3 users, load average: 0.26, 0.13, 0.11
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

It did not work out so I downloaded the whole source again, at patching with this:
http://pastebin.com/m55f7fd
the make file:
http://pastebin.com/m1796c8e8

I got this:

(Stripping trailing CRs from patch.)
patching file xbmc/FileSystem/Makefile
Hunk #1 succeeded at 1 with fuzz 1.
(Stripping trailing CRs from patch.)
patching file xbmc/linux/Makefile.in
(Stripping trailing CRs from patch.)
patching file xbmc/Makefile
(Stripping trailing CRs from patch.)
patching file xbmc/utils/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file xbmc/utils/Makefile.rej

Hi
But that make file is different, if you look at the patch is says line
1, column 4 (-1,4 +1,4 @@) your Makefile starts at 1,1

Add spaces and see how that goes


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 18:44, 2 users, load average: 0.35, 0.26, 0.20
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

I am sorry, can not really see your point. Could you please explain me where to add the spaces?

(by the way i am not sure that this paste.bin the best page… can it be that you see a different content than I am?)

Thanks for your support.

Hi
In the first line that starts with INCLUDES on the pastepib site I see;


INCLUDES=

it should be

INCLUDES=

Indented I guess I should have said so the I of INCLUDE starts at
column 5 :slight_smile:


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 1 day 0:03, 2 users, load average: 0.30, 0.12, 0.10
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

I moved “-INCLUDES” and “+INCLUDES” rows to column 5

Now I get different EM:

(Stripping trailing CRs from patch.)
patching file xbmc/utils/Makefile
patch: **** malformed patch at line 8:  SRCS=AlarmClock.cpp \


The Patch looks like this:

diff -uNr XBMC/xbmc/utils/Makefile old-XBMC/xbmc/utils/Makefile
--- XBMC/xbmc/utils/Makefile	2009-07-21 17:31:43.000000000 -0500
+++ old-XBMC/xbmc/utils/Makefile	2009-07-21 17:32:22.000000000 -0500
@@ -1,4 +1,4 @@
    -INCLUDES=-I. -I.. -I../../ -I../linux -I../../guilib
    +INCLUDES=-I. -I.. -I../linux -I../../guilib -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
   
 SRCS=AlarmClock.cpp \
      Archive.cpp \

Did you check webpin to see if any of the versions packaged there are SVN versions? For example user “gwayne” packages a version that is slightly newer than the packman packaged version: Webpin - search for xbmc

Also, is there anything in this thread that might be of help:
XBMC segmentation fault in KDE 4.3 RC1 - openSUSE Forums
… again, … its also a significantly different approach than what you are asking about.

Hi
You need to look at the XBMC/xbmc/utils/Makefile and see if there is a
difference else just skip the patch and manuall chnage the line in the
Makefile :slight_smile:


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 1 day 12:45, 2 users, load average: 0.05, 0.01, 0.00
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

There is only an i586 version. And the dependencies to solve for that would take a while, so i just try to play couple of days more with the source.

ps.: by the was I saw tha other post, and I was the user “nagybal” who confirmed the solution first :stuck_out_tongue:

That case has to do less with this issue.

Is there only that first line to change ? Right?

Hi
Correct, just replace the one line, then whatever call the patch, rem
it out or remove it :slight_smile:


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 1 day 16:26, 2 users, load average: 0.62, 0.45, 0.33
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14

Heureka! I am so proud of myself! :smiley:

I am able to controll my damm media player with my phone… I get the track info, cover etc by XBMC downloaded form the internet :slight_smile:

Thank You for your help! Now there is one more question… the source folder is now 900+ MB. Is there a way to make a ~90 MB RPM from it so I can save it for later? :slight_smile:

Hi
For sure, just grab a src rpm from
http://download.opensuse.org/repositories/home:/andrewhiscox:/XBMC/openSUSE_11.1/src/
and unpack it and look at the spec file and modify as required. You
then need to copy all your patches and the ORGINAL source file
into /usr/src/packages/SOURCES directory and then use the rpmbuild -ba
xbmc.spec command to build it.


Cheers Malcolm °¿° (Linux Counter #276890)
SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 2.6.27.23-0.1-default
up 1 day 17:53, 2 users, load average: 0.19, 0.12, 0.12
GPU GeForce 8600 GTS Silent - Driver Version: 185.18.14