From 373e5593bfe1a522dde16ff1d0a9ac88cfd7ca7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Mon, 18 Apr 2016 15:40:44 +0200 Subject: [PATCH] removed wiki+python from help menu, removed centos6 from INSTALL_LINUX, added missing png to documentation/guide --- Documentation/source/guide/_static/logo.png | Bin 0 -> 3957 bytes Global/Macros.h | 2 - Gui/Gui.cpp | 22 -------- Gui/Gui.h | 2 - Gui/GuiPrivate.cpp | 2 - Gui/GuiPrivate.h | 2 - INSTALL_LINUX.md | 54 -------------------- 7 files changed, 84 deletions(-) create mode 100644 Documentation/source/guide/_static/logo.png diff --git a/Documentation/source/guide/_static/logo.png b/Documentation/source/guide/_static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..90ea386465ecee58c43e85b336c23c7a1e2ac4f1 GIT binary patch literal 3957 zcmV-*4~p=KP)q$gGRCwCmTzgPdb^HIEvw+C%DhNUDyqF~sm)BRZ z45+w?EM*RBguQ-1ExNzw*fCvCxt^jbL5(gsMLPTuy=FP0BsfoEGwYRsk z+}vEYVZ#PSM2E%mA5O_r18C!U9;;WchOe)$+pgK3o*r!3vIV`py#NqOM86CRc;=_Z z0r=izGEE5&566>FJ_&cHFTVH!-+lKTc%J_gfDS;fvl7S;5WL9%qP)DkWWYW1%roFP zZrG1GbLL3qm6DPIZ*Ok^xCOwY16jKK03YPnj4>`LDM@m%v9S>!fBdoANZOA-{wTR7 z0(8$n`W}en{S$yjtybf{`|gwQ;^X6CG#cFkJd??US+izIu0=#dz}MFoj4=?=|2eBX zR89iN0XPC+#L}fpq0wmic%Og%Io^BkJ-6EDT3TA5)oLXVIWjU5<>lo7FflPP@oggN z8Y;;vVT@@50|RmEt+z@T&p-dXTPliIUwu__uGMN08X5}5m&VN?Q*0C!6$QOs-{%?hcN7;FBQ!MB;mJiuM@!}7jEH&)n#f#C|*=eJpgao@MmYSN1>gsBwq@+0Xhcp@u z^m@Ib@>sHDiR9Ydci#=3=K&y?h;jzg4XfL*VFSB(@uI}_(d+fh96ga8YPFhmcXvDO zR&{oED)w#dNJ>g#j4^iCU3V$ovwQb$$r$zZ^(;F(n-Nh95pnivUfuzzdlkSqe}8{W zm@q-YfAPf^72EFLzaL&+UQRzaZ*Onx-MiP}c11-+ioBO!epzy^)9G;g?Y9Gf7Qh~t zfoBFT2*CezcXuN#Elm(}0KoR`+j08zX{&7$6B99W=F9<0{`~p#F?#f9huVaPhhzEj z9ZaoOD=v?7=gzq-DsuMh zS%;P_V~jO4G}yfNk3as9j8Rrr#)ya!(Mfv@XWkB}iv_U2WHQN=#HLM~(B9r|we6}^ zt1xlmM3?QmlO|2V+_`fdY7-O`gzek6EAlflGi91urBVSvED=5BwDgITL`8OXHmj(p zkUXWTsw%}N>h0~#8XFs39+RuDuXjlD7-Oubr-$iuI>r0-dcEZS3l}c1_3PI&BKkKG z@wNcu`;odQ0o<$AYB6={RJ)bLrcImR@9*z&t*_JRuw}~@huV00dgA@}-&f?XUcFkj zSL$>+0Qeh#EL-4lHl$7ipxIzBsM6EZ5fKs5$3Jo61mfc2taca{7KZBT>Ou1q+S=L> z92|`1=4Pw>q@*Nq$i0td%$R}F(o(B!4jw#+M;>{k@4T+A4taTb@bvTqfN=o+Z4E@; z26)c{P=$qsNr3C>>XHm(NsdZ}qomPjoCZ$b}w7OJqrj3kVu)B>g(%;{SE+d{P=O`^?ImOsu}>H08C;Kc`M*W0+`|B z<0A_qu3EK9@y{$+uwcl56U+)FNmA5~Jdccw44cbWOw*=KLqI?P089Wd+fw>Ci+#=$ zz!ihR5HNG*Ox%C}{e3sq)YKp(B*f~V{{H@oOL;J9I@l#7a#ZU9ptt zd+)us@BIAv^VqXzkDxq80caIK=*T#u(z`<87KI!$DfDR%YnhLmzzb zfg#m@Yu0qxN_x+)xm;;gB5+qp&%kc zczC!&ZQ|qOCBk8;JS^jqbLY+#f~M<|Z*MQ&e*1030hA)P!$F0Gg^H4-MEUvo0w6LfDJhZVV-gY)U^1BibHa!xqJIDg z@$vBy$MgF(Po+wvjT<)#8pthZ?AWnLPfu4|B}(+kC(5Y{OKFacjfJ0|9{^~GXdVwB zN>K4)`u_Xx@$I+D8Mzl;cmeK4AAR(ZEK1xT&6_t*PzF|mru+Brmw7j4fqH;9Th1~A zcmDkOic;t2=Z8_FM!_A)a`o6_I8T`}MUiirF!J^F6=Htlc)?J%1ZwQqv5FlU3FL3_bLVU-6)|1E zeqAtGe&+$40f4fyGKuuvdFP$7@+>iJ-n`kNNj5b#At50_F}FKhR8UZ$$O{b(l{pNB zg@wW%d5R~ZGXQEBV>oc&fGkL;)oQJFoSU1AYuB#XJxPw^(9+U^UAuO<)pA|7Y?)P_ zN~OZrUwTs3hbO#j*)k!;H|&&_mL`C&Z=Ya$8FC89bZm|`s$dedk$j*O0u zmKdDv?d{NNwN?%15hF(Q>lUqCxl)z_Ja+7uQ<6JS3JeTXG_|U$t0lpXAAa}&2M-<; zUdZtUaMNlql!y!frmIvcR903>Hg>gIjkRmnS{<;vyW8PxJ^-Yrrw=)B85tRhz$GUq z%c4YjyKytb*REZ|OE0}NWWaTHcH-T4 z-&N%A-o0CLe)Q;3Az5?@z;4SNhBfd2;8~92P*YPQ1LVsuzqC4VZ*Q+tX~!Kqb_^MK zk3IGnT3cJK@^W%=5EvNPciz&{f>WnX34ZKSA~MMMv7(})LHB!=_GN>p20E1plLQpJExBBI4a z#9n{>b!IdgCDlX=7cNw+JX*VUt*pXn#flX+tDB;uqX+Gc$DKQODvmp8(j?jaJ9g|4 z>hzqeQ5Kb$oy*S7W`_?SmJDF4aL~iUgI&FP)gkZzu!4dDmjh=o7}%IGV-&|MFE5we zUs+ixl$c!;t8y6K738u-${=lBvF&5rY5l>T;bAJ=!s}M5wWdXw=#plAbDc5X3gq%AG25T0I=oDmk(I#%FD|Y z`ws~Tk=>u4pD#$=F?%s_CB z6uhpk4!`~O8vwKcm^~Qa0YJ78brDy=hlPbHF42yT4!rZuJHp%5c2jC68_fi`a3 zh|8BRTjeDrBuI>MqtPhN*L*-kuFn&QOqZXny_3<}+GAAuQLMj$-1d5T zZ)Q+GiHp#Cdyz@RaKQF2UAs5CC-ld0O)iEyn%jKB?0&=pDC8Ukt0Xi z%=Zo@O`kqpmb@x1E*5?+BBD-by$M%*4ylSU7NOJWWZ8G4(P-C~#_T1=n8Ses%Yw(^ z;$oaRa|S%mw*v6T06qujiVtz=0Mv6Fhb2pvAUHS}?n-TKZFuXgw}dKz7$T||NPqkQ zfddg;0kEAhhWz||S+$kBP9XZGPOmenuHelp->addAction(_imp->actionHelpIssues); QObject::connect( _imp->actionHelpIssues, SIGNAL(triggered()), this, SLOT(openHelpIssues()) ); - _imp->actionHelpWiki = new QAction(this); - _imp->actionHelpWiki->setText(QObject::tr("Wiki")); - _imp->menuHelp->addAction(_imp->actionHelpWiki); - QObject::connect( _imp->actionHelpWiki, SIGNAL(triggered()), this, SLOT(openHelpWiki()) ); - - _imp->actionHelpPython = new QAction(this); - _imp->actionHelpPython->setText(QObject::tr("Python API")); - _imp->menuHelp->addAction(_imp->actionHelpPython); - QObject::connect( _imp->actionHelpPython, SIGNAL(triggered()), this, SLOT(openHelpPython()) ); - #ifndef __APPLE__ _imp->menuHelp->addSeparator(); _imp->menuHelp->addAction(_imp->actionShowAboutWindow); @@ -698,12 +688,6 @@ Gui::openHelpIssues() QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_ISSUE_TRACKER_URL))); } -void -Gui::openHelpWiki() -{ - QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_WIKI_URL))); -} - void Gui::openHelpDocumentation() { @@ -724,12 +708,6 @@ Gui::openHelpDocumentation() } } -void -Gui::openHelpPython() -{ - QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_PYTHON_URL))); -} - NATRON_NAMESPACE_EXIT; NATRON_NAMESPACE_USING; diff --git a/Gui/Gui.h b/Gui/Gui.h index af593e6ddf..e6cf965f23 100644 --- a/Gui/Gui.h +++ b/Gui/Gui.h @@ -726,8 +726,6 @@ public Q_SLOTS: void openHelpWebsite(); void openHelpForum(); void openHelpIssues(); - void openHelpPython(); - void openHelpWiki(); void openHelpDocumentation(); private: diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp index b44b6558d8..38cbf40273 100644 --- a/Gui/GuiPrivate.cpp +++ b/Gui/GuiPrivate.cpp @@ -195,8 +195,6 @@ GuiPrivate::GuiPrivate(GuiAppInstance* app, , actionHelpWebsite(0) , actionHelpForum(0) , actionHelpIssues(0) -, actionHelpPython(0) -, actionHelpWiki(0) , actionHelpDocumentation(0) , _centralWidget(0) , _mainLayout(0) diff --git a/Gui/GuiPrivate.h b/Gui/GuiPrivate.h index 5976d0ab1f..57c69af03e 100644 --- a/Gui/GuiPrivate.h +++ b/Gui/GuiPrivate.h @@ -124,8 +124,6 @@ struct GuiPrivate QAction* actionHelpWebsite; QAction* actionHelpForum; QAction* actionHelpIssues; - QAction* actionHelpPython; - QAction* actionHelpWiki; QAction* actionHelpDocumentation; ///the main "central" widget diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md index 57890a30e4..c9d5a28a8a 100644 --- a/INSTALL_LINUX.md +++ b/INSTALL_LINUX.md @@ -22,7 +22,6 @@ Natron on GNU/Linux. - [Arch Linux](#arch-linux) - [Debian-based](#debian-based) - [CentOS7/Fedora](#centos7) - - [CentOS6](#centos6-64-bit) # Libraries @@ -287,56 +286,3 @@ shiboken { } ``` -## CentOS6+ (64-bit) - -### Install dependencies -``` -yum -y install gcc-c++ wget libX*devel *GL*devel *xcb*devel xorg*devel libdrm-devel mesa*devel *glut*devel dbus-devel bison flex expat-devel libtool-ltdl-devel git make glibc-devel glibc-devel.i686 -``` - -### Download SDK (third-party software) -``` -wget http://downloads.natron.fr/Third_Party_Binaries/Natron-CY2015-Linux-x86_64-SDK.tar.xz -tar xvf Natron-CY2015-Linux-x86_64-SDK.tar.xz -C /opt/ -``` - -### Download Natron and plugins -``` -git clone https://github.com/MrKepzie/Natron -git clone https://github.com/MrKepzie/openfx-io -git clone https://github.com/devernay/openfx-misc -git clone https://github.com/olear/openfx-arena -for i in $(echo "Natron openfx-io openfx-misc openfx-arena");do cd $i ; git submodule update -i --recursive ; cd .. ; done -``` - -### Build Natron and plugins -``` -export INSTALL_PATH=/opt/Natron-CY2015 -export PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig:$INSTALL_PATH/ffmpeg-gpl/lib/pkgconfig -export LD_LIBRARY_PATH=$INSTALL_PATH/gcc/lib64:$INSTALL_PATH/lib:$INSTALL_PATH/ffmpeg-gpl/lib -export PATH=$INSTALL_PATH/gcc/bin:$INSTALL_PATH/bin:$INSTALL_PATH/ffmpeg-gpl/bin:$PATH -export QTDIR=$INSTALL_PATH -export BOOST_ROOT=$INSTALL_PATH -export PYTHON_HOME=$INSTALL_PATH -export PYTHON_PATH=$INSTALL_PATH/lib/python2.7 -export PYTHON_INCLUDE=$INSTALL_PATH/include/python2.7 - -cd Natron -wget https://raw.githubusercontent.com/MrKepzie/Natron/master/tools/linux/include/natron/config.pri -mkdir build && cd build -$INSTALL_PATH/bin/qmake -r CONFIG+=release ../Project.pro -make || exit 1 -cd ../.. - -cd openfx-io -CPPFLAGS="-I${INSTALL_PATH}/include -I${INSTALL_PATH}/ffmpeg-gpl/include" LDFLAGS="-L${INSTALL_PATH}/lib -L${INSTALL_PATH}/ffmpeg-gpl/lib" make CONFIG=release || exit 1 -cd .. - -cd openfx-misc -CPPFLAGS="-I${INSTALL_PATH}/include" LDFLAGS="-L${INSTALL_PATH}/lib" make CONFIG=release || exit 1 -cd .. - -cd openfx-arena -CPPFLAGS="-I${INSTALL_PATH}/include" LDFLAGS="-L${INSTALL_PATH}/lib" make USE_SVG=1 USE_PANGO=1 STATIC=1 CONFIG=release || exit 1 -cd .. -```