Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,118 Commits 63 Branches 22 Tags 194 MiB
04ead356e5
Commit Graph

8118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
1de2f01d22 updated ubuntu changelog 2015-09-05 16:21:30 -04:00
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02:00
AsamK
d6f50c71f2 Fix libav version check 
- Off-by-one error in the #ifs
- Libav actually contains the old constants and functions as well,
  marked as deprecated. Just the CodecID enum was removed completely.
 2015-09-05 15:52:03 +02:00
Cyril Soler
cd2dce3e3e Merge pull request #93 from AsamK/pegmark_wiki 
Disable pegmarkdown build by default, only used by disabled wiki
 2015-09-05 09:49:40 -04:00
AsamK
ae43058520 Make wikis compile 
- rsWiki->updated() doesn't exist anymore, so I ported WikiDialog to
  inherit from RsGxsUpdateBroadcastPage
- add -lglib-2.0 to pegmarkdown.pro
 2015-09-05 09:25:08 +02:00
AsamK
2bf81be6a7 Disable compiling of wikis in libretroshare 
It is disabled in the gui anyway
 2015-09-05 09:25:08 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00
AsamK
4e917ea26c Disable compiling of pegmarkdown by default, only used for wiki 
- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set
 2015-09-05 09:25:08 +02:00
Cyril Soler
6bc6e22e12 Merge pull request #92 from AsamK/fix_travis_voip 
Fix travis voip
 2015-09-04 21:05:55 -04:00
defnax
e9a5523c54 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-05 00:16:07 +02:00
AsamK
f2994b7558 Old libav versions used constant without AV_ prefix 
From Jenster
 2015-09-04 23:59:13 +02:00
AsamK
efc057e128 Fix build with libavcodec < 55 2015-09-04 23:42:26 +02:00
Cyril Soler
7385dd12ac Merge pull request #91 from AsamK/fix_opensuse_compile 
Fix opensuse compile
 2015-09-04 13:48:58 -04:00
Cyril Soler
fd19349684 Merge pull request #90 from PhenomRetroShare/Fix_Travis_CI_Compilation 
Fix Travis CI compilation by adding libavutil-dev package.
 2015-09-04 13:48:08 -04:00
AsamK
976f53bba2 Remove -lavformat from VOIP, it's unused 2015-09-04 17:32:50 +02:00
AsamK
484edc3445 Fix build for openSUSE 
Use qmake built-in pkgconfig functionality
 2015-09-04 17:30:12 +02:00
AsamK
22816f0b9e Remove unnecessary includes from VideoProcessor 
libavutil/channel_layout.h isn't available on debian 7 wheezy
 2015-09-04 17:30:12 +02:00
Phenom
6b94248d3b Fix Travis CI compilation by adding libavutil-dev package. 2015-09-04 17:28:45 +02:00
defnax
7f8dae93cf Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-04 16:33:43 +02:00
Thunder
c892f8a3f4 Merge pull request #85 from PhenomRetroShare/Fix_VOIP_CompilWithRecentLibavutil 
Fix VOIP compilation with recent libavutil-dev package.
 2015-09-04 16:31:53 +02:00
Phenom
0a843989e4 Fix VOIP compilation with recent libavutil-dev package. 
/usr/include/libavutil/common.h error 'UINT64C' was not declared in this
scope.
 2015-09-04 16:10:41 +02:00
thunder2
661453653c Added register of codecs to VOIP. 2015-09-04 14:20:36 +02:00
defnax
07c5030c36 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-03 17:41:30 +02:00
thunder2
738dadadc9 Fixed Windows compile of VOIP. 2015-09-03 16:33:50 +02:00
thunder2
9bbdefa48a Added "QMAKE_LFLAGS += -Wl,--start-group" to pluigns for Windows compile. 2015-09-03 16:24:57 +02:00
thunder2
b1b2de617a Fixed Windows compile. 
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
 2015-09-03 13:14:39 +02:00
csoler
97237c867c merge PR/81, merging with master 2015-09-02 22:43:42 -04:00
csoler
5dfdffb763 merged Pull Request #81, providing avcodec video encoding/decoding 2015-09-02 22:39:39 -04:00
csoler
77c0d562fb fixed deleting/stopping video devices 2015-09-02 22:14:04 -04:00
Cyril Soler
0b50aa28f3 Merge pull request #80 from AsamK/paste_plain_text 
Add "Paste as plain text" to context menu of RS text edits
 2015-09-02 20:32:23 -04:00
AsamK
feafb1e291 Add "Paste as plain text" to context menu of RS text edits 
Useful for example when pasting from a website
 2015-09-03 00:28:19 +02:00
Cyril Soler
3fbbcd30eb Merge pull request #79 from chozabu/more_travis 
added more details to travis IRC output
 2015-09-02 18:27:51 -04:00
Chozabu
11d54b8c0b added more details to travis IRC output 2015-09-02 22:37:34 +01:00
defnax
3d6e9783f6 Fixed Status Label on Distant Chat 2015-09-02 13:06:15 +02:00
Cyril Soler
a022019358 Merge pull request #74 from RetroShare/revert-72-Fix_WinCompil_libresapi_u_int_32_t 
Revert "Fix Windows compilation of libresapi with error:"
 2015-09-01 21:10:45 -04:00
Cyril Soler
6af57f3aea Revert "Fix Windows compilation of libresapi with error:" 2015-09-01 21:03:23 -04:00
Cyril Soler
296ffd2f2d Merge pull request #73 from AsamK/fix_tlv_deserialization 
Fix subtle bug in tlv deserialization of TLV_TYPE_KEYSIGNATURETYPE
 2015-09-01 20:53:28 -04:00
Cyril Soler
d2dc8deeaf Merge pull request #66 from AsamK/qmake_improvements_next 
More qmake improvements
 2015-09-01 20:49:57 -04:00
Cyril Soler
1713789917 Merge pull request #72 from PhenomRetroShare/Fix_WinCompil_libresapi_u_int_32_t 
Fix Windows compilation of libresapi with error:
 2015-09-01 20:45:02 -04:00
AsamK
3cfe69787f Fix subtle bug in tlv deserialization of TLV_TYPE_KEYSIGNATURETYPE 
When using -O2, the variable currType is optimized out, so the
signature is added with the wrong sign type. Then when verifying the
data the signature is not found and verification fails.

The main sympton of this bug was receiving no more forum/channel posts.

Wit debug builds (-O0) this worked, that's why not every one was affected
by this.

This bug was introduced in 2012 (19e856c2a8)
 2015-09-02 02:03:46 +02:00
Phenom
3e68741994 Fix Windows compilation of libresapi with error: 
\libresapi\src\api\ForumHandler.cpp:108: erreur : 'u_int32_t' was not
declared in this scope
                 KeyValueReference<u_int32_t>
vis_msg("visible_msg_count", grp.mMeta.mVisibleMsgCount);
                                   ^
 2015-09-01 22:49:15 +02:00
thunder2
c3fff39624 Fixed Windows compile 2015-09-01 22:49:08 +02:00
AsamK
dda8a49ef5 Add CONFIG+=NO_SQLCIPHER to travis config 2015-09-01 14:53:18 +02:00
AsamK
069b112135 Update README.md 2015-09-01 14:53:18 +02:00
AsamK
d116f40d6e Move openpgpsdk to common section of libretroshare.pro 
It is the same for all platforms
 2015-09-01 14:53:17 +02:00
AsamK
30d7aa3be3 Remove dependency on qt script, it's unused 2015-09-01 14:53:17 +02:00
AsamK
2be400e33e CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead 
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
 2015-09-01 14:53:17 +02:00
AsamK
829c2f396e Move LIBS from gui/nogui linux section to libretroshare 
remove -lglib-2.0 it's not needed:
was added in d8e327afcc to compile for arch,
but it compiles on arch now also without this
 2015-09-01 14:53:17 +02:00
AsamK
846f7d0204 Make usage of sqlcipher explicit at compile time 
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
 2015-09-01 14:53:09 +02:00
csoler
b1572c2924 added missing deps for avcodec 2015-08-31 22:50:20 -04:00