diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-12 10:03:32 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-12 10:03:32 +0000 |
| commit | 4b4b48daeae1f96fb05007102312d38cf9d3ea4a (patch) | |
| tree | 89a0753d5f2db6bfc3d0254f7df0e4cb0b8f2413 /user/trigger-rally | |
| parent | 380485eb6689ca23a1462e4f0a38006b7a41757e (diff) | |
| download | packages-4b4b48daeae1f96fb05007102312d38cf9d3ea4a.tar.gz packages-4b4b48daeae1f96fb05007102312d38cf9d3ea4a.tar.bz2 packages-4b4b48daeae1f96fb05007102312d38cf9d3ea4a.tar.xz packages-4b4b48daeae1f96fb05007102312d38cf9d3ea4a.zip | |
user/*: Modernise / fix syntax / metadata / deps / code
Diffstat (limited to 'user/trigger-rally')
| -rw-r--r-- | user/trigger-rally/APKBUILD | 10 | ||||
| -rw-r--r-- | user/trigger-rally/sdl2-compat.patch | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 07e4de092..9e71972d1 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -14,19 +14,16 @@ makedepends="freealut-dev glew-dev glu-dev openal-soft-dev physfs-dev sdl2-dev subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/trigger-rally/trigger-rally-$pkgver.tar.gz dont-strip.patch + sdl2-compat.patch trigger-rally.desktop " build() { - cd "$builddir"/src - make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr build + make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr -C src build } package() { - local _icon="" - - cd "$builddir"/src - make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr install + make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr -C src install install -D -m644 "$srcdir"/trigger-rally.desktop \ "$pkgdir"/usr/share/applications/trigger-rally.desktop @@ -41,4 +38,5 @@ package() { sha512sums="feed805858ef63907bb10088761f1219b22fe55ead268511ef73b18aa0f18d79e87d4e2cbfb76361b1dec3949b59464af33efe31e81f06ae7e163430f3336669 trigger-rally-0.6.6.1.tar.gz a81781058177e012daaad58d72e4bdbdbc2730b1df76941ba03f06367545b213ba82a33bab46deba31570973deb1802a3d459704c3a963c38eec69ef82f228d5 dont-strip.patch +e16fa74f1554cf8202f1ae5994c8f65eb311bf85ec9e89989911975db54d22c8e7dff559952e730972011b7dfabfd6aedb8c9f1d6292839734bfee54796b743a sdl2-compat.patch ddaf7d89353280f7952d6cffd06182ea28640473e18eff06809c48477349248f57922eaff9bf816261c32f8fdc167d933f345422f9885638041dd9f5e5ac0524 trigger-rally.desktop" diff --git a/user/trigger-rally/sdl2-compat.patch b/user/trigger-rally/sdl2-compat.patch new file mode 100644 index 000000000..ae3f7c609 --- /dev/null +++ b/user/trigger-rally/sdl2-compat.patch @@ -0,0 +1,11 @@ +--- trigger-rally-0.6.6.1/src/GNUmakefile.old 2020-01-12 09:46:17.392027213 +0000 ++++ trigger-rally-0.6.6.1/src/GNUmakefile 2020-01-12 09:56:43.744640443 +0000 +@@ -26,7 +26,7 @@ + INCDIRS := -I'./include' + CXXFLAGS += -std=c++11 $(WARNINGS) $(OPTIMS) + CPPFLAGS += $(DMACROS) $(INCDIRS) +-EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2 ++EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2-2.0 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2 + LDFLAGS += $(EXTRA_LIBS) + INSTALL_PROGRAM := install --mode=0755 + INSTALL_DATA := install --mode=0644 |