| *** arcean_ has joined #maemo-ssu | 00:05 | |
| *** arcean has quit IRC | 00:06 | |
| *** arcean_ is now known as arcean | 00:06 | |
| *** LauRoman has quit IRC | 00:18 | |
| *** tg has quit IRC | 00:25 | |
| *** tg has joined #maemo-ssu | 00:26 | |
| *** nightsh has quit IRC | 00:33 | |
| *** LauRoman has joined #maemo-ssu | 00:34 | |
| *** xes has quit IRC | 00:57 | |
| *** Martix has quit IRC | 01:14 | |
| *** M4rtinK has quit IRC | 01:19 | |
| *** M4rtinK has joined #maemo-ssu | 01:44 | |
| *** MrPingu has quit IRC | 01:58 | |
| *** MrPingu has joined #maemo-ssu | 02:28 | |
| *** LauRoman has quit IRC | 02:46 | |
| *** arcean has quit IRC | 02:52 | |
| *** M4rtinK has quit IRC | 03:12 | |
| *** kolp has quit IRC | 03:58 | |
| *** Pali has quit IRC | 04:22 | |
| *** Milhouse has quit IRC | 05:18 | |
| *** sv has joined #maemo-ssu | 05:19 | |
| *** sv has quit IRC | 05:19 | |
| *** sv has joined #maemo-ssu | 05:19 | |
| *** discopig has quit IRC | 05:22 | |
| *** amiconn has quit IRC | 05:22 | |
| *** amiconn_ has joined #maemo-ssu | 05:22 | |
| *** amiconn_ is now known as amiconn | 05:22 | |
| *** DocScrutinizer05 has quit IRC | 06:02 | |
| *** DocScrutinizer05 has joined #maemo-ssu | 06:02 | |
| *** Milhouse has joined #maemo-ssu | 07:00 | |
| *** chem|st has quit IRC | 07:12 | |
| *** chem|st has joined #maemo-ssu | 07:12 | |
| *** chem|st has quit IRC | 07:30 | |
| *** chem|st has joined #maemo-ssu | 07:31 | |
| *** FlameReaper has quit IRC | 07:37 | |
| *** FlameReaper has joined #maemo-ssu | 07:38 | |
| *** nightsh has joined #maemo-ssu | 07:45 | |
| *** LaoLang_cool has joined #maemo-ssu | 07:54 | |
| *** M13 has joined #maemo-ssu | 07:55 | |
| *** LaoLang_cool has quit IRC | 07:57 | |
| *** M4rtinK has joined #maemo-ssu | 08:11 | |
| *** dhbiker has joined #maemo-ssu | 08:55 | |
| *** sv is now known as discopig | 09:25 | |
| *** MrPingu has quit IRC | 09:34 | |
| *** M4rtinK has quit IRC | 09:38 | |
| *** andre__ has joined #maemo-ssu | 10:23 | |
| *** andre__ has joined #maemo-ssu | 10:23 | |
| *** LauRoman has joined #maemo-ssu | 10:30 | |
| *** Martix has joined #maemo-ssu | 10:31 | |
| *** M13 has quit IRC | 11:38 | |
| *** kolp has joined #maemo-ssu | 12:00 | |
| *** MohammadAG_ has joined #maemo-ssu | 12:02 | |
| *** MohammadAG has quit IRC | 12:02 | |
| *** MohammadAG_ is now known as MohammadAG | 12:02 | |
| *** futpib has joined #maemo-ssu | 12:06 | |
| *** Woody14619 has quit IRC | 12:23 | |
| *** Woody14619 has joined #maemo-ssu | 12:24 | |
| *** Woody14619 has quit IRC | 12:24 | |
| *** Woody14619 has joined #maemo-ssu | 12:24 | |
| *** Pali has joined #maemo-ssu | 12:27 | |
| *** lizardo has joined #maemo-ssu | 12:48 | |
| *** Martix has quit IRC | 12:51 | |
| *** futpib_ has joined #maemo-ssu | 13:08 | |
| *** futpib has quit IRC | 13:09 | |
| *** Woody14619 has quit IRC | 13:11 | |
| *** Woody14619 has joined #maemo-ssu | 13:11 | |
| *** Woody14619 has quit IRC | 13:11 | |
| *** Woody14619 has joined #maemo-ssu | 13:11 | |
| *** LauRoman has quit IRC | 13:23 | |
| *** unclouded has quit IRC | 13:35 | |
| *** M13 has joined #maemo-ssu | 14:04 | |
| *** Martix has joined #maemo-ssu | 15:03 | |
| *** MohammadAG has quit IRC | 15:54 | |
| *** MohammadAG has joined #maemo-ssu | 15:55 | |
| *** Martix_ has joined #maemo-ssu | 16:32 | |
| *** Martix has quit IRC | 16:35 | |
| *** Martix_ has quit IRC | 16:58 | |
| *** Martix_ has joined #maemo-ssu | 16:58 | |
| *** Martix_ has quit IRC | 17:05 | |
| *** ShadowJK has quit IRC | 17:14 | |
| *** ShadowJK has joined #maemo-ssu | 17:14 | |
| *** Martix_ has joined #maemo-ssu | 17:39 | |
| *** Martix has joined #maemo-ssu | 17:42 | |
| *** Martix_ has joined #maemo-ssu | 18:00 | |
| *** zeq has joined #maemo-ssu | 18:01 | |
| *** Martix has quit IRC | 18:04 | |
| *** Martix_ is now known as Martix | 18:09 | |
| *** Pali has quit IRC | 18:09 | |
| *** zeq has quit IRC | 18:42 | |
| *** NIN101 has joined #maemo-ssu | 18:51 | |
| *** g3kk3r has quit IRC | 19:15 | |
| *** Pali has joined #maemo-ssu | 19:29 | |
| *** M13 has quit IRC | 20:13 | |
| *** g3kk3r has joined #maemo-ssu | 20:19 | |
| *** xes has joined #maemo-ssu | 20:40 | |
| *** Martix has quit IRC | 20:58 | |
| *** Martix has joined #maemo-ssu | 21:00 | |
| *** M4rtinK has joined #maemo-ssu | 21:23 | |
| *** luf has joined #maemo-ssu | 21:31 | |
| luf | So long quiet here ... | 21:38 |
|---|---|---|
| luf | freemangordon: ping | 21:46 |
| freemangordon | luf: that's before the storm :) | 21:53 |
| freemangordon | luf: pong | 21:53 |
| luf | freemangordon: have you tried replace the libjpeg with libjpeg-turbo? | 21:54 |
| 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. | 21:54 |
| freemangordon | luf: iiuc our libjpeg is better ;) | 21:54 |
| luf | it's from RHEL 6.4 release notes ... So maybe you want to give it a try ... | 21:54 |
| freemangordon | there are the same patches made by the same guy as in libjpeg-turbo | 21:55 |
| luf | freemangordon: withouth thumb version? | 21:55 |
| freemangordon | luf: closed source | 21:55 |
| freemangordon | nothing I can do. I'd rather have libpixman first :) | 21:55 |
| luf | freemangordon: Yes. That's why libjpeg-turbo should be thumb compiled ... | 21:55 |
| freemangordon | luf: I am not sure what will happen with the ABI | 21:56 |
| luf | freemangordon: maybe we should give it a try :) | 21:57 |
| freemangordon | luf: If you find a way to benchmark it, I am fine | 21:57 |
| luf | freemangordon: :D | 21:58 |
| freemangordon | why laughing, I am serious. our libjpeg has a descent performance, we should compare it with whatever replacement we find | 21:59 |
| freemangordon | luf: ther *should* be a way to nechmark jpeg | 21:59 |
| freemangordon | *benchmark | 21:59 |
| luf | freemangordon: http://www.libjpeg-turbo.org/About/Performance | 21:59 |
| freemangordon | luf: NEON patches in libjpeg-turboa *are in* our libjpeg | 22:00 |
| freemangordon | aah, ok | 22:01 |
| freemangordon | there are benchmarks | 22:01 |
| luf | freemangordon: that's it ;) | 22:01 |
| freemangordon | luf: what about the ABI? | 22:01 |
| 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. | 22:02 |
| freemangordon | luf: sure, no hurry | 22:02 |
| freemangordon | BTW I'll try to push upstream pixman in -devel by the end of the weekend | 22:03 |
| freemangordon | I have it compiled and running, just don;t have time tu push the source to gitorious | 22:03 |
| freemangordon | *to | 22:03 |
| freemangordon | luf: And I'll appreciate if you find some benchmarks for that too :P | 22:04 |
| luf | freemangordon: I can't believe that you're short on time with such thing like pushing source to gitorious ... | 22:04 |
| freemangordon | luf: hehe | 22:04 |
| luf | freemangordon: come on man. I'm just few days healthy .... So don't be so hurry :D | 22:05 |
| freemangordon | :D | 22:05 |
| freemangordon | luf: gtg, otherwise my GF will skin me alive :D | 22:05 |
| freemangordon | bb | 22:05 |
| luf | Hello freemangordon's GF. Please give some time to your BF for maemo :D | 22:07 |
| freemangordon | :D | 22:08 |
| luf | merlin1991: no info about next meeting? I can't believe that the next meeting will be in 357 days ... | 22:17 |
| 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 | 22:17 |
| merlin1991 | next meeting probably next week | 22:18 |
| luf | merlin1991: I saw exactly the same sentece also previous week :D | 22:18 |
| luf | *sentence | 22:19 |
| merlin1991 | and then I was quite occupied with university stuff this week :/ | 22:20 |
| luf | Yeah I see no communication this week in a log ... | 22:21 |
| luf | merlin1991: can you help me with git? | 22:25 |
| merlin1991 | sure | 22:26 |
| 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? | 22:27 |
| *** futpib_ has quit IRC | 22:27 | |
| merlin1991 | run git remote | 22:27 |
| merlin1991 | if you still have a "origin" there a git pull should be enough | 22:28 |
| merlin1991 | and to be sure run it with -v so you see where it poitns to | 22:28 |
| merlin1991 | luf: if you want to keep your changes "ontop" of their tree you can run git pull --rebase | 22:29 |
| merlin1991 | though that breaks the history if you push to gitorious again | 22:29 |
| 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) | 22:29 |
| merlin1991 | ah in this case | 22:30 |
| merlin1991 | git pull git://gitorious.org/keepassx/keepassx.git | 22:30 |
| merlin1991 | git push origin | 22:30 |
| merlin1991 | you might have to resolve conflicts after the pull | 22:30 |
| luf | It's so simple? | 22:30 |
| merlin1991 | yes :) | 22:31 |
| luf | *Is it ... | 22:31 |
| luf | I'm disappointed. I expected something very very hard :D | 22:31 |
| luf | merlin1991: Thanks. | 22:31 |
| merlin1991 | luf: if it would be very very hard it would ruin the idea of git being a distributed version control system ;) | 22:32 |
| *** Martix has quit IRC | 22:34 | |
| kerio | *if it was | 22:35 |
| luf | merlin1991: is there some support functions for manual merge? | 22:35 |
| luf | merlin1991: e.g. their orig version and my orig version? | 22:36 |
| merlin1991 | when there is a conflict it will scream at you and insert lines into the file in question | 22:36 |
| merlin1991 | something like HEAD >>>>>>>>> stuff from head <<<<<<< | 22:36 |
| merlin1991 | and you're supposed to edit by hand and commit | 22:37 |
| *** peetah has quit IRC | 22:38 | |
| *** peetah has joined #maemo-ssu | 22:40 | |
| luf | merlin1991: does it use commits from original or it creates only one commit? | 22:42 |
| luf | merlin1991: just to know what I should put into the commit log. | 22:43 |
| merlin1991 | luf: the original commits are still there | 22:45 |
| merlin1991 | the commit you create only resolves the conflicts between the branches | 22:46 |
| merlin1991 | so basically some "merged upstream resolving conflicts in file x, y, z" | 22:46 |
| *** Martix has joined #maemo-ssu | 22:48 | |
| luf | merlin1991: git log shows the last my log and git status shows all new files ... | 22:48 |
| merlin1991 | luf as long as you don't commit the other commits are not part of current HEAD | 22:49 |
| merlin1991 | hence git log has no idea they are there *yet* | 22:49 |
| luf | merlin1991: hmmm interesting. Thanks | 22:50 |
| merlin1991 | basically when you commit the new HEAD has 2 ancestors | 22:50 |
| merlin1991 | where one is the current HEAD and the other is the tip of the upstream branch | 22:51 |
| *** lizardo has quit IRC | 23:02 | |
| *** Martix has quit IRC | 23:03 | |
| *** Martix has joined #maemo-ssu | 23:05 | |
| *** Vlad_on_the_road has joined #maemo-ssu | 23:12 | |
| *** NIN101 has quit IRC | 23:14 | |
| *** unclouded has joined #maemo-ssu | 23:19 | |
| *** LauRoman has joined #maemo-ssu | 23:38 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!