[arch-commits] Commit in xmoto/repos (16 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Nov 12 18:28:15 UTC 2014


    Date: Wednesday, November 12, 2014 @ 19:28:15
  Author: foutrelis
Revision: 122452

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

Added:
  xmoto/repos/community-i686/PKGBUILD
    (from rev 122451, xmoto/trunk/PKGBUILD)
  xmoto/repos/community-i686/system.cpp.patch
    (from rev 122451, xmoto/trunk/system.cpp.patch)
  xmoto/repos/community-i686/xmoto-0.5.10-libpng15.patch
    (from rev 122451, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
  xmoto/repos/community-i686/xmoto.install
    (from rev 122451, xmoto/trunk/xmoto.install)
  xmoto/repos/community-x86_64/PKGBUILD
    (from rev 122451, xmoto/trunk/PKGBUILD)
  xmoto/repos/community-x86_64/system.cpp.patch
    (from rev 122451, xmoto/trunk/system.cpp.patch)
  xmoto/repos/community-x86_64/xmoto-0.5.10-libpng15.patch
    (from rev 122451, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
  xmoto/repos/community-x86_64/xmoto.install
    (from rev 122451, xmoto/trunk/xmoto.install)
Deleted:
  xmoto/repos/community-i686/PKGBUILD
  xmoto/repos/community-i686/system.cpp.patch
  xmoto/repos/community-i686/xmoto-0.5.10-libpng15.patch
  xmoto/repos/community-i686/xmoto.install
  xmoto/repos/community-x86_64/PKGBUILD
  xmoto/repos/community-x86_64/system.cpp.patch
  xmoto/repos/community-x86_64/xmoto-0.5.10-libpng15.patch
  xmoto/repos/community-x86_64/xmoto.install

----------------------------------------------+
 /PKGBUILD                                    |  104 +++++++++++++++++++++++++
 /system.cpp.patch                            |   20 ++++
 /xmoto-0.5.10-libpng15.patch                 |   20 ++++
 /xmoto.install                               |   22 +++++
 community-i686/PKGBUILD                      |   48 -----------
 community-i686/system.cpp.patch              |   10 --
 community-i686/xmoto-0.5.10-libpng15.patch   |   10 --
 community-i686/xmoto.install                 |   11 --
 community-x86_64/PKGBUILD                    |   48 -----------
 community-x86_64/system.cpp.patch            |   10 --
 community-x86_64/xmoto-0.5.10-libpng15.patch |   10 --
 community-x86_64/xmoto.install               |   11 --
 12 files changed, 166 insertions(+), 158 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-i686/PKGBUILD	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca> 
-# Contributor: Denis (dtonator at gmail.com)
-
-pkgname=xmoto
-pkgver=0.5.10
-pkgrel=4
-pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
-arch=('i686' 'x86_64')
-url="http://xmoto.tuxfamily.org"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 
-	 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu'
-         'libxdg-basedir' 'libxml++')
-makedepends=('mesa')
-install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'xmoto-0.5.10-libpng15.patch'
-        'system.cpp.patch')
-sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc'
-          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
-          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
-  patch -Np1 -i "${srcdir}/system.cpp.patch"
-
-  # build and install 
-  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
-
-  # install desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
-        ${pkgdir}/usr/share/applications/xmoto.desktop
-
-  # install icon for desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
-        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
-}

Copied: xmoto/repos/community-i686/PKGBUILD (from rev 122451, xmoto/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Denis (dtonator at gmail.com)
+
+pkgname=xmoto
+pkgver=0.5.11
+pkgrel=1
+pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
+arch=('i686' 'x86_64')
+url="http://xmoto.tuxfamily.org"
+license=('GPL')
+depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 'sqlite3' 'sdl_ttf'
+         'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml2')
+makedepends=('mesa')
+install=xmoto.install
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+        'xmoto-0.5.10-libpng15.patch'
+        'system.cpp.patch')
+sha1sums=('a795616fb359e60be343e339f7acf5e95e0f1ce2'
+          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
+          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
+  patch -Np1 -i "${srcdir}/system.cpp.patch"
+
+  # Remove bundled ode library because its headers get picked up during build
+  rm -r src/ode
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --disable-sdltest
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" mangdir=/usr/share/man/man6 install
+
+  # install desktop file
+  install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop" \
+        "${pkgdir}/usr/share/applications/xmoto.desktop"
+
+  # install icon for desktop file
+  install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm" \
+        "${pkgdir}/usr/share/pixmaps/xmoto.xpm"
+}

Deleted: community-i686/system.cpp.patch
===================================================================
--- community-i686/system.cpp.patch	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-i686/system.cpp.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,10 +0,0 @@
---- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
-+++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <unistd.h>
- 
- std::vector<std::string>* System::getDisplayModes(int windowed) {
-     std::vector<std::string>* modes = new std::vector<std::string>;

Copied: xmoto/repos/community-i686/system.cpp.patch (from rev 122451, xmoto/trunk/system.cpp.patch)
===================================================================
--- community-i686/system.cpp.patch	                        (rev 0)
+++ community-i686/system.cpp.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+ 
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;

Deleted: community-i686/xmoto-0.5.10-libpng15.patch
===================================================================
--- community-i686/xmoto-0.5.10-libpng15.patch	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-i686/xmoto-0.5.10-libpng15.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
-+++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include <png.h>
- #include <zlib.h>

Copied: xmoto/repos/community-i686/xmoto-0.5.10-libpng15.patch (from rev 122451, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
===================================================================
--- community-i686/xmoto-0.5.10-libpng15.patch	                        (rev 0)
+++ community-i686/xmoto-0.5.10-libpng15.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
++++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include <png.h>
+ #include <zlib.h>

Deleted: community-i686/xmoto.install
===================================================================
--- community-i686/xmoto.install	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-i686/xmoto.install	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: xmoto/repos/community-i686/xmoto.install (from rev 122451, xmoto/trunk/xmoto.install)
===================================================================
--- community-i686/xmoto.install	                        (rev 0)
+++ community-i686/xmoto.install	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-x86_64/PKGBUILD	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca> 
-# Contributor: Denis (dtonator at gmail.com)
-
-pkgname=xmoto
-pkgver=0.5.10
-pkgrel=4
-pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
-arch=('i686' 'x86_64')
-url="http://xmoto.tuxfamily.org"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 
-	 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu'
-         'libxdg-basedir' 'libxml++')
-makedepends=('mesa')
-install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'xmoto-0.5.10-libpng15.patch'
-        'system.cpp.patch')
-sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc'
-          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
-          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
-  patch -Np1 -i "${srcdir}/system.cpp.patch"
-
-  # build and install 
-  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
-
-  # install desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
-        ${pkgdir}/usr/share/applications/xmoto.desktop
-
-  # install icon for desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
-        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
-}

Copied: xmoto/repos/community-x86_64/PKGBUILD (from rev 122451, xmoto/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Denis (dtonator at gmail.com)
+
+pkgname=xmoto
+pkgver=0.5.11
+pkgrel=1
+pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
+arch=('i686' 'x86_64')
+url="http://xmoto.tuxfamily.org"
+license=('GPL')
+depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 'sqlite3' 'sdl_ttf'
+         'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml2')
+makedepends=('mesa')
+install=xmoto.install
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+        'xmoto-0.5.10-libpng15.patch'
+        'system.cpp.patch')
+sha1sums=('a795616fb359e60be343e339f7acf5e95e0f1ce2'
+          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
+          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
+  patch -Np1 -i "${srcdir}/system.cpp.patch"
+
+  # Remove bundled ode library because its headers get picked up during build
+  rm -r src/ode
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --disable-sdltest
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" mangdir=/usr/share/man/man6 install
+
+  # install desktop file
+  install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop" \
+        "${pkgdir}/usr/share/applications/xmoto.desktop"
+
+  # install icon for desktop file
+  install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm" \
+        "${pkgdir}/usr/share/pixmaps/xmoto.xpm"
+}

Deleted: community-x86_64/system.cpp.patch
===================================================================
--- community-x86_64/system.cpp.patch	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-x86_64/system.cpp.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,10 +0,0 @@
---- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
-+++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <unistd.h>
- 
- std::vector<std::string>* System::getDisplayModes(int windowed) {
-     std::vector<std::string>* modes = new std::vector<std::string>;

Copied: xmoto/repos/community-x86_64/system.cpp.patch (from rev 122451, xmoto/trunk/system.cpp.patch)
===================================================================
--- community-x86_64/system.cpp.patch	                        (rev 0)
+++ community-x86_64/system.cpp.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+ 
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;

Deleted: community-x86_64/xmoto-0.5.10-libpng15.patch
===================================================================
--- community-x86_64/xmoto-0.5.10-libpng15.patch	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-x86_64/xmoto-0.5.10-libpng15.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
-+++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include <png.h>
- #include <zlib.h>

Copied: xmoto/repos/community-x86_64/xmoto-0.5.10-libpng15.patch (from rev 122451, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
===================================================================
--- community-x86_64/xmoto-0.5.10-libpng15.patch	                        (rev 0)
+++ community-x86_64/xmoto-0.5.10-libpng15.patch	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
++++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include <png.h>
+ #include <zlib.h>

Deleted: community-x86_64/xmoto.install
===================================================================
--- community-x86_64/xmoto.install	2014-11-12 18:27:58 UTC (rev 122451)
+++ community-x86_64/xmoto.install	2014-11-12 18:28:15 UTC (rev 122452)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: xmoto/repos/community-x86_64/xmoto.install (from rev 122451, xmoto/trunk/xmoto.install)
===================================================================
--- community-x86_64/xmoto.install	                        (rev 0)
+++ community-x86_64/xmoto.install	2014-11-12 18:28:15 UTC (rev 122452)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


More information about the arch-commits mailing list