summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen D'souza2018-09-17 18:25:18 +0530
committerGlen D'souza2018-09-17 18:33:31 +0530
commit6a70f7db51bb44030fc68cf26baa879f9c71c4f1 (patch)
treea88e1f9e94f6d55ece2a083ee43b41f40c6c22e6
parentcf68b90f9f7a226c9c24b1f0f4bfa2a913563b18 (diff)
downloadaur-6a70f7db51bb44030fc68cf26baa879f9c71c4f1.tar.gz
Rewrite PKGBUILD
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD39
-rw-r--r--getKern.patch22
3 files changed, 18 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 824ad98ee05d..40a53d5c0318 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Mon Jan 2 16:51:45 UTC 2017
pkgbase = simgear-git
pkgdesc = A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications.
- pkgver = 20170102
+ pkgver = 2018.3.0r5096.f4cad429
pkgrel = 1
- url = http://simgear.sourceforge.net/
- arch = i686
+ url = http://home.flightgear.org/
arch = x86_64
license = GPL
makedepends = boost
@@ -16,14 +13,11 @@ pkgbase = simgear-git
depends = freealut
depends = plib
depends = openscenegraph
- provides = simgear-git
- provides = simgear
+ provides = simgear=2018.3.0
conflicts = simgear
options = staticlibs
- source = git://git.code.sf.net/p/flightgear/simgear
- source = getKern.patch
+ source = simgear::git+https://git.code.sf.net/p/flightgear/simgear#branch=next
md5sums = SKIP
- md5sums = b4ab9878bbb07555d7fef68b592fb2de
pkgname = simgear-git
diff --git a/PKGBUILD b/PKGBUILD
index e58128959300..fbbf5cae402b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,50 +3,39 @@
# Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
pkgname=simgear-git
-pkgver=20170102
+pkgver=2018.3.0r5096.f4cad429
+_pkgver=2018.3.0
pkgrel=1
-_gitname=simgear
pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
-arch=('i686' 'x86_64')
-url="http://simgear.sourceforge.net/"
+arch=('x86_64')
+url="http://home.flightgear.org/"
license=('GPL')
depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
makedepends=('boost' 'cmake' 'mesa')
-provides=('simgear-git' 'simgear')
+provides=('simgear=2018.3.0')
conflicts=('simgear')
options=('staticlibs')
-source=(git://git.code.sf.net/p/flightgear/simgear
- getKern.patch)
-md5sums=('SKIP'
- 'b4ab9878bbb07555d7fef68b592fb2de')
+source=("simgear::git+https://git.code.sf.net/p/flightgear/simgear#branch=next")
+md5sums=('SKIP')
pkgver() {
- echo "$(date +"%Y%m%d")"
+ cd "${srcdir}/${pkgname%-git}"
+ printf "%sr%s.%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-# To be used with OpenSceneGraph-git
-# prepare() {
-# cd ${srcdir}
-# patch -p0 -i getKern.patch
-# }
-
build() {
- cd ${srcdir}/${_gitname}
- git checkout next
- mkdir ${srcdir}/${_gitname}-build/
- cd "${srcdir}/${_gitname}-build/"
+ cd "${srcdir}/${pkgname%-git}"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
- -DENABLE_DNS:BOOL="ON" \
-DSIMGEAR_SHARED:BOOL="ON" \
- ../${_gitname}
- make || return 1
+ .
+ make
}
package(){
- cd "${srcdir}/${_gitname}-build"
+ cd "${srcdir}/${pkgname%-git}"
make DESTDIR="${pkgdir}/" install
}
diff --git a/getKern.patch b/getKern.patch
deleted file mode 100644
index 498ac941fed4..000000000000
--- a/getKern.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- simgear/simgear/canvas/elements/CanvasText.cxx
-+++ simgear/simgear/canvas/elements/CanvasText.cxx
-@@ -496,7 +496,8 @@
- {
- case LEFT_TO_RIGHT:
- {
-- osg::Vec2 delta( activefont->getKerning( previous_charcode,
-+ osg::Vec2 delta( activefont->getKerning( _fontSize,
-+ previous_charcode,
- charcode,
- _kerningType ) );
- cursor.x() += delta.x() * wr;
-@@ -505,7 +506,8 @@
- }
- case RIGHT_TO_LEFT:
- {
-- osg::Vec2 delta( activefont->getKerning( charcode,
-+ osg::Vec2 delta( activefont->getKerning( _fontSize,
-+ charcode,
- previous_charcode,
- _kerningType ) );
- cursor.x() -= delta.x() * wr;