diff options
author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-05-31 07:17:06 +0000 |
---|---|---|
committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-05-31 07:19:10 +0000 |
commit | b731eb842b0f06457974031204fd29f0c7b3787a (patch) | |
tree | 3205579b3eeda51d2dd85ffaf16863ed66825842 | |
parent | af3f2d0bad479d7e23e573e0e8734b19b1764c33 (diff) | |
download | aports-b731eb842b0f06457974031204fd29f0c7b3787a.tar.bz2 aports-b731eb842b0f06457974031204fd29f0c7b3787a.tar.xz |
Revert "testing/openscenegraph: upgrade to 3.6.1"
This reverts commit d1a3b82da3af42e56d8821f298c6aa53d9900e49.
Actually touch only openscengraph package.
Above commit has accidentally included other pending changes...
-rw-r--r-- | testing/flightgear/APKBUILD | 12 | ||||
-rw-r--r-- | testing/openscenegraph/APKBUILD | 4 | ||||
-rw-r--r-- | testing/simgear/APKBUILD | 9 |
3 files changed, 14 insertions, 11 deletions
diff --git a/testing/flightgear/APKBUILD b/testing/flightgear/APKBUILD index 7492ae6c94..e58879b6e6 100644 --- a/testing/flightgear/APKBUILD +++ b/testing/flightgear/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=flightgear -pkgver=2018.2.1 -pkgrel=0 +pkgver=2017.3.1 +pkgrel=1 pkgdesc="Sophisticated flight simulator" url="http://flightgear.org" -arch="all !aarch64" +arch="!aarch64" license="GPL" makedepends="$depends_dev boost-dev cmake curl-dev dbus-dev eudev-dev freeglut-dev glew-dev libx11-dev libxi-dev libxmu-dev mesa-dev @@ -15,6 +15,7 @@ install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/project/$pkgname/release-${pkgver%.[1-9]*}/$pkgname-$pkgver.tar.bz2 musl-fixes.patch + fix-link_with_x11.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -39,5 +40,6 @@ package() { # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="778ad93ac00dab271c3dcad6142e92715a5bf9537b95e75b0d245f3a7b42e4690a6fc13f32f12d945aa3a27df88e9b870722e9d580dffe2c6893a461999a1522 flightgear-2018.2.1.tar.bz2 -3350de9e465dc4f865d2a94d96b2f79b4c98c994fc4713cfa296c20ed12129f310779171b89639f69d1e4f5f0103fca6cc01df5a9e25d77f93a0b4e76f6b973a musl-fixes.patch" +sha512sums="e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b flightgear-2017.3.1.tar.bz2 +3350de9e465dc4f865d2a94d96b2f79b4c98c994fc4713cfa296c20ed12129f310779171b89639f69d1e4f5f0103fca6cc01df5a9e25d77f93a0b4e76f6b973a musl-fixes.patch +49d359d213870ad71a3403e93951574b334d8281fbe9553fe259d65e1b0a8659c127cde11ffdf2ba3351c2af2dabe60657dab6dab3ff0c9fecad4a398fd6f2eb fix-link_with_x11.patch" diff --git a/testing/openscenegraph/APKBUILD b/testing/openscenegraph/APKBUILD index 5a6ae98553..c2165ca32c 100644 --- a/testing/openscenegraph/APKBUILD +++ b/testing/openscenegraph/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=openscenegraph pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="High performance 3D graphics toolkit" url="https://openscenegraph.org" arch="all" @@ -34,6 +34,6 @@ package() { [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true } -sha512sums="4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143 OpenSceneGraph-3.4.1.tar.gz +sha512sums="5133896804ab5237cd092893cf8c0492f23ccffbbba0cdd0add7dc079b1d444ee2f0835f84d5e78ec1b52ba99a2e07bca393cd4eadb4f3b4e0c37ba158fb2a97 OpenSceneGraph-3.6.1.tar.gz 016b09874bd6ca14cf1dba9274df4fc0413d2d97c3438135ecf6c5726029963f1ff279eb4986afe86173739512799e1e8ee5f7443e30fe1131524405a9d002be musl-fixes.patch a3e69609b2e3c51002f4babd1c5bd64fc9c32b14fc9232f4b4f345c6e96134bc80a0fe54ce3445059b4d0512d5ac1ec434101fe976b71f24c68b3569265e21d9 add-missing-include-for-ppc64le.patch" diff --git a/testing/simgear/APKBUILD b/testing/simgear/APKBUILD index 4db44cfd6e..c725a0ee9f 100644 --- a/testing/simgear/APKBUILD +++ b/testing/simgear/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=simgear -pkgver=2018.2.1 +pkgver=2017.4.0 pkgrel=0 pkgdesc="Sim library for FlightGear" url="https://github.com/FlightGear/simgear" @@ -9,12 +9,13 @@ license="GPL" makedepends="$depends_dev boost-dev cmake curl-dev mesa-dev openal-soft-dev openscenegraph-dev zlib-dev" subpackages= -source="https://downloads.sourceforge.net/project/flightgear/release-${pkgver%.[0-9]}/simgear-$pkgver.tar.bz2 +source="$pkgname-$pkgver.tar.gz::https://github.com/FlightGear/simgear/archive/version/$pkgver.tar.gz musl-fixes.patch " -builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-version-$pkgver prepare() { + cd "$builddir" default_prepare mkdir sgbuild && cd sgbuild cmake .. \ @@ -34,5 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fe118fc3bcd2bfc1e26533f4b57b8e90e971c6f516470c9b440bf455fd29e6ac4962d5aff1b0d7f4f96441c9fb714af212ac9c169625d5c053ed04b293623c2e simgear-2018.2.1.tar.bz2 +sha512sums="2c4940d50ebfa5644e6220e9aa0165cc23f52ba15f5f706e47754212a11ad74401e113e7e7ab61b76e3d5e7beee1f5112f259dd5518c9bee099bbcafbabb92ec simgear-2017.4.0.tar.gz 7efcf01c9328b0732ae9aa7af4edb52e14919663a8d3acbe429a0697f59a55e85a71628d9afaa3d38327d960dbf5dacc1f964e38dd6cb499b593ae2be918b140 musl-fixes.patch" |