diff options
author | Carsten Teibes | 2023-08-24 00:42:58 +0200 |
---|---|---|
committer | Carsten Teibes | 2023-08-24 00:42:58 +0200 |
commit | 07aa22956f2f7f0a5d92136d956b83fb2d3ea8ee (patch) | |
tree | 127b873c8b2e336c4f70882d6a76d5607a6ff721 | |
parent | 91b3494adbe7c448aab11a4627570a9f1d5d6396 (diff) | |
download | aur-07aa22956f2f7f0a5d92136d956b83fb2d3ea8ee.tar.gz |
[upd] 1.5.1→2.0.1
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | methane-clanlib23.patch | 35 | ||||
-rw-r--r-- | methane-nogl1.patch | 66 |
4 files changed, 21 insertions, 143 deletions
@@ -1,22 +1,18 @@ pkgbase = methane pkgdesc = Help the Super Methane Brothers to capture baddies with your gas gun - pkgver = 1.5.1 - pkgrel = 4 + pkgver = 2.0.1 + pkgrel = 1 url = http://methane.sourceforge.net arch = i686 arch = x86_64 license = GPL - depends = clanlib-23 - source = http://downloads.sourceforge.net/methane/methane-1.5.1.tgz + depends = clanlib=4.1.0 + depends = libmikmod + source = methane-2.0.1.tar.gz::https://github.com/rombust/Methane/archive/refs/tags/v2.0.1.tar.gz source = methane.png source = methane.desktop - source = methane-clanlib23.patch - source = methane-nogl1.patch - sha256sums = ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248 + sha256sums = 8a6df09f82d3b9404821adff2c2a13012e623abdd57591bf2503dd1e4ff3cac2 sha256sums = 6c56b025b058a954bd089850dc50f4f25b292da97bbba0d4315db4060152f1fe - sha256sums = cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17 - sha256sums = d7318ef7004cce6bb3de04c76b1d3d15d26265310a5d3938f2efa6c183f4a346 - sha256sums = 3b2426f27f45b232caf69d21eb1f79e8db3f7041bc6255eb20fe0fc0aae970a5 + sha256sums = a1673c549854334bfaff0c5fffec4388952eacd6aa2709ab02562e1edd1266d1 pkgname = methane - @@ -1,49 +1,32 @@ -# Maintainer: carstene1ns <url/mail: arch carsten-teibes de> +# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG # Contributor: Dany Martineau <dany.luc.martineau at gmail.com> # Contributor: Larryhaja <larryhaja at gmail.com> pkgname=methane -pkgver=1.5.1 -pkgrel=4 +pkgver=2.0.1 +pkgrel=1 pkgdesc="Help the Super Methane Brothers to capture baddies with your gas gun" arch=('i686' 'x86_64') url="http://methane.sourceforge.net" license=('GPL') -depends=('clanlib-23') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" - "$pkgname.png" - "$pkgname.desktop" - "$pkgname-clanlib23.patch" - "$pkgname-nogl1.patch") -sha256sums=('ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248' +depends=('clanlib=4.1.0' 'libmikmod') +source=($pkgname-$pkgver.tar.gz::"https://github.com/rombust/Methane/archive/refs/tags/v$pkgver.tar.gz" + $pkgname.png + $pkgname.desktop) +sha256sums=('8a6df09f82d3b9404821adff2c2a13012e623abdd57591bf2503dd1e4ff3cac2' '6c56b025b058a954bd089850dc50f4f25b292da97bbba0d4315db4060152f1fe' - 'cdbd5cbe9af04eff5bd7b8a467bd39fdbdefb77a4728d09347ee09c64d947d17' - 'd7318ef7004cce6bb3de04c76b1d3d15d26265310a5d3938f2efa6c183f4a346' - '3b2426f27f45b232caf69d21eb1f79e8db3f7041bc6255eb20fe0fc0aae970a5') - -prepare() { - cd $pkgname-$pkgver - - # clanlib related changes - patch -Np1 < ../$pkgname-clanlib23.patch - # remove opengl1 renderer - patch -Np1 < ../$pkgname-nogl1.patch -} + 'a1673c549854334bfaff0c5fffec4388952eacd6aa2709ab02562e1edd1266d1') build() { - cd $pkgname-$pkgver - - # remove leftover build dir - rm -rf build - make + make -C Methane-$pkgver } package() { - cd $pkgname-$pkgver - # install desktop entry - install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop - install -Dm644 ../$pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png + install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + install -Dm644 $pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png + + cd Methane-$pkgver # install data and executable install -d "$pkgdir"/usr/share/$pkgname diff --git a/methane-clanlib23.patch b/methane-clanlib23.patch deleted file mode 100644 index ac5fd45791ea..000000000000 --- a/methane-clanlib23.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru methane-1.5.1.orig/Makefile methane-1.5.1/Makefile ---- methane-1.5.1.orig/Makefile 2011-04-05 09:21:14.000000000 +0200 -+++ methane-1.5.1/Makefile 2013-09-12 05:07:40.456736802 +0200 -@@ -1,5 +1,5 @@ --METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` --METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` -+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` -+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` - - OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o - ---- methane-1.5.1.orig/sources/methane.cpp 2011-04-05 09:08:02.000000000 +0200 -+++ methane-1.5.1/sources/methane.cpp 2013-09-12 05:09:03.240665466 +0200 -@@ -80,15 +80,15 @@ - return 0; - } - -- CL_AutoPtr<CL_SetupSound> setup_sound; -- CL_AutoPtr<CL_SoundOutput> sound_output; -- CL_AutoPtr<CL_SetupMikMod> setup_mikmod; -+ CL_UniquePtr<CL_SetupSound> setup_sound; -+ CL_UniquePtr<CL_SoundOutput> sound_output; -+ CL_UniquePtr<CL_SetupMikMod> setup_mikmod; - - if (GLOBAL_SoundEnable) - { -- setup_sound = new CL_SetupSound; -- sound_output = new CL_SoundOutput(44100); -- setup_mikmod = new CL_SetupMikMod; -+ setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound)); -+ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100))); -+ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod)); - } - - // Set the video mode diff --git a/methane-nogl1.patch b/methane-nogl1.patch deleted file mode 100644 index 06f1ccde355d..000000000000 --- a/methane-nogl1.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- methane-1.5.1.orig/Makefile 2013-09-12 05:07:40.456736802 +0200 -+++ methane-1.5.1/Makefile 2013-09-12 05:21:30.747823618 +0200 -@@ -1,5 +1,5 @@ --METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` --METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` -+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` -+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` - - OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o - ---- methane-1.5.1.orig/sources/methane.cpp 2013-09-12 05:09:03.240665466 +0200 -+++ methane-1.5.1/sources/methane.cpp 2013-09-12 05:22:43.694862222 +0200 -@@ -17,7 +17,6 @@ - #include <ClanLib/display.h> - #include <ClanLib/swrender.h> - #include <ClanLib/gl.h> --#include <ClanLib/gl1.h> - #include <ClanLib/sound.h> - #include <ClanLib/mikmod.h> - -@@ -53,7 +52,6 @@ - try - { - CL_SetupGL target_opengl2; -- CL_SetupGL1 target_opengl1; - CL_SetupSWRender target_swrender; - - // Since SWRender is compatible and fast - Use that as the default setting options -@@ -66,9 +64,6 @@ - case (opengl2): - target_opengl2.set_current(); - break; -- case (opengl1): -- target_opengl1.set_current(); -- break; - case (swrender): - target_swrender.set_current(); - break; -@@ -297,11 +292,6 @@ - LastKey = 0; - GLOBAL_RenderTarget = opengl2; - } -- if ( (LastKey == 'e') || (LastKey == 'E') ) -- { -- LastKey = 0; -- GLOBAL_RenderTarget = opengl1; -- } - if ( (LastKey == 'r') || (LastKey == 'R') ) - { - LastKey = 0; -@@ -322,14 +312,7 @@ - options_font.draw_text(gc, 10, ypos, "OpenGL V2 - Disabled. Press 'W' to select"); - } - ypos += 50; -- if (GLOBAL_RenderTarget == opengl1) -- { -- options_font.draw_text(gc, 10, ypos, "OpenGL V1 - Enabled."); -- } -- else -- { -- options_font.draw_text(gc, 10, ypos, "OpenGL V1 - Disabled. Press 'E' to select"); -- } -+ options_font.draw_text(gc, 10, ypos, "OpenGL V1 - Not available"); - ypos += 50; - if (GLOBAL_RenderTarget == swrender) - { |