Date: Friday, February 5, 2016 @ 23:03:40
Author: spupykin
Revision: 160432
archrelease: copy trunk to community-i686
Added:
flightgear/repos/community-i686/PKGBUILD
(from rev 160431, flightgear/trunk/PKGBUILD)
flightgear/repos/community-i686/explicitely-link-with-libX11.patch
(from rev 160431, flightgear/trunk/explicitely-link-with-libX11.patch)
Deleted:
flightgear/repos/community-i686/PKGBUILD
flightgear/repos/community-i686/explicitely-link-with-libX11.patch
------------------------------------+
PKGBUILD | 98 +++++++++++++++++------------------
explicitely-link-with-libX11.patch | 72 ++++++++++++-------------
2 files changed, 84 insertions(+), 86 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-05 22:03:29 UTC (rev 160431)
+++ PKGBUILD 2016-02-05 22:03:40 UTC (rev 160432)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: William Rea <sillywi...@gmail.com>
-# Contributor: Hans Janssen <h...@janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=3.4.0
-pkgrel=3
-pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
-depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr'
'glu' 'openal')
-makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear')
-license=("GPL")
-url="http://www.flightgear.org";
-options=('!makeflags')
-#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver";)
-#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2";)
-source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2";
- "explicitely-link-with-libX11.patch")
-md5sums=('0a6f4c27baf64f3e7d58fd44612118df'
- 'fc264184d88afdc12c669f1eabb5bbea')
-
-prepare() {
- cd $srcdir/flightgear-$pkgver
- patch -Np1 -i ../explicitely-link-with-libX11.patch
-}
-
-build() {
- cd $srcdir/flightgear-$pkgver
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" .
- uudecode -o package/flightgear.png package/flightgear.png.uue
- make
- sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|'
package/flightgear.desktop
-}
-
-package() {
- depends=(${depends[@]} 'flightgear-data')
-
- cd $srcdir/flightgear-$pkgver
- make DESTDIR=$pkgdir install
-
- install -Dm0644 package/flightgear.desktop
$pkgdir/usr/share/applications/flightgear.desktop
- install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico
- install -Dm0644 package/flightgear.png $pkgdir/usr/share/icons/flightgear.png
- install -Dm0644 scripts/completion/fg-completion.bash
$pkgdir/usr/share/bash-completion/completions/fgfs
- ln -sf flightgear $pkgdir/usr/share/FlightGear
-}
Copied: flightgear/repos/community-i686/PKGBUILD (from rev 160431,
flightgear/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-02-05 22:03:40 UTC (rev 160432)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: William Rea <sillywi...@gmail.com>
+# Contributor: Hans Janssen <h...@janserv.xs4all.nl>
+
+pkgname=flightgear
+pkgver=3.5.0git
+pkgrel=1
+pkgdesc="An open-source, multi-platform flight simulator"
+arch=(i686 x86_64)
+depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr'
'glu' 'openal')
+makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear' 'git')
+license=("GPL")
+url="https://github.com/FlightGear/flightgear";
+options=('!makeflags')
+source=("git://github.com/FlightGear/flightgear.git#commit=b61904a7a1093d5cfffac9a7262171db7dd16df"
+ "explicitely-link-with-libX11.patch")
+md5sums=('SKIP'
+ 'fc264184d88afdc12c669f1eabb5bbea')
+
+prepare() {
+ cd $srcdir/flightgear
+# patch -Np1 -i ../explicitely-link-with-libX11.patch
+}
+
+build() {
+ cd $srcdir/flightgear
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" .
+ uudecode -o package/flightgear.png package/flightgear.png.uue
+ make
+ sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|'
package/flightgear.desktop
+}
+
+package() {
+ depends=(${depends[@]} 'flightgear-data')
+
+ cd $srcdir/flightgear
+ make DESTDIR=$pkgdir install
+
+ install -Dm0644 package/flightgear.desktop
$pkgdir/usr/share/applications/flightgear.desktop
+ install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico
+ install -Dm0644 package/flightgear.png $pkgdir/usr/share/icons/flightgear.png
+ install -Dm0644 scripts/completion/fg-completion.bash
$pkgdir/usr/share/bash-completion/completions/fgfs
+ ln -sf flightgear $pkgdir/usr/share/FlightGear
+}
Deleted: explicitely-link-with-libX11.patch
===================================================================
--- explicitely-link-with-libX11.patch 2016-02-05 22:03:29 UTC (rev 160431)
+++ explicitely-link-with-libX11.patch 2016-02-05 22:03:40 UTC (rev 160432)
@@ -1,36 +0,0 @@
-From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabr...@bellet.info>
-Date: Tue, 17 Feb 2015 22:49:50 +0100
-Subject: [PATCH] explicitely link with libX11
-
----
- src/Main/CMakeLists.txt | 1 +
- utils/fgviewer/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
-index 12c0961..78c4163 100644
---- a/src/Main/CMakeLists.txt
-+++ b/src/Main/CMakeLists.txt
-@@ -142,6 +142,7 @@ target_link_libraries(fgfs
- ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
- ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
- ${PLATFORM_LIBS}
-+ ${X11_X11_LIB}
- )
-
- if(ENABLE_FLITE)
-diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
-index 165be74..065b8f1 100644
---- a/utils/fgviewer/CMakeLists.txt
-+++ b/utils/fgviewer/CMakeLists.txt
-@@ -48,5 +48,6 @@ target_link_libraries(fgviewer
- ${OPENGL_LIBRARIES}
- ${FGVIEWER_RTI_LIBRARIES}
- ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
-+ ${X11_X11_LIB}
- )
- install(TARGETS fgviewer RUNTIME DESTINATION bin)
---
-2.1.0
-
Copied: flightgear/repos/community-i686/explicitely-link-with-libX11.patch
(from rev 160431, flightgear/trunk/explicitely-link-with-libX11.patch)
===================================================================
--- explicitely-link-with-libX11.patch (rev 0)
+++ explicitely-link-with-libX11.patch 2016-02-05 22:03:40 UTC (rev 160432)
@@ -0,0 +1,36 @@
+From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabr...@bellet.info>
+Date: Tue, 17 Feb 2015 22:49:50 +0100
+Subject: [PATCH] explicitely link with libX11
+
+---
+ src/Main/CMakeLists.txt | 1 +
+ utils/fgviewer/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
+index 12c0961..78c4163 100644
+--- a/src/Main/CMakeLists.txt
++++ b/src/Main/CMakeLists.txt
+@@ -142,6 +142,7 @@ target_link_libraries(fgfs
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
+ ${PLATFORM_LIBS}
++ ${X11_X11_LIB}
+ )
+
+ if(ENABLE_FLITE)
+diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
+index 165be74..065b8f1 100644
+--- a/utils/fgviewer/CMakeLists.txt
++++ b/utils/fgviewer/CMakeLists.txt
+@@ -48,5 +48,6 @@ target_link_libraries(fgviewer
+ ${OPENGL_LIBRARIES}
+ ${FGVIEWER_RTI_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ ${X11_X11_LIB}
+ )
+ install(TARGETS fgviewer RUNTIME DESTINATION bin)
+--
+2.1.0
+
