diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | fix-build.patch | 37 |
3 files changed, 50 insertions, 6 deletions
@@ -10,8 +10,10 @@ pkgbase = sdlpop depends = sdl2_mixer source = sdlpop-1.20.tar.gz::https://github.com/NagyD/SDLPoP/archive/v1.20.tar.gz source = sdlpop.sh - sha256sums = dbb75398dee2224bcee648602ad23e469b936a2b7ea962a8a01b091b989f25b6 - sha256sums = cb7b7923dcfb68520c7e738e6e8bd503f56f2775b28022285397284c0c428991 + source = fix-build.patch + b2sums = 4ebc83cf0b174db342ff5706ac08290be86d10e8e5a7dbcadbcf9eafede9d98f36baa03da400967c25cafda9df15483da3503cd6a75d4dc3b3b469ae43f8b0b0 + b2sums = eecce7df11ff08547fb79f3fdcfffaddb84c2c112f200f12d2bb748c0ac498bcb5e0ab42ecaff1420eca883d7d83e58a0c0ce54abcaceb645ca914c06e2bed10 + b2sums = ba657632ecb0667b8e706cad6d970dff85f3f81fccd36417d7363c94c3c1c99f30fa0b34c8f31976fdfb8eb660fa751aca2736ffa68293eca36f1bf4db3f3fb6 pkgname = sdlpop @@ -9,12 +9,17 @@ 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") -sha256sums=('dbb75398dee2224bcee648602ad23e469b936a2b7ea962a8a01b091b989f25b6' - 'cb7b7923dcfb68520c7e738e6e8bd503f56f2775b28022285397284c0c428991') + "sdlpop.sh" + "fix-build.patch") +b2sums=('4ebc83cf0b174db342ff5706ac08290be86d10e8e5a7dbcadbcf9eafede9d98f36baa03da400967c25cafda9df15483da3503cd6a75d4dc3b3b469ae43f8b0b0' + 'eecce7df11ff08547fb79f3fdcfffaddb84c2c112f200f12d2bb748c0ac498bcb5e0ab42ecaff1420eca883d7d83e58a0c0ce54abcaceb645ca914c06e2bed10' + 'ba657632ecb0667b8e706cad6d970dff85f3f81fccd36417d7363c94c3c1c99f30fa0b34c8f31976fdfb8eb660fa751aca2736ffa68293eca36f1bf4db3f3fb6') prepare() { - cd SDLPoP-$pkgver/src + cd SDLPoP-$pkgver + patch -p1 < ../fix-build.patch + + cd src sed -e 's|$ROOT|/opt/sdlpop|' SDLPoP.desktop.template > SDLPoP.desktop } diff --git a/fix-build.patch b/fix-build.patch new file mode 100644 index 000000000000..9385ddd11384 --- /dev/null +++ b/fix-build.patch @@ -0,0 +1,37 @@ +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"); |