diff options
| author | Mattias Johansson | 2015-07-16 09:39:21 +0200 |
|---|---|---|
| committer | Mattias Johansson | 2015-07-16 09:39:21 +0200 |
| commit | b7df32e5aff847b17d635002d28128e27269b77c (patch) | |
| tree | 357959b8c31e7f65f729edf13e9288533e938e7e | |
| parent | df29ddd0efb8411aed78095aba3ba3c87f68684e (diff) | |
| download | aur-b7df32e5aff847b17d635002d28128e27269b77c.tar.gz | |
Add patch to replace glfw with glfw2 and update PKGBUILD
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 36 | ||||
| -rw-r--r-- | glfw2.patch | 11 |
3 files changed, 36 insertions, 23 deletions
@@ -1,19 +1,23 @@ pkgbase = dark-oberon pkgdesc = An open source real-time strategy game similar to Warcraft II pkgver = 1.0.2rc2 - pkgrel = 2 + pkgrel = 3 url = http://dark-oberon.sourceforge.net/ arch = i686 arch = x86_64 license = GPL2 license = CCPL - depends = glfw + depends = glfw2 depends = mesa depends = sdl_mixer + source = dark-oberon.tar.gz::http://dark-oberon.cvs.sourceforge.net/viewvc/dark-oberon/dark-oberon/?view=tar + source = glfw2.patch source = dark-oberon.png source = dark-oberon.desktop - md5sums = c5943968757bcfe5a15d532fc2e61caa - md5sums = 073062bada4cde2cb1f0ba67dcc16955 + sha256sums = 97c8546dbdbe14e243fd2cbe09b9d6bb3b1f1211f19262037e60093384f0b98d + sha256sums = aec94dc857f1226a4417808a930e55743390755b8e3328399a49ac2fbe1c1832 + sha256sums = da7706793697e1fe7f762334bb74d8c947a3afb18528e842edb42adbcf8324cf + sha256sums = 8ba3bc1334a7751486ddc9ede4c7ad98801b1a62ddb41a76e4c3c953dc443ea2 pkgname = dark-oberon @@ -3,37 +3,35 @@ pkgname=dark-oberon pkgver=1.0.2rc2 -pkgrel=2 +pkgrel=3 pkgdesc="An open source real-time strategy game similar to Warcraft II" arch=('i686' 'x86_64') -url="http://dark-oberon.sourceforge.net/" +url='http://dark-oberon.sourceforge.net/' license=('GPL2' 'CCPL') -depends=('glfw' 'mesa' 'sdl_mixer') -source=("${pkgname}.png" +depends=('glfw2' 'mesa' 'sdl_mixer') +source=("${pkgname}.tar.gz::http://${pkgname}.cvs.sourceforge.net/viewvc/${pkgname}/${pkgname}/?view=tar" + 'glfw2.patch' + "${pkgname}.png" "${pkgname}.desktop") -md5sums=('c5943968757bcfe5a15d532fc2e61caa' - '073062bada4cde2cb1f0ba67dcc16955') +sha256sums=('SKIP' + 'aec94dc857f1226a4417808a930e55743390755b8e3328399a49ac2fbe1c1832' + 'da7706793697e1fe7f762334bb74d8c947a3afb18528e842edb42adbcf8324cf' + '8ba3bc1334a7751486ddc9ede4c7ad98801b1a62ddb41a76e4c3c953dc443ea2') build() { - cd "${srcdir}" - - _cvstar="http://dark-oberon.cvs.sourceforge.net/viewvc/dark-oberon/dark-oberon/?view=tar" - - # Download source code from CVS (it always has a different md5 sum) - if [[ ! -f ${pkgname}.tar.gz ]]; then - curl ${_cvstar} -o ${pkgname}.tar.gz - fi - - rm -rf ${pkgname} - bsdtar -xf ${pkgname}.tar.gz - cd ${pkgname}/src + cd "${srcdir}/${pkgname}/src" # Fix path to data files sed -i "s#DATA_DIR=''#DATA_DIR='/usr/share/${pkgname}/'#" create_makefile.sh - # Compile + # Create Makefiles chmod a+x create_makefile.sh ./create_makefile.sh + + # Use glfw2 instead of glfw + patch -Np1 -i ${srcdir}/glfw2.patch + + # Compile make } diff --git a/glfw2.patch b/glfw2.patch new file mode 100644 index 000000000000..b320ee800493 --- /dev/null +++ b/glfw2.patch @@ -0,0 +1,11 @@ +--- ./Makefile.org 2015-07-13 18:07:48.105171224 +0200 ++++ ./Makefile 2015-07-13 18:07:56.514876228 +0200 +@@ -6,7 +6,7 @@ CPPFLAGS = -g -Wall -O -D_GNU_SOURCE=1 - + DEFINES = -DDATA_DIR='"/usr/share/dark-oberon/"' -DUNIX=1 -DSOUND=$(SOUND) -DDEBUG=$(DEBUG) + INCLUDES = -I/usr/include -I/usr/include/SDL -I../libs + LIBPATHS = -L/usr/lib -L/usr/local/lib -L../libs +-LIBRARIES = -lpthread -lglfw -lGL -lX11 -lGLU -lXrandr -lSDL -lSDL_mixer ++LIBRARIES = -lpthread -lglfw2 -lGL -lX11 -lGLU -lXrandr -lSDL -lSDL_mixer + OBJECTS = doalloc.o doberon.o dobuildings.o doconfig.o dodata.o dodraw.o doengine.o doevents.o dofactories.o dofight.o dofile.o dofollower.o doforces.o dohost.o doipc.o dolayout.o doleader.o dologs.o domap.o domapunits.o domouse.o donet.o doplayers.o doraces.o doschemes.o doselection.o dosimpletypes.o dosound.o dosources.o dounits.o dowalk.o doworkers.o glfont.o glgui.o tga.o utils.o + TARGETS = ../dark-oberon + |