Hi Darrell and others trying out defringe, please do NOT use the 326.patch as this is OLD already. A guide follows below, but first to stop some confusion:
I intentionally posted this ONLY on darktable-devel and NOT on darktable-users because I also mostly wanted feedback from potential developers only (maybe also on the code, though I didn't get that so far), as this module is not ready for primetime yet. I am also something you might call a "3rd party developer", not directly associated with the darktable developers. So it also isn't in their responsibility to give a guide to try out experimental things (if you consider them having any responsibilities at all, doing this completely in their freetime). The easiest (but also bandwidth intense - this downloads the whole repo again) is to just get MY (not the official) repository completely and checkout the defringe branch: git clone https://github.com/bluesceada/darktable.git darktable-bluesceada cd darktable-bluesceada git checkout defringe Now you can use ./build.sh etc. like you know already Anyway, if you really want to do this in your current darktable checkout/clone, try the following. Best to read about everything before, to know what you are doing. And I can't give you any detailed troubleshooting help, because I am using the repos in a slightly different way: 1. edit your .git/config inside your current darktable checkout from the official repository, add the following/my repo as an additional remote repository: [remote "bluesceada"] fetch = +refs/heads/*:refs/remotes/bluesceada/* url = https://github.com/bluesceada/darktable.git 2. fetch my repository objects: git fetch bluesceada 3. checkout my defringe branch git checkout bluesceada/defringe 4. compile with ./build.sh etc. Hope this helps - but please be also aware of all potential side effects and read what Max Killer/hal wrote in one of the mails before... Best regards, Dennis On 03.11.2013 15:31, Bruce Albert wrote: > As you have already discovered, the git environment is extremely hostile to > those not expert in its use. > In fairness, developers work hard on their projects, and don't want to waste > their time on software > housekeeping, which is what git does for them. But it makes it very difficult > for those who are not > developers to participate in the evaluation of, and experimentation with, new > software. It seems a bit > unfair to advertise all the new and great features available, and then cloak > them inside an > unapproachable access system like git. There are other revision systems > besides git, but they all > share the same characteristics of being useful to those who use them all the > time, and unintelligible > to those who do not. > > Nonetheless, I fought the fight, and managed to get it working. But it took a > lot of searching > and experimenting; purists will say it's probably not the "right" way to do > it, and it isn't, > but it works. > > BEFORE YOU DO ANY OF THE FOLLOWING, heed well the advice already given, that > for critical work, > you probably don't want to use this; you want to use a more stable version. > Also, be sure to backup > your ~/.config/darktable directory -- really do that, because a test version > of the program may > change your data in such a way as to make it unusable by the regular program. > > I'm not sure what you mean by the "LCA branch", but if you mean the > purple-defringe module, > here's how I got it working: > > 1. Make a directory somewhere to put this, I use /opt/darktable. chown that > directory to your username, > so you don't have to fight permissions all the time. > > 3. Inside /opt/darktable, run: > > git clone git://github.com/darktable-org/darktable.git purple-defringe > > This will take some time; it downloads the main branch of darktable into a > directory called defringe. > > 4. cd into the defringe directory, and run: > > curl https://github.com/darktable-org/darktable/pull/326.patch | git am > > This will download the purple-defringe module, and apply the patch. You will > see an output that looks > something like this: > ----- > % Total % Received % Xferd Average Speed Time Time Time > Current > Dload Upload Total Spent Left > Speed > 100 61098 100 61098 0 0 55013 0 0:00:01 0:00:01 --:--:-- 55043 > Applying: defringe: Module for removing fringes (e.g. most common purple > fringing, caused by > longitudinal CA) - it can however also work to remove traditional CA > /opt/darktable-devel/darktable/.git/rebase-apply/patch:549: trailing > whitespace. > > warning: 1 line adds whitespace errors. > Applying: defringe: ran the iop dependencies script > ----- > > 5. Since I am using ubuntu with the > https://launchpad.net/~dhor/+archive/myway ppa enabled, I get the > latest regular build of darktable installed automatically, so I put the test > versions in /usr/local. > To do this, > from your defringe directory run > ./build.sh --prefix /usr/local --buildtype release > Once that runs successfully, you will need to cd ./build and run sudo make > install, as usual. > Then you run it with "/usr/local/bin/darktable" > > That's it, and for me, it works. > > Sorry for the long post, but I literally spent two whole days figuring this > out, and I think it's fair > to share it with others who have been frustrated by git. > > > On 11/03/2013 04:38 AM, Darrell Eifert wrote: >> Hello Dimitrios -- >> >> Thank you for the link, although is seems to be oriented more towards >> potential developers. As a >> basic user of darktable, I would appreciate a specific list of commands >> similar to what is on the >> "Install" page for whatever it takes to download the LCA removal branch, >> compile it into darktable for >> testing, and then re-set my local git copy to master without any >> experimental branches. >> >> Best, >> -- Darrell >> >> >> On Sunday, November 3, 2013 5:41 AM, Dimitrios Psychogios >> <dpsychog...@gmail.com> wrote: >> Have you already seen >> http://darktable.org/redmine/projects/darktable/wiki/Hacking_on_darktable ? >> >> >> On Sat, Nov 2, 2013 at 11:28 PM, Darrell Eifert <darrelleif...@yahoo.com >> <mailto:darrelleif...@yahoo.com>> wrote: >> >> Hello -- >> >> I (and possibly many others who are compiling darktable from git) would >> be grateful for a short >> tutorial on how to change from master to a branch of interest, compile >> DT, and then change back >> again to a "good" version if something goes wrong. I am interested in >> testing out the LCA removal >> module, but am hesitant to play with the various git commands for fear >> of losing my working copy. >> >> I began using git by following the very clear instructions on >> http://www.darktable.org/install/, >> but got lost trying to sort out various gereric git tutorials from >> around the 'net. >> >> Thanks in advance. >> >> -- Darrell >> > > ------------------------------------------------------------------------------ > Android is increasing in popularity, but the open development platform that > developers love is also attractive to malware creators. Download this white > paper to learn more about secure code signing practices that can help keep > Android apps secure. > http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk > _______________________________________________ > darktable-devel mailing list > darktable-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/darktable-devel > ------------------------------------------------------------------------------ Android is increasing in popularity, but the open development platform that developers love is also attractive to malware creators. Download this white paper to learn more about secure code signing practices that can help keep Android apps secure. http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk _______________________________________________ darktable-devel mailing list darktable-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/darktable-devel
