[arch-commits] Commit in minetest/repos (10 files)
Balló György
bgyorgy at nymeria.archlinux.org
Sun Jan 19 17:35:53 UTC 2014
Date: Sunday, January 19, 2014 @ 18:35:53
Author: bgyorgy
Revision: 104382
archrelease: copy trunk to community-i686, community-x86_64
Added:
minetest/repos/community-i686/PKGBUILD
(from rev 104381, minetest/trunk/PKGBUILD)
minetest/repos/community-i686/minetest.install
(from rev 104381, minetest/trunk/minetest.install)
minetest/repos/community-i686/optional-opengles.patch
(from rev 104381, minetest/trunk/optional-opengles.patch)
minetest/repos/community-x86_64/PKGBUILD
(from rev 104381, minetest/trunk/PKGBUILD)
minetest/repos/community-x86_64/minetest.install
(from rev 104381, minetest/trunk/minetest.install)
minetest/repos/community-x86_64/optional-opengles.patch
(from rev 104381, minetest/trunk/optional-opengles.patch)
Deleted:
minetest/repos/community-i686/PKGBUILD
minetest/repos/community-i686/minetest.install
minetest/repos/community-x86_64/PKGBUILD
minetest/repos/community-x86_64/minetest.install
------------------------------------------+
/PKGBUILD | 90 +++++++++++++++++++++++++++++
/minetest.install | 34 ++++++++++
community-i686/PKGBUILD | 36 -----------
community-i686/minetest.install | 17 -----
community-i686/optional-opengles.patch | 30 +++++++++
community-x86_64/PKGBUILD | 36 -----------
community-x86_64/minetest.install | 17 -----
community-x86_64/optional-opengles.patch | 30 +++++++++
8 files changed, 184 insertions(+), 106 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-01-19 17:35:44 UTC (rev 104381)
+++ community-i686/PKGBUILD 2014-01-19 17:35:53 UTC (rev 104382)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Konsta Kokkinen <kray at tsundere.fi>
-
-pkgname=minetest
-pkgver=0.4.9
-pkgrel=1
-pkgdesc='An Infiniminer/Minecraft inspired game'
-arch=('i686' 'x86_64')
-url='http://minetest.net/'
-license=('GPL')
-depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'mesa' 'hicolor-icon-theme')
-makedepends=('cmake')
-install=minetest.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
- ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-md5sums=('2a2629befa86ef72924bcc0e489730c7'
- '097666443a71988cf2d41ebd9be31ec9')
-
-build() {
- cd "$srcdir"/minetest-minetest-*
-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir"/minetest-minetest-*
-
- make DESTDIR="$pkgdir" install
-
- mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
-
- # small cleanup
- rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
-}
Copied: minetest/repos/community-i686/PKGBUILD (from rev 104381, minetest/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-01-19 17:35:53 UTC (rev 104382)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Konsta Kokkinen <kray at tsundere.fi>
+
+pkgname=minetest
+pkgver=0.4.9
+pkgrel=2
+pkgdesc='An Infiniminer/Minecraft inspired game'
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('GPL')
+depends=('sqlite' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
+makedepends=('cmake')
+install=minetest.install
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
+ ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
+ optional-opengles.patch)
+md5sums=('2a2629befa86ef72924bcc0e489730c7'
+ '097666443a71988cf2d41ebd9be31ec9'
+ '116de5a70e13dbd0e2419fc7fb59ee3b')
+
+prepare() {
+ cd "$srcdir"/minetest-minetest-*
+
+ # Fix rendering with NVIDIA driver (FS#37918)
+ patch -Np1 -i "$srcdir"/optional-opengles.patch
+}
+
+build() {
+ cd "$srcdir"/minetest-minetest-*
+
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "$srcdir"/minetest-minetest-*
+
+ make DESTDIR="$pkgdir" install
+
+ mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
+
+ # small cleanup
+ rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
+}
Deleted: community-i686/minetest.install
===================================================================
--- community-i686/minetest.install 2014-01-19 17:35:44 UTC (rev 104381)
+++ community-i686/minetest.install 2014-01-19 17:35:53 UTC (rev 104382)
@@ -1,17 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
- update-desktop-database > /dev/null 2>&1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- update-desktop-database > /dev/null 2>&1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
- update-desktop-database > /dev/null 2>&1
-}
Copied: minetest/repos/community-i686/minetest.install (from rev 104381, minetest/trunk/minetest.install)
===================================================================
--- community-i686/minetest.install (rev 0)
+++ community-i686/minetest.install 2014-01-19 17:35:53 UTC (rev 104382)
@@ -0,0 +1,17 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+ update-desktop-database > /dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ update-desktop-database > /dev/null 2>&1
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+ update-desktop-database > /dev/null 2>&1
+}
Copied: minetest/repos/community-i686/optional-opengles.patch (from rev 104381, minetest/trunk/optional-opengles.patch)
===================================================================
--- community-i686/optional-opengles.patch (rev 0)
+++ community-i686/optional-opengles.patch 2014-01-19 17:35:53 UTC (rev 104382)
@@ -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-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-01-19 17:35:44 UTC (rev 104381)
+++ community-x86_64/PKGBUILD 2014-01-19 17:35:53 UTC (rev 104382)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Konsta Kokkinen <kray at tsundere.fi>
-
-pkgname=minetest
-pkgver=0.4.9
-pkgrel=1
-pkgdesc='An Infiniminer/Minecraft inspired game'
-arch=('i686' 'x86_64')
-url='http://minetest.net/'
-license=('GPL')
-depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'mesa' 'hicolor-icon-theme')
-makedepends=('cmake')
-install=minetest.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
- ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-md5sums=('2a2629befa86ef72924bcc0e489730c7'
- '097666443a71988cf2d41ebd9be31ec9')
-
-build() {
- cd "$srcdir"/minetest-minetest-*
-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir"/minetest-minetest-*
-
- make DESTDIR="$pkgdir" install
-
- mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
-
- # small cleanup
- rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
-}
Copied: minetest/repos/community-x86_64/PKGBUILD (from rev 104381, minetest/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-01-19 17:35:53 UTC (rev 104382)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Konsta Kokkinen <kray at tsundere.fi>
+
+pkgname=minetest
+pkgver=0.4.9
+pkgrel=2
+pkgdesc='An Infiniminer/Minecraft inspired game'
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('GPL')
+depends=('sqlite' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
+makedepends=('cmake')
+install=minetest.install
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
+ ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
+ optional-opengles.patch)
+md5sums=('2a2629befa86ef72924bcc0e489730c7'
+ '097666443a71988cf2d41ebd9be31ec9'
+ '116de5a70e13dbd0e2419fc7fb59ee3b')
+
+prepare() {
+ cd "$srcdir"/minetest-minetest-*
+
+ # Fix rendering with NVIDIA driver (FS#37918)
+ patch -Np1 -i "$srcdir"/optional-opengles.patch
+}
+
+build() {
+ cd "$srcdir"/minetest-minetest-*
+
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "$srcdir"/minetest-minetest-*
+
+ make DESTDIR="$pkgdir" install
+
+ mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
+
+ # small cleanup
+ rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
+}
Deleted: community-x86_64/minetest.install
===================================================================
--- community-x86_64/minetest.install 2014-01-19 17:35:44 UTC (rev 104381)
+++ community-x86_64/minetest.install 2014-01-19 17:35:53 UTC (rev 104382)
@@ -1,17 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
- update-desktop-database > /dev/null 2>&1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- update-desktop-database > /dev/null 2>&1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
- update-desktop-database > /dev/null 2>&1
-}
Copied: minetest/repos/community-x86_64/minetest.install (from rev 104381, minetest/trunk/minetest.install)
===================================================================
--- community-x86_64/minetest.install (rev 0)
+++ community-x86_64/minetest.install 2014-01-19 17:35:53 UTC (rev 104382)
@@ -0,0 +1,17 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+ update-desktop-database > /dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ update-desktop-database > /dev/null 2>&1
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+ update-desktop-database > /dev/null 2>&1
+}
Copied: minetest/repos/community-x86_64/optional-opengles.patch (from rev 104381, minetest/trunk/optional-opengles.patch)
===================================================================
--- community-x86_64/optional-opengles.patch (rev 0)
+++ community-x86_64/optional-opengles.patch 2014-01-19 17:35:53 UTC (rev 104382)
@@ -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