[arch-commits] Commit in minetest/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Fri Aug 22 08:48:52 UTC 2014
Date: Friday, August 22, 2014 @ 10:48:52
Author: bpiotrowski
Revision: 117749
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
minetest/repos/community-testing-i686/
minetest/repos/community-testing-i686/PKGBUILD
(from rev 117748, minetest/trunk/PKGBUILD)
minetest/repos/community-testing-i686/minetest.install
(from rev 117748, minetest/trunk/minetest.install)
minetest/repos/community-testing-i686/optional-opengles.patch
(from rev 117748, minetest/trunk/optional-opengles.patch)
minetest/repos/community-testing-x86_64/PKGBUILD
(from rev 117748, minetest/trunk/PKGBUILD)
minetest/repos/community-testing-x86_64/minetest.install
(from rev 117748, minetest/trunk/minetest.install)
minetest/repos/community-testing-x86_64/optional-opengles.patch
(from rev 117748, minetest/trunk/optional-opengles.patch)
Deleted:
minetest/repos/community-testing-x86_64/PKGBUILD
minetest/repos/community-testing-x86_64/minetest.install
minetest/repos/community-testing-x86_64/optional-opengles.patch
--------------------------------------------------+
/PKGBUILD | 81 +++++++++++++++++++++
/minetest.install | 12 +++
/optional-opengles.patch | 30 +++++++
community-testing-i686/PKGBUILD | 81 +++++++++++++++++++++
community-testing-i686/minetest.install | 12 +++
community-testing-i686/optional-opengles.patch | 30 +++++++
community-testing-x86_64/PKGBUILD | 81 ---------------------
community-testing-x86_64/minetest.install | 12 ---
community-testing-x86_64/optional-opengles.patch | 30 -------
9 files changed, 246 insertions(+), 123 deletions(-)
Copied: minetest/repos/community-testing-i686/PKGBUILD (from rev 117748, minetest/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Konsta Kokkinen <kray at tsundere.fi>
+
+pkgname=('minetest' 'minetest-server' 'minetest-common')
+pkgver=0.4.10
+pkgrel=3
+pkgdesc='An Infiniminer/Minecraft inspired game'
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('GPL')
+makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
+ 'hicolor-icon-theme' 'luajit' 'cmake')
+source=(https://github.com/minetest/minetest/archive/$pkgver.tar.gz
+ data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz)
+md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
+ '398d83431c44fb85f02bd902b016338c')
+
+prepare() {
+ install -d build-{client,server}
+}
+
+build() {
+ cd "$srcdir"/build-client
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SERVER=0 \
+ -DENABLE_GETTEXT=1 \
+ -DENABLE_FREETYPE=1 \
+ -DENABLE_LEVELDB=0 \
+ -DENABLE_REDIS=0 \
+ -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+ -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+ make
+
+ cd "$srcdir"/build-server
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_CLIENT=0 \
+ -DENABLE_LEVELDB=1 \
+ -DENABLE_REDIS=1 \
+ -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+ -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+ make
+}
+
+package_minetest() {
+ pkgdesc='Multiplayer infinite-world block sandbox game'
+ depends=('minetest-common' 'irrlicht' 'curl' 'luajit' 'libvorbis' 'sqlite'
+ 'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
+ install=minetest.install
+
+ cd build-client
+ make DESTDIR="$pkgdir" install
+ cp -r locale "$pkgdir"/usr/share/
+
+ rm -rf "$pkgdir"/usr/share/minetest
+ rm "$pkgdir"/usr/share/man/man6/minetestserver.6
+}
+
+package_minetest-server() {
+ pkgdesc='Server of infinite-world block sandbox game'
+ depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
+
+ cd build-server
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/usr/share/{minetest,appdata,applications,icons,doc}
+ rm "$pkgdir"/usr/share/man/man6/minetest.6
+}
+
+package_minetest-common() {
+ pkgdesc='Common data files for minetest and minetest-server'
+
+ cd $pkgbase-$pkgver
+ install -d "$pkgdir"/usr/share/minetest
+
+ cp -r games builtin client fonts textures "$pkgdir"/usr/share/minetest/
+ cp -r "$srcdir"/minetest_game-$pkgver "$pkgdir"/usr/share/minetest/games/minetest
+ rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
+}
Copied: minetest/repos/community-testing-i686/minetest.install (from rev 117748, minetest/trunk/minetest.install)
===================================================================
--- community-testing-i686/minetest.install (rev 0)
+++ community-testing-i686/minetest.install 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: minetest/repos/community-testing-i686/optional-opengles.patch (from rev 117748, minetest/trunk/optional-opengles.patch)
===================================================================
--- community-testing-i686/optional-opengles.patch (rev 0)
+++ community-testing-i686/optional-opengles.patch 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,30 @@
+From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001
+From: Sfan5 <sfan5 at live.de>
+Date: Fri, 3 Jan 2014 10:17:01 +0100
+Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 90f5867..6418b3b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -170,7 +170,12 @@ endif()
+
+ find_package(Sqlite3 REQUIRED)
+ find_package(Json REQUIRED)
+-find_package(OpenGLES2)
++
++option(ENABLE_GLES "Enable OpenGL ES support" 0)
++mark_as_advanced(ENABLE_GLES)
++if(ENABLE_GLES)
++ find_package(OpenGLES2)
++endif(ENABLE_GLES)
+
+ if(USE_FREETYPE)
+ find_package(Freetype REQUIRED)
+--
+1.8.5.1
+
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2014-08-22 08:44:29 UTC (rev 117748)
+++ community-testing-x86_64/PKGBUILD 2014-08-22 08:48:52 UTC (rev 117749)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Konsta Kokkinen <kray at tsundere.fi>
-
-pkgname=('minetest' 'minetest-server' 'minetest-common')
-pkgver=0.4.10
-pkgrel=3
-pkgdesc='An Infiniminer/Minecraft inspired game'
-arch=('i686' 'x86_64')
-url='http://minetest.net/'
-license=('GPL')
-makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
- 'hicolor-icon-theme' 'luajit' 'cmake')
-source=(https://github.com/minetest/minetest/archive/$pkgver.tar.gz
- data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz)
-md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
- '398d83431c44fb85f02bd902b016338c')
-
-prepare() {
- install -d build-{client,server}
-}
-
-build() {
- cd "$srcdir"/build-client
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SERVER=0 \
- -DENABLE_GETTEXT=1 \
- -DENABLE_FREETYPE=1 \
- -DENABLE_LEVELDB=0 \
- -DENABLE_REDIS=0 \
- -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
- -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
- make
-
- cd "$srcdir"/build-server
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_CLIENT=0 \
- -DENABLE_LEVELDB=1 \
- -DENABLE_REDIS=1 \
- -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
- -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
- make
-}
-
-package_minetest() {
- pkgdesc='Multiplayer infinite-world block sandbox game'
- depends=('minetest-common' 'irrlicht' 'curl' 'luajit' 'libvorbis' 'sqlite'
- 'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
- install=minetest.install
-
- cd build-client
- make DESTDIR="$pkgdir" install
- cp -r locale "$pkgdir"/usr/share/
-
- rm -rf "$pkgdir"/usr/share/minetest
- rm "$pkgdir"/usr/share/man/man6/minetestserver.6
-}
-
-package_minetest-server() {
- pkgdesc='Server of infinite-world block sandbox game'
- depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
-
- cd build-server
- make DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/usr/share/{minetest,appdata,applications,icons,doc}
- rm "$pkgdir"/usr/share/man/man6/minetest.6
-}
-
-package_minetest-common() {
- pkgdesc='Common data files for minetest and minetest-server'
-
- cd $pkgbase-$pkgver
- install -d "$pkgdir"/usr/share/minetest
-
- cp -r games builtin client fonts textures "$pkgdir"/usr/share/minetest/
- cp -r "$srcdir"/minetest_game-$pkgver "$pkgdir"/usr/share/minetest/games/minetest
- rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
-}
Copied: minetest/repos/community-testing-x86_64/PKGBUILD (from rev 117748, minetest/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Konsta Kokkinen <kray at tsundere.fi>
+
+pkgname=('minetest' 'minetest-server' 'minetest-common')
+pkgver=0.4.10
+pkgrel=3
+pkgdesc='An Infiniminer/Minecraft inspired game'
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('GPL')
+makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
+ 'hicolor-icon-theme' 'luajit' 'cmake')
+source=(https://github.com/minetest/minetest/archive/$pkgver.tar.gz
+ data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz)
+md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
+ '398d83431c44fb85f02bd902b016338c')
+
+prepare() {
+ install -d build-{client,server}
+}
+
+build() {
+ cd "$srcdir"/build-client
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SERVER=0 \
+ -DENABLE_GETTEXT=1 \
+ -DENABLE_FREETYPE=1 \
+ -DENABLE_LEVELDB=0 \
+ -DENABLE_REDIS=0 \
+ -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+ -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+ make
+
+ cd "$srcdir"/build-server
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_CLIENT=0 \
+ -DENABLE_LEVELDB=1 \
+ -DENABLE_REDIS=1 \
+ -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+ -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+ make
+}
+
+package_minetest() {
+ pkgdesc='Multiplayer infinite-world block sandbox game'
+ depends=('minetest-common' 'irrlicht' 'curl' 'luajit' 'libvorbis' 'sqlite'
+ 'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
+ install=minetest.install
+
+ cd build-client
+ make DESTDIR="$pkgdir" install
+ cp -r locale "$pkgdir"/usr/share/
+
+ rm -rf "$pkgdir"/usr/share/minetest
+ rm "$pkgdir"/usr/share/man/man6/minetestserver.6
+}
+
+package_minetest-server() {
+ pkgdesc='Server of infinite-world block sandbox game'
+ depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
+
+ cd build-server
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/usr/share/{minetest,appdata,applications,icons,doc}
+ rm "$pkgdir"/usr/share/man/man6/minetest.6
+}
+
+package_minetest-common() {
+ pkgdesc='Common data files for minetest and minetest-server'
+
+ cd $pkgbase-$pkgver
+ install -d "$pkgdir"/usr/share/minetest
+
+ cp -r games builtin client fonts textures "$pkgdir"/usr/share/minetest/
+ cp -r "$srcdir"/minetest_game-$pkgver "$pkgdir"/usr/share/minetest/games/minetest
+ rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
+}
Deleted: community-testing-x86_64/minetest.install
===================================================================
--- community-testing-x86_64/minetest.install 2014-08-22 08:44:29 UTC (rev 117748)
+++ community-testing-x86_64/minetest.install 2014-08-22 08:48:52 UTC (rev 117749)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database &>/dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: minetest/repos/community-testing-x86_64/minetest.install (from rev 117748, minetest/trunk/minetest.install)
===================================================================
--- community-testing-x86_64/minetest.install (rev 0)
+++ community-testing-x86_64/minetest.install 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-testing-x86_64/optional-opengles.patch
===================================================================
--- community-testing-x86_64/optional-opengles.patch 2014-08-22 08:44:29 UTC (rev 117748)
+++ community-testing-x86_64/optional-opengles.patch 2014-08-22 08:48:52 UTC (rev 117749)
@@ -1,30 +0,0 @@
-From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001
-From: Sfan5 <sfan5 at live.de>
-Date: Fri, 3 Jan 2014 10:17:01 +0100
-Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051
-
----
- src/CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 90f5867..6418b3b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -170,7 +170,12 @@ endif()
-
- find_package(Sqlite3 REQUIRED)
- find_package(Json REQUIRED)
--find_package(OpenGLES2)
-+
-+option(ENABLE_GLES "Enable OpenGL ES support" 0)
-+mark_as_advanced(ENABLE_GLES)
-+if(ENABLE_GLES)
-+ find_package(OpenGLES2)
-+endif(ENABLE_GLES)
-
- if(USE_FREETYPE)
- find_package(Freetype REQUIRED)
---
-1.8.5.1
-
Copied: minetest/repos/community-testing-x86_64/optional-opengles.patch (from rev 117748, minetest/trunk/optional-opengles.patch)
===================================================================
--- community-testing-x86_64/optional-opengles.patch (rev 0)
+++ community-testing-x86_64/optional-opengles.patch 2014-08-22 08:48:52 UTC (rev 117749)
@@ -0,0 +1,30 @@
+From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001
+From: Sfan5 <sfan5 at live.de>
+Date: Fri, 3 Jan 2014 10:17:01 +0100
+Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 90f5867..6418b3b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -170,7 +170,12 @@ endif()
+
+ find_package(Sqlite3 REQUIRED)
+ find_package(Json REQUIRED)
+-find_package(OpenGLES2)
++
++option(ENABLE_GLES "Enable OpenGL ES support" 0)
++mark_as_advanced(ENABLE_GLES)
++if(ENABLE_GLES)
++ find_package(OpenGLES2)
++endif(ENABLE_GLES)
+
+ if(USE_FREETYPE)
+ find_package(Freetype REQUIRED)
+--
+1.8.5.1
+
More information about the arch-commits
mailing list