From e21958010e6199066d82088d4658db78790ba328 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 13 May 2022 16:53:39 +0200 Subject: [PATCH 1/2] simgear: update to 2020.3.13 - Use system expat and udns. This causes shared libraries to be built, so create -devel subpackage - Use glvnd - Remove unnecessary CXXFLAGS --- common/shlibs | 2 ++ srcpkgs/simgear-devel | 1 + srcpkgs/simgear/template | 24 ++++++++++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/simgear-devel diff --git a/common/shlibs b/common/shlibs index a143f5928c41..9e059072b312 100644 --- a/common/shlibs +++ b/common/shlibs @@ -42,6 +42,8 @@ libnss_dns.so.2 glibc-2.32_1 libnss_hesiod.so.2 glibc-2.32_1 libcrypt.so.1 glibc-2.32_1 libBrokenLocale.so.1 glibc-2.32_1 +libSimGearCore.so.2020.3.13 simgear-2020.3.13_1 +libSimGearScene.so.2020.3.13 simgear-2020.3.13_1 libmemusage.so glibc-2.32_1 libSegFault.so glibc-2.32_1 libpcprofile.so glibc-2.32_1 diff --git a/srcpkgs/simgear-devel b/srcpkgs/simgear-devel new file mode 120000 index 000000000000..ce3c8b7b2340 --- /dev/null +++ b/srcpkgs/simgear-devel @@ -0,0 +1 @@ +simgear \ No newline at end of file diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index 7f510909dbac..0fb81d1431d8 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,20 +1,28 @@ # Template file for 'simgear' pkgname=simgear -version=2020.3.11 +version=2020.3.13 revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake -configure_args="-DENABLE_TESTS=OFF -Wdev" +configure_args="-DENABLE_TESTS=OFF -DOpenGL_GL_PREFERENCE=GLVND + -DSYSTEM_EXPAT=ON -DSYSTEM_UDNS=ON" hostmakedepends="pkg-config" makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel - liblzma-devel" -short_desc="Simulation engine for FlightGear - static libraries" + liblzma-devel expat-devel udns-devel" +short_desc="Simulation engine for FlightGear" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.flightgear.org/" +homepage="https://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=bb8dfcbc2a3b0143d1ffcf01d1a961e566ef21dd33d9cc768d6d9aa5871d4f3c +checksum=dc09906fda8b1810fe2cb22b5f5171d208ba901c5b9d390bad6d1f3fd66c51e8 -# Suppress warnings regarding auto_ptr -CXXFLAGS="-Wno-deprecated-declarations" +simgear-devel_package() { + depends="simgear>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From e62e9b782e8d473985bbafaeaf949d64de567315 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 13 May 2022 16:56:37 +0200 Subject: [PATCH 2/2] flightgear: update to 2020.3.13 - Fix cross builds - Start with --launcher in .desktop - Build with system sqlite and flite - Remove qt option - Remove time64.patch - Various cleanups --- srcpkgs/flightgear/files/flightgear.png | Bin 5849 -> 0 bytes srcpkgs/flightgear/patches/time64.patch | 13 ------- srcpkgs/flightgear/template | 46 ++++++++---------------- 3 files changed, 15 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/flightgear/files/flightgear.png delete mode 100644 srcpkgs/flightgear/patches/time64.patch diff --git a/srcpkgs/flightgear/files/flightgear.png b/srcpkgs/flightgear/files/flightgear.png deleted file mode 100644 index 00992f1baf3f46665c03fafab401a926cfa5e2f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5849 zcmV;~7AEP5P)WFU8GbZ8({Xk{QrNlj4iWF>9@02Vz-L_t(|+D)2StZms< zp1(2YT+Lp)JNtCEtEzje%5|&Cb{Ut!U|Tj0i4De>2t;B*1c@Suls5!ONO{Xs9wJ4` zL*A1pB9Ri}D2;3jCyD{10KrsnTem;`K428o?TaA(0t_GlDbV3|IqTh$vnauaRDqJ}Rn$QAklpNzkaM0s;cV1&XSo zmqQT&1WgKhITpSAzLH3YF<1*_0mdX$A+wI$B=S5mo#fPw;QH8u3I@fBU<85@G9xGu zR0#?C5K#m%3G2Y+LQ%k|6k<@i&f;tL3Qf@TSLARfq2!U8nR2DJh^B0V7K0gxo5VQKBpj<;ap3 zLNUs5MlotgN%2Y9)Cu3hsy3W0`~Ppp!7wZ)MZp>nrxaPl8O29~%OJ+cd<;%1p>JVO$yVOz2}oHJ}b5}GX2(qFNw{U*p_>*T4I#po1g;3|7J*4VgpiL)ABEr@$vX^?dV`{f zjTCuelo^5u(HK&?OzNn35xSUIZXzv~k&BG7$fQ^^D_}Z-53*jZ0TFUZ*dVAC&`45{ z7%5cAvw+Pu*b>AE?#Yv!m=Y-|igKhGZyhQIhZSW$Rc2F|<(_dSlqNE9P}xLA!eole zERuIvwZteKuZ6=4!{NDbyi(fUkuWG=#14pKF7rYYxl=~DQsv5|fN?HVStPeYi9l40 zD1u@|ab7UJqqQU4zS*Ml0ZpEKn$gf<@<5P|WIZtxj(y^&fn>lrOG*)!l#vLtOqiI+ zy309ODa(z3SX3@?G$~@z0GA4?1AH1a_!vQiE(ojU60Ia*$Uzh*f>qcZkJy=2Ofra} zK~jz_wpe?`o!mPEv4|C#^FTE#h{j-@V>EU+F{lZ2u_b7WC*WH{-3q5(c$fr5hc~DL zFIcNU`T>L*6=IB}lmPj`ePn=IR8dhh!6?s3eWbD_TU!;?xFq>RTf?eJ^nJy;zCe9V zSr)j-R!%fRND=QNE>p(i5<4;!dBWL_tW2;Cn-FP3M_)o0AoLJ|C3=hR4Sk=8mkR+w zH31NVe!yy%i_}Z(7pxeZ8geX)ojKcEV~V^3*CAPlm>N+FDbhAQ%Q`S_h144S%HtN# zEKnj&5;69)n>D>ZV^U>Un+Tbw(LhoK3pj^!U^NcmkrEn}z7gss=VTcPF=E6ZqQfMu zkS-@~1gto+VA-E+lSRkH#fm)7=pVH#*Dcv7krk1=5>lZcVSsWXTT?-&N|c^pBCcLN zfRqqX(1bFua&w+&E-q;k2R0#YAfRL;UM;J&u-YhHJ1~~wkxTZ98W1yFS9!tye2cx& zj4CTRUY>JswB+n~h5AToa!$@JXqt}vz%rT?66fG=K_{1od*MZ48;h0%4LzdIw!hv_a^6A}C~;qtt>?bWC(a z6>>Jw^WNDJhv%nY1S!ClhGkomO@zhXjHYQRw{mV?U$9+`$em+dcbuJXsOu-}ZLPVs z-+_r3Rph6?^m&bKq^Ug-$O>h$fbl$GttUl6Rfa`~pgQQ1A*KhU5mmejO;qZj)E;t| zQP>Pku<2?NN=Rv7X89nbh8<3-h!uI}N`B#l85U zYdkqRru6~MTC!13SqVx2z=@Co#3-a-5OHuhZX+~ZWD_BXkWxaE5@Mq1dc<&@4w9-efJN!^X?sb?=fOf879+t<>*{^a+*L4?)Ca4j&_m;sjFkG%L?$4V${4t_AN6=>uu3dYQNoyeAE%0AhwW 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 diff --git a/srcpkgs/flightgear/patches/time64.patch b/srcpkgs/flightgear/patches/time64.patch deleted file mode 100644 index 367f884452ae..000000000000 --- a/srcpkgs/flightgear/patches/time64.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/Input/FGLinuxEventInput.cxx 2020-06-26 00:08:15.000000000 +0200 -+++ b/src/Input/FGLinuxEventInput.cxx 2020-12-07 07:51:45.332825252 +0100 -@@ -415,8 +415,8 @@ - evt.type=typeCode.type; - evt.code = typeCode.code; - evt.value = (long)value; -- evt.time.tv_sec = 0; -- evt.time.tv_usec = 0; -+ evt.input_event_sec = 0; -+ evt.input_event_usec = 0; - size_t bytes_written = write(fd, &evt, sizeof(evt)); - - if( bytes_written == sizeof(evt) ) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 16f2dd21a021..2033cb57ed8f 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,61 +1,45 @@ # Template file for 'flightgear' pkgname=flightgear -version=2020.3.11 +version=2020.3.13 revision=1 +# XXX: always keep in sync with simgear version! build_style=cmake +build_helper="qemu" configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata - -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations" -hostmakedepends="fltk gettext pkg-config $(vopt_if qt qt5-tools)" + -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/fgdata/Translations + -DSYSTEM_SQLITE=ON -DSYSTEM_FLITE=ON" +hostmakedepends="gettext pkg-config qt5-tools" makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel - libfreeglut-devel fltk-devel libglvnd-devel libgsm-devel glew-devel speex-devel - sqlite-devel osg-devel plib-devel libcurl-devel simgear - $(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')" + libfreeglut-devel libglvnd-devel libgsm-devel glew-devel speex-devel + sqlite-devel osg-devel plib-devel libcurl-devel simgear-devel flite-devel + qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel" depends="flightgear-data>=${version}" short_desc="Sophisticated flight simulator" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.flightgear.org/" +homepage="https://www.flightgear.org/" +changelog="https://wiki.flightgear.org/Changelog_2020.3" distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.txz" -checksum="fe2706c7707ea73abc5114773de45f29861ab0f8f535656af0428ed049ca4a97 - 123f151b2c0f4220f0dd55e875ca57a4ec38a94f71f8c04c58caeac077e2b558" +checksum="661abfaf475abc8cfd1bab57559469efa662bc6d03f58e8d977385003fe5aa8c + 0b7894540ec8250efb39d5dc6819d2a43a613058e61599a7d27a3342f7714893" python_version=2 make_check=no -nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio - -build_options="qt" -build_options_default="qt" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools $(vopt_if qt 'qt5-devel qt5-declarative-devel')" + hostmakedepends+=" qt5-host-tools qt5-devel qt5-declarative-devel" fi -# Suppress warnings regarding auto_ptr -CXXFLAGS="-Wno-deprecated-declarations" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo" fi -post_extract() { - if [ -d "${wrksrc}/../fgdata" ]; then - mv ${wrksrc}/../fgdata ${wrksrc} - fi -} - -post_install() { - vinstall package/org.flightgear.FlightGear.desktop 644 usr/share/applications - vinstall package/flightgear.ico 644 usr/share/icons - vinstall ${FILESDIR}/flightgear.png 644 usr/share/pixmaps - sed -i ${DESTDIR}/usr/share/applications/*.desktop \ - -e "s;Exec=.*;Exec=fgfs --fg-root=/usr/share/flightgear/fgdata;" -} - flightgear-data_package() { short_desc+=" - data files" pkg_install() { vmkdir usr/share/flightgear - mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear + mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear } }