[arch-commits] Commit in warzone2100/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Tue Aug 19 08:57:08 UTC 2014
Date: Tuesday, August 19, 2014 @ 10:57:07
Author: bpiotrowski
Revision: 117609
archrelease: copy trunk to community-i686, community-x86_64
Added:
warzone2100/repos/community-i686/PKGBUILD
(from rev 117608, warzone2100/trunk/PKGBUILD)
warzone2100/repos/community-i686/buildfix.patch
(from rev 117608, warzone2100/trunk/buildfix.patch)
warzone2100/repos/community-x86_64/PKGBUILD
(from rev 117608, warzone2100/trunk/PKGBUILD)
warzone2100/repos/community-x86_64/buildfix.patch
(from rev 117608, warzone2100/trunk/buildfix.patch)
Deleted:
warzone2100/repos/community-i686/PKGBUILD
warzone2100/repos/community-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 72 ++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 29 ---------------
community-i686/buildfix.patch | 13 ++++++
community-x86_64/PKGBUILD | 29 ---------------
community-x86_64/buildfix.patch | 13 ++++++
5 files changed, 98 insertions(+), 58 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-19 08:56:59 UTC (rev 117608)
+++ community-i686/PKGBUILD 2014-08-19 08:57:07 UTC (rev 117609)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
-
-pkgname=warzone2100
-pkgver=3.1.1
-pkgrel=1
-pkgdesc="3D realtime strategy game on a future Earth"
-url="http://wz2100.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
-makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
-source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('0b81a0012098a1310f5351a3ace2021b')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --with-distributor="Archlinux"
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
Copied: warzone2100/repos/community-i686/PKGBUILD (from rev 117608, warzone2100/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-19 08:57:07 UTC (rev 117609)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
+
+pkgname=warzone2100
+pkgver=3.1.1
+pkgrel=2
+pkgdesc="3D realtime strategy game on a future Earth"
+url="http://wz2100.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
+makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
+source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ 'buildfix.patch')
+md5sums=('0b81a0012098a1310f5351a3ace2021b'
+ '7503052fc52d1cea0bae275db33544e6')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../buildfix.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --with-distributor="Archlinux"
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+}
Copied: warzone2100/repos/community-i686/buildfix.patch (from rev 117608, warzone2100/trunk/buildfix.patch)
===================================================================
--- community-i686/buildfix.patch (rev 0)
+++ community-i686/buildfix.patch 2014-08-19 08:57:07 UTC (rev 117609)
@@ -0,0 +1,13 @@
+diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp
+index d240a63..861265d 100644
+--- a/lib/ivis_opengl/screen.cpp
++++ b/lib/ivis_opengl/screen.cpp
+@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions()
+ __glewUseProgram = __glewUseProgramObjectARB;
+ __glewGetShaderiv = __glewGetObjectParameterivARB;
+ __glewLinkProgram = __glewLinkProgramARB;
+- __glewShaderSource = __glewShaderSourceARB;
++ __glewShaderSource = (PFNGLSHADERSOURCEPROC) __glewShaderSourceARB;
+ __glewUniform1f = __glewUniform1fARB;
+ __glewUniform1i = __glewUniform1iARB;
+ __glewUniform4fv = __glewUniform4fvARB;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-19 08:56:59 UTC (rev 117608)
+++ community-x86_64/PKGBUILD 2014-08-19 08:57:07 UTC (rev 117609)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
-
-pkgname=warzone2100
-pkgver=3.1.1
-pkgrel=1
-pkgdesc="3D realtime strategy game on a future Earth"
-url="http://wz2100.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
-makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
-source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('0b81a0012098a1310f5351a3ace2021b')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --with-distributor="Archlinux"
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
Copied: warzone2100/repos/community-x86_64/PKGBUILD (from rev 117608, warzone2100/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-19 08:57:07 UTC (rev 117609)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
+
+pkgname=warzone2100
+pkgver=3.1.1
+pkgrel=2
+pkgdesc="3D realtime strategy game on a future Earth"
+url="http://wz2100.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
+makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
+source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ 'buildfix.patch')
+md5sums=('0b81a0012098a1310f5351a3ace2021b'
+ '7503052fc52d1cea0bae275db33544e6')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../buildfix.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --with-distributor="Archlinux"
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+}
Copied: warzone2100/repos/community-x86_64/buildfix.patch (from rev 117608, warzone2100/trunk/buildfix.patch)
===================================================================
--- community-x86_64/buildfix.patch (rev 0)
+++ community-x86_64/buildfix.patch 2014-08-19 08:57:07 UTC (rev 117609)
@@ -0,0 +1,13 @@
+diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp
+index d240a63..861265d 100644
+--- a/lib/ivis_opengl/screen.cpp
++++ b/lib/ivis_opengl/screen.cpp
+@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions()
+ __glewUseProgram = __glewUseProgramObjectARB;
+ __glewGetShaderiv = __glewGetObjectParameterivARB;
+ __glewLinkProgram = __glewLinkProgramARB;
+- __glewShaderSource = __glewShaderSourceARB;
++ __glewShaderSource = (PFNGLSHADERSOURCEPROC) __glewShaderSourceARB;
+ __glewUniform1f = __glewUniform1fARB;
+ __glewUniform1i = __glewUniform1iARB;
+ __glewUniform4fv = __glewUniform4fvARB;
More information about the arch-commits
mailing list