[arch-commits] Commit in vdrift/repos (8 files)

Antonio Rojas arojas at archlinux.org
Sun Aug 7 09:51:46 UTC 2016


    Date: Sunday, August 7, 2016 @ 09:51:46
  Author: arojas
Revision: 185764

archrelease: copy trunk to community-i686, community-x86_64

Added:
  vdrift/repos/community-i686/PKGBUILD
    (from rev 185763, vdrift/trunk/PKGBUILD)
  vdrift/repos/community-i686/vdrift-gcc6.patch
    (from rev 185763, vdrift/trunk/vdrift-gcc6.patch)
  vdrift/repos/community-x86_64/PKGBUILD
    (from rev 185763, vdrift/trunk/PKGBUILD)
  vdrift/repos/community-x86_64/vdrift-gcc6.patch
    (from rev 185763, vdrift/trunk/vdrift-gcc6.patch)
Deleted:
  vdrift/repos/community-i686/PKGBUILD
  vdrift/repos/community-i686/vdrift.install
  vdrift/repos/community-x86_64/PKGBUILD
  vdrift/repos/community-x86_64/vdrift.install

------------------------------------+
 /PKGBUILD                          |  110 +++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD            |   50 ---------------
 community-i686/vdrift-gcc6.patch   |   12 +++
 community-i686/vdrift.install      |   11 ---
 community-x86_64/PKGBUILD          |   50 ---------------
 community-x86_64/vdrift-gcc6.patch |   12 +++
 community-x86_64/vdrift.install    |   11 ---
 7 files changed, 134 insertions(+), 122 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-08-07 09:51:14 UTC (rev 185763)
+++ community-i686/PKGBUILD	2016-08-07 09:51:46 UTC (rev 185764)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf at xs4all.nl
-
-pkgname=vdrift
-pkgver=2014.10.20
-pkgrel=4
-pkgdesc="Open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data'
-         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
-makedepends=('scons' 'boost' 'asio' 'mesa')
-install=vdrift.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('524751fab341b36f59d0747ea52f0c41')
-
-build() {
-  cd vdrift
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd vdrift
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
-
-  rm -r "$pkgdir"/usr/share/
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-# vim: sw=2:ts=2 et:

Copied: vdrift/repos/community-i686/PKGBUILD (from rev 185763, vdrift/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-08-07 09:51:46 UTC (rev 185764)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Lone_Wolf lonewolf at xs4all.nl
+
+pkgname=vdrift
+pkgver=2014.10.20
+pkgrel=5
+pkgdesc="Open source driving simulation made with drift racing in mind"
+arch=('i686' 'x86_64')
+url="http://vdrift.net/"
+license=('GPL')
+depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data' 'hicolor-icon-theme' 'libarchive')
+makedepends=('scons' 'boost' 'asio' 'mesa')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 vdrift-gcc6.patch)
+md5sums=('524751fab341b36f59d0747ea52f0c41'
+         '2436c2b1c08d9266158e67ab0fd67691')
+
+prepare() {
+  cd vdrift
+# Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../vdrift-gcc6.patch
+}
+
+build() {
+  cd vdrift
+
+  # build and install
+  scons $MAKEFLAGS \
+    "destdir"="$pkgdir" \
+    "release"=1 \
+    "force_feedback"=1 \
+    "prefix"=/usr \
+    "datadir"=share/$pkgname/ \
+    "extbullet"=1
+}
+
+package() {
+  cd vdrift
+
+  scons install
+
+  # install .desktop file
+  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
+
+  rm -r "$pkgdir"/usr/share/
+
+  # install icons
+  install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+# vim: sw=2:ts=2 et:

Copied: vdrift/repos/community-i686/vdrift-gcc6.patch (from rev 185763, vdrift/trunk/vdrift-gcc6.patch)
===================================================================
--- community-i686/vdrift-gcc6.patch	                        (rev 0)
+++ community-i686/vdrift-gcc6.patch	2016-08-07 09:51:46 UTC (rev 185764)
@@ -0,0 +1,12 @@
+diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp
+--- ./src/graphics/model_obj.cpp.gcc6	2016-02-09 19:02:50.282554264 -0500
++++ ./src/graphics/model_obj.cpp	2016-02-09 19:03:10.566308088 -0500
+@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string &
+ 	std::ofstream f(strFileName.c_str());
+ 	if (!f)
+ 	{
+-		error_output << "Error opening file for writing: " << error_output << endl;
++		error_output << "Error opening file for writing: " << strFileName << endl;
+ 		return false;
+ 	}
+ 

Deleted: community-i686/vdrift.install
===================================================================
--- community-i686/vdrift.install	2016-08-07 09:51:14 UTC (rev 185763)
+++ community-i686/vdrift.install	2016-08-07 09:51:46 UTC (rev 185764)
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-08-07 09:51:14 UTC (rev 185763)
+++ community-x86_64/PKGBUILD	2016-08-07 09:51:46 UTC (rev 185764)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf at xs4all.nl
-
-pkgname=vdrift
-pkgver=2014.10.20
-pkgrel=4
-pkgdesc="Open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data'
-         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
-makedepends=('scons' 'boost' 'asio' 'mesa')
-install=vdrift.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('524751fab341b36f59d0747ea52f0c41')
-
-build() {
-  cd vdrift
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd vdrift
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
-
-  rm -r "$pkgdir"/usr/share/
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-# vim: sw=2:ts=2 et:

Copied: vdrift/repos/community-x86_64/PKGBUILD (from rev 185763, vdrift/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-08-07 09:51:46 UTC (rev 185764)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Lone_Wolf lonewolf at xs4all.nl
+
+pkgname=vdrift
+pkgver=2014.10.20
+pkgrel=5
+pkgdesc="Open source driving simulation made with drift racing in mind"
+arch=('i686' 'x86_64')
+url="http://vdrift.net/"
+license=('GPL')
+depends=('bullet' 'curl' 'sdl2_gfx' 'sdl2_image' 'glew' 'libvorbis' 'vdrift-data' 'hicolor-icon-theme' 'libarchive')
+makedepends=('scons' 'boost' 'asio' 'mesa')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 vdrift-gcc6.patch)
+md5sums=('524751fab341b36f59d0747ea52f0c41'
+         '2436c2b1c08d9266158e67ab0fd67691')
+
+prepare() {
+  cd vdrift
+# Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../vdrift-gcc6.patch
+}
+
+build() {
+  cd vdrift
+
+  # build and install
+  scons $MAKEFLAGS \
+    "destdir"="$pkgdir" \
+    "release"=1 \
+    "force_feedback"=1 \
+    "prefix"=/usr \
+    "datadir"=share/$pkgname/ \
+    "extbullet"=1
+}
+
+package() {
+  cd vdrift
+
+  scons install
+
+  # install .desktop file
+  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
+
+  rm -r "$pkgdir"/usr/share/
+
+  # install icons
+  install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
+  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+# vim: sw=2:ts=2 et:

Copied: vdrift/repos/community-x86_64/vdrift-gcc6.patch (from rev 185763, vdrift/trunk/vdrift-gcc6.patch)
===================================================================
--- community-x86_64/vdrift-gcc6.patch	                        (rev 0)
+++ community-x86_64/vdrift-gcc6.patch	2016-08-07 09:51:46 UTC (rev 185764)
@@ -0,0 +1,12 @@
+diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp
+--- ./src/graphics/model_obj.cpp.gcc6	2016-02-09 19:02:50.282554264 -0500
++++ ./src/graphics/model_obj.cpp	2016-02-09 19:03:10.566308088 -0500
+@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string &
+ 	std::ofstream f(strFileName.c_str());
+ 	if (!f)
+ 	{
+-		error_output << "Error opening file for writing: " << error_output << endl;
++		error_output << "Error opening file for writing: " << strFileName << endl;
+ 		return false;
+ 	}
+ 

Deleted: community-x86_64/vdrift.install
===================================================================
--- community-x86_64/vdrift.install	2016-08-07 09:51:14 UTC (rev 185763)
+++ community-x86_64/vdrift.install	2016-08-07 09:51:46 UTC (rev 185764)
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}



More information about the arch-commits mailing list