summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorspider-mario2020-10-25 12:14:44 +0100
committerspider-mario2020-10-25 12:14:44 +0100
commitf8c70a9f807ff4f7d4d26246880f654e84c6ea34 (patch)
treedc48886ce599966981dd7888a07b8a7404b5791e
parent03df81c221a759be58691b0e2fb0331598bb820f (diff)
downloadaur-f8c70a9f807ff4f7d4d26246880f654e84c6ea34.tar.gz
1.21
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--fix-build.patch37
3 files changed, 8 insertions, 52 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56504b5af64..85103ee636d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sdlpop
pkgdesc = An open-source port of Prince of Persia
- pkgver = 1.20
+ pkgver = 1.21
pkgrel = 1
url = https://github.com/NagyD/SDLPoP
arch = i686
@@ -8,12 +8,10 @@ pkgbase = sdlpop
license = GPL3
depends = sdl2_image
depends = sdl2_mixer
- source = sdlpop-1.20.tar.gz::https://github.com/NagyD/SDLPoP/archive/v1.20.tar.gz
+ source = sdlpop-1.21.tar.gz::https://github.com/NagyD/SDLPoP/archive/v1.21.tar.gz
source = sdlpop.sh
- source = fix-build.patch
- b2sums = 4ebc83cf0b174db342ff5706ac08290be86d10e8e5a7dbcadbcf9eafede9d98f36baa03da400967c25cafda9df15483da3503cd6a75d4dc3b3b469ae43f8b0b0
+ b2sums = 9c2e827ccbd79369aa0d40c518b348da4d29eb81353b00f70866d6b4f11c6f643687613fec0e9d3212265f00df19dd7282903a52628ed6cf9b639302ab9a51ff
b2sums = eecce7df11ff08547fb79f3fdcfffaddb84c2c112f200f12d2bb748c0ac498bcb5e0ab42ecaff1420eca883d7d83e58a0c0ce54abcaceb645ca914c06e2bed10
- b2sums = ba657632ecb0667b8e706cad6d970dff85f3f81fccd36417d7363c94c3c1c99f30fa0b34c8f31976fdfb8eb660fa751aca2736ffa68293eca36f1bf4db3f3fb6
pkgname = sdlpop
diff --git a/PKGBUILD b/PKGBUILD
index bb4193a1e52..540b3527c9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: spider-mario <spidermario@free.fr>
pkgname=sdlpop
-pkgver=1.20
+pkgver=1.21
pkgrel=1
pkgdesc="An open-source port of Prince of Persia"
arch=('i686' 'x86_64')
@@ -9,17 +9,12 @@ license=('GPL3')
url="https://github.com/NagyD/SDLPoP"
depends=('sdl2_image' 'sdl2_mixer')
source=("sdlpop-$pkgver.tar.gz::https://github.com/NagyD/SDLPoP/archive/v$pkgver.tar.gz"
- "sdlpop.sh"
- "fix-build.patch")
-b2sums=('4ebc83cf0b174db342ff5706ac08290be86d10e8e5a7dbcadbcf9eafede9d98f36baa03da400967c25cafda9df15483da3503cd6a75d4dc3b3b469ae43f8b0b0'
- 'eecce7df11ff08547fb79f3fdcfffaddb84c2c112f200f12d2bb748c0ac498bcb5e0ab42ecaff1420eca883d7d83e58a0c0ce54abcaceb645ca914c06e2bed10'
- 'ba657632ecb0667b8e706cad6d970dff85f3f81fccd36417d7363c94c3c1c99f30fa0b34c8f31976fdfb8eb660fa751aca2736ffa68293eca36f1bf4db3f3fb6')
+ "sdlpop.sh")
+b2sums=('9c2e827ccbd79369aa0d40c518b348da4d29eb81353b00f70866d6b4f11c6f643687613fec0e9d3212265f00df19dd7282903a52628ed6cf9b639302ab9a51ff'
+ 'eecce7df11ff08547fb79f3fdcfffaddb84c2c112f200f12d2bb748c0ac498bcb5e0ab42ecaff1420eca883d7d83e58a0c0ce54abcaceb645ca914c06e2bed10')
prepare() {
- cd SDLPoP-$pkgver
- patch -p1 < ../fix-build.patch
-
- cd src
+ cd SDLPoP-$pkgver/src
sed -e 's|$ROOT|/opt/sdlpop|' SDLPoP.desktop.template > SDLPoP.desktop
}
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index 9385ddd1138..00000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/menu.c b/src/menu.c
-index 9355d01..9ebc1eb 100644
---- a/src/menu.c
-+++ b/src/menu.c
-@@ -117,7 +117,6 @@ int active_settings_subsection = 0;
- int highlighted_settings_subsection = 0;
- int scroll_position = 0;
- int menu_control_y;
--int menu_control_scroll_y;
- int menu_control_x;
- int menu_control_back;
-
-diff --git a/src/seg001.c b/src/seg001.c
-index 33dca45..c07214b 100644
---- a/src/seg001.c
-+++ b/src/seg001.c
-@@ -47,8 +47,6 @@ SDL_COMPILE_TIME_ASSERT(hof_size, sizeof(hof_type) == 29);
- #pragma pack(pop)
-
- #define MAX_HOF_COUNT 6
--// data:405E
--short hof_count;
- // data:589A
- hof_type hof[MAX_HOF_COUNT];
-
-diff --git a/src/seg009.c b/src/seg009.c
-index 7d4a9e6..8961445 100644
---- a/src/seg009.c
-+++ b/src/seg009.c
-@@ -1943,7 +1943,6 @@ void init_digi() {
-
- const int sound_channel = 0;
- const int max_sound_id = 58;
--char** sound_names = NULL;
-
- void load_sound_names() {
- const char* names_path = locate_file("data/music/names.txt");