diff options
| author | Mike Swanson | 2016-12-27 06:54:53 -0800 |
|---|---|---|
| committer | Mike Swanson | 2016-12-27 06:54:53 -0800 |
| commit | 9bbddfc6fbff0267e41876554b532a9cb4df8078 (patch) | |
| tree | 06c8ec7a7ce8ef628cd260ea375dc66faecce8fd | |
| parent | a9a99453f3305536a5398f158090408ac31e00f4 (diff) | |
| download | aur-9bbddfc6fbff0267e41876554b532a9cb4df8078.tar.gz | |
Update to 3.5
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | 0001-setup.desktop.patch | 15 | ||||
| -rw-r--r-- | 0002-do-not-install-non-binary-files-for-non-Doom-games.patch | 148 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
4 files changed, 11 insertions, 181 deletions
@@ -1,27 +1,24 @@ # Generated by mksrcinfo v8 -# mer Jun 15 04:48:39 UTC 2016 +# Tue Dec 27 14:53:36 UTC 2016 pkgbase = crispy-doom pkgdesc = Vanilla-compatible enhanced Doom engine - pkgver = 3.4 - pkgrel = 2 + pkgver = 3.5 + pkgrel = 1 url = http://fabiangreffrath.github.io/crispy-doom install = crispy-doom.install arch = i686 arch = x86_64 license = GPL2 makedepends = python + depends = libpng depends = libsamplerate depends = sdl_mixer depends = sdl_net optdepends = freedm: Free deathmatch game optdepends = freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods) optdepends = freedoom2: Free Doom II/Final Doom-compatible game (not vanilla compatible, but useful for mods) - source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-3.4.tar.gz - source = 0001-setup.desktop.patch - source = 0002-do-not-install-non-binary-files-for-non-Doom-games.patch - sha256sums = 06b815c6e5cd5630682ca8797f2c1521f8aac5ba7c5677a04c5f3b27399e37ef - sha256sums = af9ea0b75e5be2f91e62adb1ee6626f9fda7c1a4ace200f626f008a86cd9b043 - sha256sums = 22ab3e9f3de4ee8001d873dd81813133352309f0304f1e7a272e2ff350903962 + source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-3.5.tar.gz + sha256sums = bbb257977b2c141591f12a1c335c861f81f012a8b5b5ac195159d19d532c73e3 pkgname = crispy-doom diff --git a/0001-setup.desktop.patch b/0001-setup.desktop.patch deleted file mode 100644 index 25d7fa6863b4..000000000000 --- a/0001-setup.desktop.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/setup/setup.desktop.in b/src/setup/setup.desktop.in -index 2a5e71f..62bbd72 100644 ---- a/src/setup/setup.desktop.in -+++ b/src/setup/setup.desktop.in -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=@PACKAGE_SHORTNAME@ Setup --Exec=@PROGRAM_PREFIX@setup -+Exec=@PROGRAM_PREFIX@doom-setup - Icon=@PROGRAM_PREFIX@setup - Type=Application - Comment=Setup tool for @PACKAGE_SHORTNAME@ - Categories=Settings; --Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla; -+Keywords=first;person;shooter;doom;vanilla; diff --git a/0002-do-not-install-non-binary-files-for-non-Doom-games.patch b/0002-do-not-install-non-binary-files-for-non-Doom-games.patch deleted file mode 100644 index 90bdae4e08eb..000000000000 --- a/0002-do-not-install-non-binary-files-for-non-Doom-games.patch +++ /dev/null @@ -1,148 +0,0 @@ -From e56e1732d1b8bcd0f0ceb108cb28de12b3e0a648 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath <fabian@greffrath.com> -Date: Mon, 13 Jun 2016 21:07:38 +0200 -Subject: [PATCH] do not install non-binary files for non-Doom games - -Fixes #111, thanks @chungy ---- - Makefile.am | 12 ++++++------ - man/Makefile.am | 34 +++++++++++++++++----------------- - man/bash-completion/Makefile.am | 8 ++++---- - src/Makefile.am | 16 ++++++++-------- - 4 files changed, 35 insertions(+), 35 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 74ee60c..33f457a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -59,14 +59,14 @@ EXTRA_DIST= \ - doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom - doomdocs_DATA = $(DOC_FILES) NOT-BUGS.md - --hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic --hereticdocs_DATA = $(DOC_FILES) -+#hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic -+#hereticdocs_DATA = $(DOC_FILES) - --hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen --hexendocs_DATA = $(DOC_FILES) -+#hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen -+#hexendocs_DATA = $(DOC_FILES) - --strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife --strifedocs_DATA = $(DOC_FILES) README.Strife.md -+#strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife -+#strifedocs_DATA = $(DOC_FILES) README.Strife.md - - MAINTAINERCLEANFILES = $(AUX_DIST_GEN) - -diff --git a/man/Makefile.am b/man/Makefile.am -index b92cf97..4739b82 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -20,22 +20,22 @@ if HAVE_PYTHON - GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@doom.6 \ - default.cfg.5 \ -- @PROGRAM_PREFIX@doom.cfg.5 \ -- @PROGRAM_PREFIX@heretic.6 \ -- heretic.cfg.5 \ -- @PROGRAM_PREFIX@heretic.cfg.5 \ -- @PROGRAM_PREFIX@hexen.6 \ -- hexen.cfg.5 \ -- @PROGRAM_PREFIX@hexen.cfg.5 \ -- @PROGRAM_PREFIX@strife.6 \ -- strife.cfg.5 \ -- @PROGRAM_PREFIX@strife.cfg.5 -+ @PROGRAM_PREFIX@doom.cfg.5 -+# @PROGRAM_PREFIX@heretic.6 \ -+# heretic.cfg.5 \ -+# @PROGRAM_PREFIX@heretic.cfg.5 \ -+# @PROGRAM_PREFIX@hexen.6 \ -+# hexen.cfg.5 \ -+# @PROGRAM_PREFIX@hexen.cfg.5 \ -+# @PROGRAM_PREFIX@strife.6 \ -+# strife.cfg.5 \ -+# @PROGRAM_PREFIX@strife.cfg.5 - - SETUP_MAN_PAGES = \ -- @PROGRAM_PREFIX@doom-setup.6 \ -- @PROGRAM_PREFIX@heretic-setup.6 \ -- @PROGRAM_PREFIX@hexen-setup.6 \ -- @PROGRAM_PREFIX@strife-setup.6 -+ @PROGRAM_PREFIX@doom-setup.6 -+# @PROGRAM_PREFIX@heretic-setup.6 \ -+# @PROGRAM_PREFIX@hexen-setup.6 \ -+# @PROGRAM_PREFIX@strife-setup.6 - - man_MANS = chocolate-server.6 \ - chocolate-setup.6 \ -@@ -43,9 +43,9 @@ man_MANS = chocolate-server.6 \ - $(SETUP_MAN_PAGES) - - doomdocs_DATA = INSTALL.doom CMDLINE.doom --hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic --hexendocs_DATA = INSTALL.hexen CMDLINE.hexen --strifedocs_DATA = INSTALL.strife CMDLINE.strife -+#hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic -+#hexendocs_DATA = INSTALL.hexen CMDLINE.hexen -+#strifedocs_DATA = INSTALL.strife CMDLINE.strife - - CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \ - $(doomdocs_DATA) $(hereticdocs_DATA) \ -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 7001aff..9ccc9ea 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -9,10 +9,10 @@ BASH_COMPLETION_TEMPLATES = \ - if HAVE_PYTHON - - BASH_COMPLETION_SCRIPTLETS = \ -- @PROGRAM_PREFIX@doom \ -- @PROGRAM_PREFIX@heretic \ -- @PROGRAM_PREFIX@hexen \ -- @PROGRAM_PREFIX@strife -+ @PROGRAM_PREFIX@doom -+# @PROGRAM_PREFIX@heretic \ -+# @PROGRAM_PREFIX@hexen \ -+# @PROGRAM_PREFIX@strife - - bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS) - CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 7534fe1..59a8b3b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -221,10 +221,10 @@ EXTRA_DIST = \ - - appdatadir = $(prefix)/share/appdata - appdata_DATA = \ -- @PROGRAM_PREFIX@doom.appdata.xml \ -- @PROGRAM_PREFIX@heretic.appdata.xml \ -- @PROGRAM_PREFIX@hexen.appdata.xml \ -- @PROGRAM_PREFIX@strife.appdata.xml -+ @PROGRAM_PREFIX@doom.appdata.xml -+# @PROGRAM_PREFIX@heretic.appdata.xml \ -+# @PROGRAM_PREFIX@hexen.appdata.xml \ -+# @PROGRAM_PREFIX@strife.appdata.xml - - @PROGRAM_PREFIX@doom.appdata.xml : doom.appdata.xml - cp doom.appdata.xml $@ -@@ -240,10 +240,10 @@ appdata_DATA = \ - - appdir = $(prefix)/share/applications - app_DATA = \ -- @PROGRAM_PREFIX@doom.desktop \ -- @PROGRAM_PREFIX@heretic.desktop \ -- @PROGRAM_PREFIX@hexen.desktop \ -- @PROGRAM_PREFIX@strife.desktop -+ @PROGRAM_PREFIX@doom.desktop -+# @PROGRAM_PREFIX@heretic.desktop \ -+# @PROGRAM_PREFIX@hexen.desktop \ -+# @PROGRAM_PREFIX@strife.desktop - - @PROGRAM_PREFIX@doom.desktop : doom.desktop - cp doom.desktop $@ --- -2.8.3 - @@ -2,23 +2,19 @@ pkgname=crispy-doom pkgdesc="Vanilla-compatible enhanced Doom engine" -pkgver=3.4 -pkgrel=2 +pkgver=3.5 +pkgrel=1 arch=('i686' 'x86_64') url="http://fabiangreffrath.github.io/crispy-doom" license=('GPL2') -depends=('libsamplerate' 'sdl_mixer' 'sdl_net') +depends=('libpng' 'libsamplerate' 'sdl_mixer' 'sdl_net') makedepends=('python') optdepends=('freedm: Free deathmatch game' 'freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods)' 'freedoom2: Free Doom II/Final Doom-compatible game (not vanilla compatible, but useful for mods)') install=crispy-doom.install -source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz - 0001-setup.desktop.patch - 0002-do-not-install-non-binary-files-for-non-Doom-games.patch) -sha256sums=('06b815c6e5cd5630682ca8797f2c1521f8aac5ba7c5677a04c5f3b27399e37ef' - 'af9ea0b75e5be2f91e62adb1ee6626f9fda7c1a4ace200f626f008a86cd9b043' - '22ab3e9f3de4ee8001d873dd81813133352309f0304f1e7a272e2ff350903962') +source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz) +sha256sums=('bbb257977b2c141591f12a1c335c861f81f012a8b5b5ac195159d19d532c73e3') prepare() { # GitHub's generated archive prefix kind of sucks. |