[arch-commits] Commit in 0ad/repos (10 files)
Sven-Hendrik Haase
svenstaro at nymeria.archlinux.org
Wed May 14 18:11:18 UTC 2014
Date: Wednesday, May 14, 2014 @ 20:11:18
Author: svenstaro
Revision: 111146
archrelease: copy trunk to community-i686, community-x86_64
Added:
0ad/repos/community-i686/PKGBUILD
(from rev 111145, 0ad/trunk/PKGBUILD)
0ad/repos/community-i686/miniupnpc-1.9.patch
(from rev 111145, 0ad/trunk/miniupnpc-1.9.patch)
0ad/repos/community-x86_64/PKGBUILD
(from rev 111145, 0ad/trunk/PKGBUILD)
0ad/repos/community-x86_64/miniupnpc-1.9.patch
(from rev 111145, 0ad/trunk/miniupnpc-1.9.patch)
Deleted:
0ad/repos/community-i686/PKGBUILD
0ad/repos/community-i686/boost-1.50.patch
0ad/repos/community-i686/miniupnpc-1.9.patch
0ad/repos/community-x86_64/PKGBUILD
0ad/repos/community-x86_64/boost-1.50.patch
0ad/repos/community-x86_64/miniupnpc-1.9.patch
--------------------------------------+
/PKGBUILD | 114 +++++++++++++++++++++++++++++++++
/miniupnpc-1.9.patch | 24 ++++++
community-i686/PKGBUILD | 57 ----------------
community-i686/boost-1.50.patch | 39 -----------
community-i686/miniupnpc-1.9.patch | 12 ---
community-x86_64/PKGBUILD | 57 ----------------
community-x86_64/boost-1.50.patch | 39 -----------
community-x86_64/miniupnpc-1.9.patch | 12 ---
8 files changed, 138 insertions(+), 216 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-i686/PKGBUILD 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
-pkgname=0ad
-pkgver=a15
-_pkgver=0.0.15-alpha
-pkgrel=4
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://play0ad.com/"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
- 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
- 'gloox' 'miniupnpc')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
- "miniupnpc-1.9.patch")
-md5sums=('a651d81eb9b31da01e376ddaa597e954'
- 'f3d27da4944d42fcf6b4153e54dc4600')
-
-prepare() {
- cd "$srcdir/$pkgname-$_pkgver"
- patch -p1 -i ../miniupnpc-1.9.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
-
- unset CPPFLAGS # for le spidermonkey
-
- export WX_CONFIG=/usr/bin/wx-config-2.8
- ./update-workspaces.sh \
- --with-system-enet \
- --with-system-miniupnpc \
- --bindir=/usr/bin \
- --libdir=/usr/lib/0ad \
- --datadir=/usr/share/${pkgname}/data
-
- cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
- make CONFIG=Release
-}
-
-package() {
- install -d "${pkgdir}"/usr/{bin,lib/0ad}
- cd "$srcdir/$pkgname-$_pkgver"
-
- install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
- install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
-
- install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
- install -Dm644 build/resources/${pkgname}.desktop \
- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 build/resources/${pkgname}.png \
- "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
Copied: 0ad/repos/community-i686/PKGBUILD (from rev 111145, 0ad/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-05-14 18:11:18 UTC (rev 111146)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+pkgver=a15
+_pkgver=0.0.15-alpha
+pkgrel=5
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('i686' 'x86_64')
+url="http://play0ad.com/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+ 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
+ 'gloox' 'miniupnpc')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
+ "miniupnpc-1.9.patch")
+md5sums=('a651d81eb9b31da01e376ddaa597e954'
+ 'f3d27da4944d42fcf6b4153e54dc4600')
+
+prepare() {
+ cd "$srcdir/$pkgname-$_pkgver"
+ patch -p1 -i ../miniupnpc-1.9.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+ unset CPPFLAGS # for le spidermonkey
+
+ export WX_CONFIG=/usr/bin/wx-config-2.8
+ ./update-workspaces.sh \
+ --with-system-enet \
+ --with-system-miniupnpc \
+ --bindir=/usr/bin \
+ --libdir=/usr/lib/0ad \
+ --datadir=/usr/share/${pkgname}/data
+
+ cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+ make CONFIG=Release
+}
+
+package() {
+ install -d "${pkgdir}"/usr/{bin,lib/0ad}
+ cd "$srcdir/$pkgname-$_pkgver"
+
+ install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+ install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
+
+ install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+ install -Dm644 build/resources/${pkgname}.desktop \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 build/resources/${pkgname}.png \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
Deleted: community-i686/boost-1.50.patch
===================================================================
--- community-i686/boost-1.50.patch 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-i686/boost-1.50.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,39 +0,0 @@
-diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp
---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200
-@@ -425,9 +425,9 @@
- CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
- if (f)
- files.push_back(f);
-- p = p / *it;
-+ p = p / it->wstring();
- }
-- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
-+ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files);
- }
-
- /**
-diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h
---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200
-@@ -25,7 +25,7 @@
-
- // the following boost libraries have been included in TR1 and are
- // thus deemed usable:
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
- #include <boost/shared_ptr.hpp>
-diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp
---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200
-+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200
-@@ -53,7 +53,7 @@
- fs::wpath components = pathname.string();
- fs::wpath::iterator it = components.begin();
- std::advance(it, 2);
-- std::wstring dirname = *it;
-+ std::wstring dirname = it->wstring();
-
- CScriptValRooted ai;
- self->m_ScriptInterface.Eval("({})", ai);
Deleted: community-i686/miniupnpc-1.9.patch
===================================================================
--- community-i686/miniupnpc-1.9.patch 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-i686/miniupnpc-1.9.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,12 +0,0 @@
-diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp
---- a/source/network/NetServer.cpp 2013-12-18 16:08:56.000000000 +0000
-+++ b/source/network/NetServer.cpp 2014-02-18 10:11:59.955214338 +0000
-@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*)
- // Check that the port was actually forwarded.
- ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
- data.first.servicetype,
-- psPort, protocall,
-+ psPort, protocall, externalIPAddress,
- intClient, intPort, NULL/*desc*/,
- NULL/*enabled*/, duration);
-
Copied: 0ad/repos/community-i686/miniupnpc-1.9.patch (from rev 111145, 0ad/trunk/miniupnpc-1.9.patch)
===================================================================
--- community-i686/miniupnpc-1.9.patch (rev 0)
+++ community-i686/miniupnpc-1.9.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -0,0 +1,12 @@
+diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp
+--- a/source/network/NetServer.cpp 2013-12-18 16:08:56.000000000 +0000
++++ b/source/network/NetServer.cpp 2014-02-18 10:11:59.955214338 +0000
+@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*)
+ // Check that the port was actually forwarded.
+ ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
+ data.first.servicetype,
+- psPort, protocall,
++ psPort, protocall, externalIPAddress,
+ intClient, intPort, NULL/*desc*/,
+ NULL/*enabled*/, duration);
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-x86_64/PKGBUILD 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
-pkgname=0ad
-pkgver=a15
-_pkgver=0.0.15-alpha
-pkgrel=4
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://play0ad.com/"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
- 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
- 'gloox' 'miniupnpc')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
- "miniupnpc-1.9.patch")
-md5sums=('a651d81eb9b31da01e376ddaa597e954'
- 'f3d27da4944d42fcf6b4153e54dc4600')
-
-prepare() {
- cd "$srcdir/$pkgname-$_pkgver"
- patch -p1 -i ../miniupnpc-1.9.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
-
- unset CPPFLAGS # for le spidermonkey
-
- export WX_CONFIG=/usr/bin/wx-config-2.8
- ./update-workspaces.sh \
- --with-system-enet \
- --with-system-miniupnpc \
- --bindir=/usr/bin \
- --libdir=/usr/lib/0ad \
- --datadir=/usr/share/${pkgname}/data
-
- cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
- make CONFIG=Release
-}
-
-package() {
- install -d "${pkgdir}"/usr/{bin,lib/0ad}
- cd "$srcdir/$pkgname-$_pkgver"
-
- install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
- install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
-
- install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
- install -Dm644 build/resources/${pkgname}.desktop \
- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 build/resources/${pkgname}.png \
- "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
Copied: 0ad/repos/community-x86_64/PKGBUILD (from rev 111145, 0ad/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-05-14 18:11:18 UTC (rev 111146)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+pkgver=a15
+_pkgver=0.0.15-alpha
+pkgrel=5
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('i686' 'x86_64')
+url="http://play0ad.com/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+ 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
+ 'gloox' 'miniupnpc')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
+ "miniupnpc-1.9.patch")
+md5sums=('a651d81eb9b31da01e376ddaa597e954'
+ 'f3d27da4944d42fcf6b4153e54dc4600')
+
+prepare() {
+ cd "$srcdir/$pkgname-$_pkgver"
+ patch -p1 -i ../miniupnpc-1.9.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+ unset CPPFLAGS # for le spidermonkey
+
+ export WX_CONFIG=/usr/bin/wx-config-2.8
+ ./update-workspaces.sh \
+ --with-system-enet \
+ --with-system-miniupnpc \
+ --bindir=/usr/bin \
+ --libdir=/usr/lib/0ad \
+ --datadir=/usr/share/${pkgname}/data
+
+ cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+ make CONFIG=Release
+}
+
+package() {
+ install -d "${pkgdir}"/usr/{bin,lib/0ad}
+ cd "$srcdir/$pkgname-$_pkgver"
+
+ install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+ install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
+
+ install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+ install -Dm644 build/resources/${pkgname}.desktop \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 build/resources/${pkgname}.png \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
Deleted: community-x86_64/boost-1.50.patch
===================================================================
--- community-x86_64/boost-1.50.patch 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-x86_64/boost-1.50.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,39 +0,0 @@
-diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp
---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200
-@@ -425,9 +425,9 @@
- CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
- if (f)
- files.push_back(f);
-- p = p / *it;
-+ p = p / it->wstring();
- }
-- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
-+ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files);
- }
-
- /**
-diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h
---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200
-@@ -25,7 +25,7 @@
-
- // the following boost libraries have been included in TR1 and are
- // thus deemed usable:
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
- #include <boost/shared_ptr.hpp>
-diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp
---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200
-+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200
-@@ -53,7 +53,7 @@
- fs::wpath components = pathname.string();
- fs::wpath::iterator it = components.begin();
- std::advance(it, 2);
-- std::wstring dirname = *it;
-+ std::wstring dirname = it->wstring();
-
- CScriptValRooted ai;
- self->m_ScriptInterface.Eval("({})", ai);
Deleted: community-x86_64/miniupnpc-1.9.patch
===================================================================
--- community-x86_64/miniupnpc-1.9.patch 2014-05-14 18:11:13 UTC (rev 111145)
+++ community-x86_64/miniupnpc-1.9.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -1,12 +0,0 @@
-diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp
---- a/source/network/NetServer.cpp 2013-12-18 16:08:56.000000000 +0000
-+++ b/source/network/NetServer.cpp 2014-02-18 10:11:59.955214338 +0000
-@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*)
- // Check that the port was actually forwarded.
- ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
- data.first.servicetype,
-- psPort, protocall,
-+ psPort, protocall, externalIPAddress,
- intClient, intPort, NULL/*desc*/,
- NULL/*enabled*/, duration);
-
Copied: 0ad/repos/community-x86_64/miniupnpc-1.9.patch (from rev 111145, 0ad/trunk/miniupnpc-1.9.patch)
===================================================================
--- community-x86_64/miniupnpc-1.9.patch (rev 0)
+++ community-x86_64/miniupnpc-1.9.patch 2014-05-14 18:11:18 UTC (rev 111146)
@@ -0,0 +1,12 @@
+diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp
+--- a/source/network/NetServer.cpp 2013-12-18 16:08:56.000000000 +0000
++++ b/source/network/NetServer.cpp 2014-02-18 10:11:59.955214338 +0000
+@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*)
+ // Check that the port was actually forwarded.
+ ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
+ data.first.servicetype,
+- psPort, protocall,
++ psPort, protocall, externalIPAddress,
+ intClient, intPort, NULL/*desc*/,
+ NULL/*enabled*/, duration);
+
More information about the arch-commits
mailing list