Closed Beep6581 closed 7 years ago
I removed "#3264 Merge branch newwavelet" so that RT5 gets out sooner and so that we have more time and less stress to complete and test the newwavelet branch.
The gtk3
branch has been well tested using Gtk+ 3.18, and it works generally great except for #3223 - Gtk::FileChooserButton are slow to load. I suggest releasing RT5 with a gtk3
-branch dependency requirement on Gtk+ 3.16 - 3.18. We leave 3.20 support for RT-5.1, not only because it would require weeks or months for patching and testing but also because most distros don't even ship it yet. Any objections?
One objection: As I'm still building master (gtk2) on windows, I need some help to build gtk3 an windows to avoid outage
Making gtk3
the new master
does not have to happen when 5.0 is tagged. My suggestion was just about making the RT-5.0 gtk3
branch have Gtk+ 3.16 or 3.18 as a requirement - that is we agree not to support 3.20 until after 5.0 is tagged.
Ok, then I agree :+1:
@heckflosse If you need help with the gtk3 branch on Windows, just drop me a word by email when you're ready to experiment.
So if I understand correctly, the soft-proofing branch is one of the last issue to fix... :-/ I'll have to put the Locked Color Picker patch on hold and finish the Soft-proofing feature first. Do you agree to have a suboptimal soft-proof feature ? i.e. something stable and better than today's situation but still unfinished ?
I think that would be fine. Reasons:
I added #3048
Please apply PR #3443 before releasing RT 5. it fixes a buffer overflow in dcraw.
@innir I added it to the checklist above
@Hombre57
@heckflosse If you need help with the gtk3 branch on Windows, just drop me a word by email when you're ready to experiment
Problem solved by using different folders for building master and gtk3 :)
Great ! Now we have to make the new theme work on Windows again, and I have to finish the soft-proofing branch.
@Hombre57 I think we should give priority to rt5 over an optimized softproofing branch. That means, if you agree, I'll look for optimizing softproofing code after rt5 is released. Is that ok?
Ingo
@heckflosse Sure, and I'll only do a first level soft-proofing feature, regarding the comments above.
@Hombre57 Great :+1:
@Hombre57
Now we have to make the new theme work on Windows again
Which is the 'new theme'? I like the 'TooWaBlue' theme using gtk3 branch on Win7. But I don't know whether there are issues using it.
Ingo
Morning
Now we have to make the new theme work on Windows again
What do you mean? Gtk+ 3.16 and 3.18 are supported, 3.20 is not. Which version of Gtk+ did you use and which theme are you referring to?
@Beep6581 @innir Debian Stretch now has GTK 3.22. Will that be supported?
@Floessie Yes, that's the plan, but I can't compile it in Gentoo yet because it would break many other programs.
@Beep6581 Good then! Qemu/KVM to the rescue?
That would be one option, but relatively few people have access to 3.22 making it medium priority. My high priority is the RT website, in dire need of dynamite and nails.
What do you mean? Gtk+ 3.16 and 3.18 are supported, 3.20 is not. Which version of Gtk+ did you use and which theme are you referring to?
I'm using Gtkmm3.22 as that's the one provided by MSYS2 now, and I'm talking about all the bundled theme.
@Floessie Yes, Debian Stretch will ship with GTK+ 3.22. RT in Debian unstable is already built with GTK+ 3.22 and it works fine (from what I see). To be sure to get RT 5 in Debian stretch it should be released latest end of the year.
It would be nice if RT5 could support Gtk+ 3.22... Yesterday I compiled the latest Gtk+ available on Gentoo, that's 3.20.9. If 3.22 is compatible with 3.20, then we can kill two birds with one stone. I want RT5 out very soon, this month. If 3.20/3.22 support doesn't make it into RT5(.0), then by the end of the year we could release a 5.1.
@Beep6581 I already built RT with Gtk+ 3.22, it's in Debian unstable so you could give it a try. I didn't see any obvious problems.
@innir thank you but I don't use Debian and I make my own builds.
TODO when releasing:
clang-tidy
(@Floessie)
If anyone has things they'd like to do, or things they'd like me to do, just before releasing RT5, then feel free to make a list or to edit my list above.
I'll look at the Gtk3.22 theme ASAP, hopefully before the end of next Sunday. If I can't fix it, then you'll have to release a Gtk3.18 Windows version.
@Hombre57 ok, I added #3446 to the list so we don't forget. I was unexpectedly upgraded to Gtk+ 3.20.9 a few days ago.
@Beep6581 I would like to see #3229 fixed with the next RT release. I think a number of advanced or pro photographers turn to the latest Fujifilm cameras, I think complete support of their raw files would make RT more attractive to them, as RT is now known as one of the best raw developers for X-trans files.
@sguyader Hi Sébastien. I already started work at porting the libraw code for compressed xtrans files to rt. But it's a lot of work because it has many dependencies to libraw internals. For that reason I would like to complete it after rt5 is released. @Beep6581 already planned to release 5.1 end of the year. That would fit much better (for me at least) ;-)
@heckflosse ok Ingo, I had no idea it requires so much work to get the libraw code into RT.
Hello
re: https://github.com/Beep6581/RawTherapee/commit/ccd9002c3abc504e3a25b7bbf0489b90b4cf808e#commitcomment-19352462 I like fixes, fixes are good. I'm very glad you guys have been focusing on fixes for so long - RawTherapee is much better off thanks to them.
Generally what one would do at this point is to branch off and make release candidates and then a final release when ready. I could do that, but it would require two branches: a master-rt5
and gtk3-rt5
branch, and then tags in each. A bit messy. But there are only a few of us, and as RT doesn't get new features often anyway, it would be simpler to just agree not to commit anything but fixes for a week or two. Would that work for you? Or do you have strong arguments for branching off?
Committing those cppcheck etc fixes would make it easier to maintain other open branches and patches. I understand there are risks - merging them makes them available to a wider testing audience. Let's do that now, so there is more time for testing and releasing RT5 this month.
Merged cppcheck and let it open for further work
@heckflosse @Beep6581 When and how would you like me to do the clang-tidy
bulk changes (if at all)? I could create a temporary branch from master and apply those changes only for testing. If it still works and builds (which I expect), I could do the same after the soft-proofing branch is merged. What do you think?
At this point we need all the testing we can get. If the clang-tidy changes are to be part of 5.0, and if they're in good enough shape, then it would be better to merge them into master ASAP so nightly builds become available straight away for testing. If these are the kinds of changes that could cause major problems (for example corrupt parts of images which only occur in one image here and there, making them difficult to discover and trace) then it's better to not include them in 5.0. You decide.
@Beep6581
If these are the kinds of changes that could cause major problems (for example corrupt parts of images which only occur in one image here and there, making them difficult to discover and trace) then it's better to not include them in 5.0. You decide.
I've confidence in the clang-tidy
checks that included in the list. Most of them are about streamlining the code, some of them simplify logic. This could be some kind of a problem, and if they are too invasive, I'll skip them. But I only had positive experience with those checks.
Okay then, I'll prepare a branch ASAP so that you can have a look on what will change and what you like or don't like about it. But if it is merged to master, be aware that it will make merging harder. That's why I suggested doing it ALAP. Basically the same rules apply to your astyle
run.
HTH Flössie
No problem with my outstanding work.
I'll probably merge the soft-proofing branch tonight, so there will be no issue for me but for you here.
Regarding the other opened branch :
Adam's Compress thumbnails PR is stalled too. I don't think we can hope for someone to it take over.
I'll tell you my final words about my branches after the analysis of your clang branch @Floessie .
I would really like "newwavelet" to make it into 5.1! It had some bugs the last time I tried it, but @Desmis worked on it after that and I haven't had a chance to properly test it since. "gammadif" I didn't test because I didn't understand what it really did or how to test it. After recent discussions I'm also interested in it.
@Hombre57 No need to get in a hurry because of me. My plan is to provide you all with a clang-tidy
branch to see what will change. This will be a temporary one, which I'll ditch later. When you all and especially @Beep6581 is okay with it, I'll create a new one after all branches for 5.0 have been merged and near the point where @Beep6581 will do his astyle
run. Sounds sane?
To ease merging other branches, I could branch them off and apply clang-tidy
on them, too. Merging them should then be not so much of a problem. Theoretically, git
is smart enough to detect if lines are the same even if they were changed independently.
For me, you do what you want, there will always a way to fix after, either alone or with the help of someone :)
newwavelet: Unless I am mistaken, Ingo has taken time to examine the code some weeks ago.
gammadif: it is an "old" branch, with more features as it seems
locallab: there are two different things in it, as I have already said. 1) the algorithm itself "U-point type", now from my point of view works correctly (it can probabaly be improved and optimzed!), with similar performance has CN2 or Nik Software, which is to say that there is virtually no need to be trimmed objects, or use masks. Even if we can use.
2) management of multiple points, which faces the problem (dcrop.cc) to place the detection area (hue, ligthness, chroma) outside the preview (actually generate crash or dysfunction). This will be the same problem whatever the "multipoint" method, due to RT pipeline.
:)
Here is the demo branch. Some remarks:
readability-braces-around-statements
failed with macros. Maybe astyle can help here (uncrustify definitely can).readability-avoid-const-params-in-decls
found nothing. :+1: readability-redundant-control-flow
neither. :+1: misc-redundant-expression
neither. :+1: HTH Flössie
Hello
How are we with the clang-tidy
and >=gtk+-3.20 branches/patches?
@Beep6581 I have to clean some things up on the clang-tidy
branch (for instance dcraw.cc
has to be reverted prior to merge) and have very little time this week. I can't promise to finish or recreate it this week, but I'll try to somehow make it.
I tried to get RT works with gtk>=3.20, but I'm about to give up. Still on this issue at the moment.
That's official : I give up on making RT work with Gtk3.22. I'd recommend to enforce the use of Gtk3.18, since it's the last stable version that RT can use. If you're okay, you should replace >=3.16
by =3.18
on line 229 & 232 of the main cmakefile.
Removing issue #3446 from the blocking issue.
This is an umbrella issue for tracking issues which need to be solved so that we can release a new major version. A new release is so overdue that we should strive to get RawTherapee in shape as soon as possible, therefore these issues should not be things we would like solved but things we need solved.
Code will be astyled before tagging.