diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-08-14 02:28:15 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-08-14 02:28:15 -0300 |
| commit | 62e6bdfc5ff705d92cb0211131d7c20cca4d9a47 (patch) | |
| tree | 4967fd4cc5eacab24e4cf4d6efa1fec8a6de4010 /pcr/sfml-git | |
| parent | 936d56a07c385cfaab208d5a9ec7fd455d0a7cc9 (diff) | |
| parent | 27996ae3144b7cfec2767b548d96de644dc4d86f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/sfml-git')
| -rw-r--r-- | pcr/sfml-git/PKGBUILD | 14 | ||||
| -rw-r--r-- | pcr/sfml-git/arial.patch | 10 |
2 files changed, 5 insertions, 19 deletions
diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD index be243d639..94f89f7e7 100644 --- a/pcr/sfml-git/PKGBUILD +++ b/pcr/sfml-git/PKGBUILD @@ -3,20 +3,18 @@ pkgname=sfml-git pkgver=20120805 -pkgrel=1 +pkgrel=4 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') makedepends=('git' 'mesa' 'cmake' 'doxygen') -conflicts=('sfml') -provides=('sfml') +conflicts=('sfml' 'sfml-git') source=("arial.patch") _gitroot='https://github.com/LaurentGomila/SFML.git' _gitname='SFML' -_gitchangeset='191730ac0d639cfdef8fae560cdbc7d7e8c67db1' build() { cd "$srcdir" @@ -34,12 +32,10 @@ build() { msg "Starting make..." rm -rf "$srcdir/$_gitname-build" - cd "$srcdir" - git checkout $_gitchangeset >& /dev/null #Applying the patch - cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/" - cd "$srcdir/$_gitname/src/$_gitname/" - patch -p3 -i arial.patch + # cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/" + # cd "$srcdir/$_gitname/src/$_gitname/" + # patch -p3 -i arial.patch cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" cd "$srcdir/$_gitname-build" diff --git a/pcr/sfml-git/arial.patch b/pcr/sfml-git/arial.patch deleted file mode 100644 index a9225065b..000000000 --- a/pcr/sfml-git/arial.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- SFML-a/src/SFML/Graphics/CMakeLists.txt 2012-08-03 19:41:49.885910580 -0600 -+++ SFML-b/src/SFML/Graphics/CMakeLists.txt 2012-08-03 19:42:53.578898858 -0600 -@@ -4,7 +4,6 @@ -
- # all source files
- set(SRC
-- ${SRCROOT}/Arial.hpp
- ${INCROOT}/BlendMode.hpp
- ${SRCROOT}/Color.cpp
- ${INCROOT}/Color.hpp
|