I created a git svn clone of the oscam source code on github. The main branch (oscam-svn) is just a clone of the streamboard svn repository.
https://github.com/joeusercz/OSCam-with-emu-branch
There are also two branches for oscam patched with oscam-emu:
oscam-emu-merged - has been patched already with the oscam-emu patch, and new changes to oscam-svn are merged into it. This means the commits will show the same changes as the oscam-svn branch. If however a change needs to be made to oscam-emu when conflicts occur, those changes will show up as separate commits. So this branch will show (via commit history) all the changes made for oscam-svn intermingled with any changes made specifically for oscam-emu to work. Although I did not do so yet, in the future I will try to remember to add the svn revision number to the merge commit.
oscam-emu-rebased - is just that, a branch rebased from the oscam-svn branch. Which means it resets all the commits and then applies the oscam-emu commit at the end. So the last commit will essentially be the oscam-emu patch. ( If a conflict occurs, the changes will be made and included in the commit.) In fact the final commit can be downloaded as a patch if you grab the link for the commit and add '.patch" to the URL. For example, currently the last commit is here:
https://github.com/joeusercz/OSCam-with-emu-branch/commit/aa2f6684ec1df125e54e7aef0616e03df2e8ec79So, if you want to download it as a patch, append ".patch" as follows:
https://github.com/joeusercz/OSCam-with-emu-branch/commit/aa2f6684ec1df125e54e7aef0616e03df2e8ec79.patchwget -O oscam-emu.patch https://github.com/joeusercz/OSCam-with-emu-branch/commit/aa2f6684ec1df125e54e7aef0616e03df2e8ec79.patchThen you will have a patch which can be applied.
!!! Note: the patch created this way needs to be applied with the "-p1" option instead of the usual "-p0" option. Unfortunately this makes it difficult to use with simplebuild (although it is fairly easy to modify simplebuild...)
Please, please, please DO NOT pester me (and more importantly the entire forum) with update requests. I will try to keep it updated, but I will not always have time. I will see about making some scripts to automate the updates, but in reality the vast majority of time that people are looking for the latest oscam-emu is because the current patch no longer cleanly applies to the latest oscam-svn revision - and in this case, the automated update will fail and have to be hand tweeked anyway.
- - - Updated - - -
BTW - if you want to use simplebuld without modifying it, you can try this trick.
In one terminal, start simplebuild:
./s3 menu
select "continue with local svn revision xxxxx"
Then in another terminal do the following:
mv oscam-svn oscam-svn.sv
git clone -b oscam-emu-merged https://github.com/joeusercz/OSCam-with-emu-branch.git oscam-svnThen back in first terminal choose your toolchain and options and build.
(make sure in build extra options you do not have use patch enabled.)
This will make binaries with no svn version in the filename. To include the svn version from the oscam-svn, try the following:
In one terminal, start simplebuild:
./s3 menu
select "continue with local svn revision xxxxx"
Then in another terminal do the following:
cd oscam-svn
git init .
git remote add origin https://github.com/joeusercz/OSCam-with-emu-branch.git
git pull origin oscam-emu-mergedThen back in first terminal choose your toolchain and options and build.
(make sure in build extra options you do not have use patch enabled.)
This method overwrites all the oscam files with the patched/added oscam-emu files, but keeps the svn information. With this method, you can restart s3 and build again without loosing your oscam-emu files. (until the server svn revision changes...)
