2011-08-19, 11:17
akezeke Wrote:No spotyxbmc has not been seperated to an addon... yet. The code is better encapsulated to make way for the remake into an addon that will begin soon.
But if you want to use spotyxbmc with the pvr-branch its not that hard, download the pvr branch and the spotyxbmc branch. Create a diff between spotyxbmc and original xbmc master. Apply the diff to the pvr-branch (manually is safest)
There might even be a clever git trick to do it automatically since both branches has the same origin but I don't now how to do it. Someone else perhaps?
Edit:
Tried with this from inside the spotyxbmc2 dir
git remote add pvr git://github.com/opdenkamp/xbmc.git
git fetch pvr
git merge pvr/master
I'v got only one merge conflict and that is in the settings.cpp, the video and music extensions, edit it manually and make sure that .spotify is still in the music part and .pvr is in the video.
Then just mark the confict as solved and build it. worked for me.
/David
THANKS! I will try this at home, but the other way around - adding spotyxbmc2 as another remote. Should only be 1 conflict this way too?