| 00:28.01 | *** join/#maemo-ssu MrPingu (~MrPingute@86.92.226.97) |
| 03:19.38 | *** join/#maemo-ssu sv (~discopig@2001:5c0:1400:a::2bb) |
| 03:19.38 | *** join/#maemo-ssu sv (~discopig@unaffiliated/discopig) |
| 03:22.43 | *** join/#maemo-ssu amiconn_ (amiconn@rockbox/developer/amiconn) |
| 04:02.07 | *** join/#maemo-ssu DocScrutinizer05 (~HaleBopp@openmoko/engineers/joerg) |
| 05:00.38 | *** join/#maemo-ssu Milhouse (~Milhouse@Maemo/community/contributor/Milhouse) |
| 05:12.10 | *** join/#maemo-ssu chem|st (~chemist@svn.unix-ag.uni-kl.de) |
| 05:31.42 | *** join/#maemo-ssu chem|st (~chemist@svn.unix-ag.uni-kl.de) |
| 05:38.30 | *** join/#maemo-ssu FlameReaper (~assassin@203.106.65.1) |
| 05:45.10 | *** join/#maemo-ssu nightsh (~nightsh@5-12-104-55.residential.rdsnet.ro) |
| 05:54.05 | *** join/#maemo-ssu LaoLang_cool (~LaoLang_c@14.151.249.94) |
| 05:55.42 | *** join/#maemo-ssu M13 (~Miranda@83.149.34.163) |
| 06:11.50 | *** join/#maemo-ssu M4rtinK (~M4rtinK@ip-86-49-81-87.net.upcbroadband.cz) |
| 06:55.16 | *** join/#maemo-ssu dhbiker (~dhbiker@95.87.145.172) |
| 08:23.25 | *** join/#maemo-ssu andre__ (~andre@ip-62-24-76-119.net.upcbroadband.cz) |
| 08:23.25 | *** join/#maemo-ssu andre__ (~andre@wikimedia/aklapper) |
| 08:30.29 | *** join/#maemo-ssu LauRoman (~LauRoman@5-14-92-176.residential.rdsnet.ro) |
| 08:31.45 | *** join/#maemo-ssu Martix (~martix@static-84-242-103-180.net.upcbroadband.cz) |
| 10:00.05 | *** join/#maemo-ssu kolp (~quassel@212.255.41.67) |
| 10:02.40 | *** join/#maemo-ssu MohammadAG_ (~MohammadA@Maemo/community/contributor/MohammadAG) |
| 10:06.09 | *** join/#maemo-ssu futpib (~futpib@89.106.197.96) |
| 10:24.17 | *** join/#maemo-ssu Woody14619 (~Woody@2620:4:4000:11:55cc:21ea:bce:309f) |
| 10:24.17 | *** join/#maemo-ssu Woody14619 (~Woody@Maemo/community/contributor/Woody14619) |
| 10:27.21 | *** join/#maemo-ssu Pali (~pali@Maemo/community/contributor/Pali) |
| 10:48.24 | *** join/#maemo-ssu lizardo (lizardo@nat/indt/x-adwhjmhtubnbdnnb) |
| 11:08.58 | *** join/#maemo-ssu futpib_ (~futpib@89.106.197.64) |
| 11:11.58 | *** join/#maemo-ssu Woody14619 (~Woody@2620:4:4000:11:55cc:21ea:bce:309f) |
| 11:11.58 | *** join/#maemo-ssu Woody14619 (~Woody@Maemo/community/contributor/Woody14619) |
| 12:04.16 | *** join/#maemo-ssu M13 (~M13@170.133-224-87.telenet.ru) |
| 13:03.41 | *** join/#maemo-ssu Martix (~martix@eduroam-165.fi.muni.cz) |
| 13:55.17 | *** join/#maemo-ssu MohammadAG (~MohammadA@Maemo/community/contributor/MohammadAG) |
| 14:32.03 | *** join/#maemo-ssu Martix_ (~martix@eduroam-165.fi.muni.cz) |
| 14:58.10 | *** join/#maemo-ssu Martix_ (~martix@eduroam-165.fi.muni.cz) |
| 15:14.19 | *** join/#maemo-ssu ShadowJK (jk@terminus.enivax.net) |
| 15:39.55 | *** join/#maemo-ssu Martix_ (martix@nat/redhat/x-ttmwbohibfcfpwdg) |
| 15:42.55 | *** join/#maemo-ssu Martix (martix@nat/redhat/x-csrpsxzhrwlpeehp) |
| 16:00.28 | *** join/#maemo-ssu Martix_ (martix@nat/redhat/x-kghuwyxzksssvozq) |
| 16:01.42 | *** join/#maemo-ssu zeq (~s_j_newbu@31.124.92.163) |
| 16:51.01 | *** join/#maemo-ssu NIN101 (~NIN@p5DD28C7C.dip0.t-ipconnect.de) |
| 17:29.46 | *** join/#maemo-ssu Pali (~pali@Maemo/community/contributor/Pali) |
| 18:19.37 | *** join/#maemo-ssu g3kk3r (torrkull@lehtori.cc.tut.fi) |
| 18:40.04 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 19:00.10 | *** join/#maemo-ssu Martix (martix@nat/redhat/x-wwhumzgddpopxhmo) |
| 19:23.29 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |
| 19:31.19 | *** join/#maemo-ssu luf (~luf@ip-94-112-59-161.net.upcbroadband.cz) |
| 19:38.00 | luf | So long quiet here ... |
| 19:46.56 | luf | freemangordon: ping |
| 19:53.17 | freemangordon | luf: that's before the storm :) |
| 19:53.47 | freemangordon | luf: pong |
| 19:54.00 | luf | freemangordon: have you tried replace the libjpeg with libjpeg-turbo? |
| 19:54.23 | luf | libjpeg-turbo (RHEL 6.4) - these packages replace the traditional libjpeg packages, and provide the same functionality and API as libjpeg but better performance. |
| 19:54.47 | freemangordon | luf: iiuc our libjpeg is better ;) |
| 19:54.53 | luf | it's from RHEL 6.4 release notes ... So maybe you want to give it a try ... |
| 19:55.10 | freemangordon | there are the same patches made by the same guy as in libjpeg-turbo |
| 19:55.14 | luf | freemangordon: withouth thumb version? |
| 19:55.25 | freemangordon | luf: closed source |
| 19:55.41 | freemangordon | nothing I can do. I'd rather have libpixman first :) |
| 19:55.54 | luf | freemangordon: Yes. That's why libjpeg-turbo should be thumb compiled ... |
| 19:56.13 | freemangordon | luf: I am not sure what will happen with the ABI |
| 19:57.00 | luf | freemangordon: maybe we should give it a try :) |
| 19:57.37 | freemangordon | luf: If you find a way to benchmark it, I am fine |
| 19:58.09 | luf | freemangordon: :D |
| 19:59.00 | freemangordon | why laughing, I am serious. our libjpeg has a descent performance, we should compare it with whatever replacement we find |
| 19:59.36 | freemangordon | luf: ther *should* be a way to nechmark jpeg |
| 19:59.44 | freemangordon | *benchmark |
| 19:59.57 | luf | freemangordon: http://www.libjpeg-turbo.org/About/Performance |
| 20:00.20 | freemangordon | luf: NEON patches in libjpeg-turboa *are in* our libjpeg |
| 20:01.08 | freemangordon | aah, ok |
| 20:01.16 | freemangordon | there are benchmarks |
| 20:01.23 | luf | freemangordon: that's it ;) |
| 20:01.39 | freemangordon | luf: what about the ABI? |
| 20:02.37 | luf | freemangordon: I'll try it on my devel phone. BTW I'm putting it into my TODO. Not doing it now as I want to finish another tasks first. |
| 20:02.57 | freemangordon | luf: sure, no hurry |
| 20:03.19 | freemangordon | BTW I'll try to push upstream pixman in -devel by the end of the weekend |
| 20:03.38 | freemangordon | I have it compiled and running, just don;t have time tu push the source to gitorious |
| 20:03.54 | freemangordon | *to |
| 20:04.18 | freemangordon | luf: And I'll appreciate if you find some benchmarks for that too :P |
| 20:04.33 | luf | freemangordon: I can't believe that you're short on time with such thing like pushing source to gitorious ... |
| 20:04.44 | freemangordon | luf: hehe |
| 20:05.05 | luf | freemangordon: come on man. I'm just few days healthy .... So don't be so hurry :D |
| 20:05.26 | freemangordon | :D |
| 20:05.47 | freemangordon | luf: gtg, otherwise my GF will skin me alive :D |
| 20:05.52 | freemangordon | bb |
| 20:07.41 | luf | Hello freemangordon's GF. Please give some time to your BF for maemo :D |
| 20:08.40 | freemangordon | :D |
| 20:17.44 | luf | merlin1991: no info about next meeting? I can't believe that the next meeting will be in 357 days ... |
| 20:17.46 | merlin1991 | hm we should make a real life meeting at some point and have fmg bring his girlfriend, then we can "persuade" (read threaten) her to not skin him, but give him more time for maemo |
| 20:18.01 | merlin1991 | next meeting probably next week |
| 20:18.48 | luf | merlin1991: I saw exactly the same sentece also previous week :D |
| 20:19.35 | luf | *sentence |
| 20:20.46 | merlin1991 | and then I was quite occupied with university stuff this week :/ |
| 20:21.25 | luf | Yeah I see no communication this week in a log ... |
| 20:25.51 | luf | merlin1991: can you help me with git? |
| 20:26.29 | merlin1991 | sure |
| 20:27.09 | luf | I cloned keepassx git to https://gitorious.org/~luf/keepassx/keepassx-n900/commits/master. After that they pushed new things. How to merge them into my git clone from the original git? |
| 20:27.51 | merlin1991 | run git remote |
| 20:28.00 | merlin1991 | if you still have a "origin" there a git pull should be enough |
| 20:28.15 | merlin1991 | and to be sure run it with -v so you see where it poitns to |
| 20:29.14 | merlin1991 | luf: if you want to keep your changes "ontop" of their tree you can run git pull --rebase |
| 20:29.47 | merlin1991 | though that breaks the history if you push to gitorious again |
| 20:29.47 | luf | The original is https://gitorious.org/keepassx/keepassx/commits/master. I cloned it to the new https://gitorious.org/~luf/keepassx/keepassx-n900/commits/master (and make changes to run keepassx on N900). After that the core keepassx team pushed new commits into the original git. I need to merge it into my git (for N900) |
| 20:30.05 | merlin1991 | ah in this case |
| 20:30.26 | merlin1991 | git pull git://gitorious.org/keepassx/keepassx.git |
| 20:30.35 | merlin1991 | git push origin |
| 20:30.45 | merlin1991 | you might have to resolve conflicts after the pull |
| 20:30.56 | luf | It's so simple? |
| 20:31.06 | merlin1991 | yes :) |
| 20:31.07 | luf | *Is it ... |
| 20:31.45 | luf | I'm disappointed. I expected something very very hard :D |
| 20:31.54 | luf | merlin1991: Thanks. |
| 20:32.18 | merlin1991 | luf: if it would be very very hard it would ruin the idea of git being a distributed version control system ;) |
| 20:35.09 | kerio | *if it was |
| 20:35.59 | luf | merlin1991: is there some support functions for manual merge? |
| 20:36.22 | luf | merlin1991: e.g. their orig version and my orig version? |
| 20:36.44 | merlin1991 | when there is a conflict it will scream at you and insert lines into the file in question |
| 20:36.58 | merlin1991 | something like HEAD >>>>>>>>> stuff from head <<<<<<< |
| 20:37.08 | merlin1991 | and you're supposed to edit by hand and commit |
| 20:40.01 | *** join/#maemo-ssu peetah (~peetah@cha92-9-82-236-202-86.fbx.proxad.net) |
| 20:42.59 | luf | merlin1991: does it use commits from original or it creates only one commit? |
| 20:43.31 | luf | merlin1991: just to know what I should put into the commit log. |
| 20:45.54 | merlin1991 | luf: the original commits are still there |
| 20:46.03 | merlin1991 | the commit you create only resolves the conflicts between the branches |
| 20:46.22 | merlin1991 | so basically some "merged upstream resolving conflicts in file x, y, z" |
| 20:48.39 | *** join/#maemo-ssu Martix (~martix@static-84-242-103-180.net.upcbroadband.cz) |
| 20:48.42 | luf | merlin1991: git log shows the last my log and git status shows all new files ... |
| 20:49.26 | merlin1991 | luf as long as you don't commit the other commits are not part of current HEAD |
| 20:49.34 | merlin1991 | hence git log has no idea they are there *yet* |
| 20:50.19 | luf | merlin1991: hmmm interesting. Thanks |
| 20:50.45 | merlin1991 | basically when you commit the new HEAD has 2 ancestors |
| 20:51.00 | merlin1991 | where one is the current HEAD and the other is the tip of the upstream branch |
| 21:05.41 | *** join/#maemo-ssu Martix (~martix@static-84-242-103-180.net.upcbroadband.cz) |
| 21:12.25 | *** join/#maemo-ssu Vlad_on_the_road (~Vlad_on_t@ip-66.net-82-216-1.versailles2.rev.numericable.fr) |
| 21:19.49 | *** join/#maemo-ssu unclouded (~neil@2001:4428:200:80fc:f1fd:9270:352:5f81) |
| 21:38.31 | *** join/#maemo-ssu LauRoman (~LauRoman@5-14-92-176.residential.rdsnet.ro) |
| 22:26.51 | *** join/#maemo-ssu nox- (noident@freebsd/developer/nox) |
| 22:32.29 | *** join/#maemo-ssu arcean (~arcean@aacu58.neoplus.adsl.tpnet.pl) |
| 23:11.04 | *** join/#maemo-ssu zeq (~s_j_newbu@2a01:348:1e3:1:e6ec:10ff:fe9a:d418) |
| 23:13.09 | luf | merlin1991: are you still here around? |
| 23:15.16 | merlin1991 | luf: yep |
| 23:18.21 | luf | https://gitorious.org/keepassx/keepassx/merge_requests/22 |
| 23:18.54 | luf | merlin1991: Do you have any idea why the merge aslo includes the upstream patches? |
| 23:19.55 | merlin1991 | hm? |
| 23:20.03 | luf | merlin1991: (e.g src/CMakeLists.txt(4 / 1), src/core/PasswordGenerator.*) |
| 23:20.50 | luf | merlin1991: I created clone of keepassx.git to keepassx-n900.git made some changes and created merge request for upstream on gitorious. |
| 23:21.50 | merlin1991 | the merge request only contains your changes and the merge commit |
| 23:21.53 | luf | After that there were some upstream changes. I merged them into keepassx-n900 and update the merge request (for upstream). And the changes from upstream are also in the merge request (no idea why). |
| 23:21.54 | merlin1991 | which is to be expected |
| 23:22.27 | merlin1991 | and the gitorious ui is silly |
| 23:22.50 | merlin1991 | but you see from the list of commits, that it's only your chagnes and the merge, nothing else |
| 23:24.03 | luf | So it's just strange gitorious UI that it shows files I never touched (like src/CMakeLists.txt, PasswordGenerator.*, ...) ? |
| 23:24.52 | luf | These files I merged from upstream new commits to keepassx-n900. |
| 23:25.54 | luf | I expected that only differences between upstream keepassx.git and keepassx-n900.git will be shown in the merge. |
| 23:26.35 | merlin1991 | yeah I'm pretty sure it's gitorious going mental |
| 23:29.09 | luf | Strange. I see non-touched files also in git diff HEAD~1 (in keepassx-n900). So it seems for git the merge contains all the changes but log was added properly from upstream. |
| 23:29.24 | luf | Maybe that's why I have troubles to understand git :) |
| 23:30.11 | luf | Never mind I'm going to sleep. |
| 23:30.50 | merlin1991 | luf it makes sense for git diff aswell |
| 23:30.58 | merlin1991 | because HEAD is after the merge |
| 23:31.02 | merlin1991 | and HEAD~1 is before the merge |
| 23:31.14 | merlin1991 | that the merge is made up of several commits does not play into this |
| 23:31.54 | luf | merlin1991: Yeah but the git log doesn't correspond to the diff ~N. |
| 23:32.12 | merlin1991 | that's because git loves to play mind games with you ;) |
| 23:32.26 | luf | merlin1991: exactly ! :D |
| 23:55.33 | *** join/#maemo-ssu nightsh (~nightsh@188.27.191.16) |