attract: update to 2.7.0.

This commit is contained in:
Elaine Gibson 2024-02-01 14:35:23 +00:00 committed by cinerea0
parent 0fdfb20660
commit 1f2862de9a
3 changed files with 33 additions and 26 deletions

View File

@ -1,33 +1,29 @@
--- a/Makefile 2016-12-06 21:40:22.715155552 +0100
+++ b/Makefile 2016-12-06 21:41:39.523155740 +0100
@@ -50,12 +50,8 @@
diff --git a/Makefile.orig b/Makefile
index 4f4793a9a69..b1f7cf469f4 100644
--- a/Makefile.orig
+++ b/Makefile
@@ -69,15 +69,10 @@
FE_VERSION=v2.2.0
FE_VERSION=v2.7.0
-CC=gcc
-CXX=g++
CFLAGS=$(EXTRA_CFLAGS)
CFLAGS=
CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
CPPFLAGS=
-STRIP=strip
-OBJCOPY=objcopy
PKG_CONFIG=pkg-config
-AR=ar
ARFLAGS=rc
RM=rm -f
MD=mkdir -p
@@ -84,7 +84,7 @@
override WINDRES := $(TOOLCHAIN)-$(WINDRES)
endif
-prefix=/usr/local
+prefix=/usr
datarootdir=$(prefix)/share
datadir=$(datarootdir)
exec_prefix=$(prefix)
@@ -414,7 +414,7 @@
@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
$(EXE_MSG)
- $(SILENT)$(CXX) -o $@ $^ $(CFLAGS) $(FE_FLAGS) $(LIBS)
+ $(SILENT)$(CXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(FE_FLAGS) $(LIBS)
ifneq ($(FE_DEBUG),1)
$(SILENT)$(STRIP) $@
endif
- $(CXX) -o $@ $^ $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
+ $(CXX) -o $@ $^ $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
ifeq ($(ENABLE_DEBUG_SYMBOLS),1)
$(DEBUG_MSG)
$(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug

View File

@ -0,0 +1,12 @@
diff --git a/src/fe_net.hpp.orig b/src/fe_net.hpp
index c089681e429..3fe6f6685e2 100644
--- a/src/fe_net.hpp.orig
+++ b/src/fe_net.hpp
@@ -27,6 +27,7 @@
#include <thread>
#include <deque>
#include <queue>
+#include <string>
class FeNetWorker;

View File

@ -1,17 +1,16 @@
# Template file for 'attract'
pkgname=attract
version=2.6.2
revision=2
version=2.7.0
revision=1
build_style=gnu-makefile
make_build_args="VERBOSE=1"
make_use_env=yes
hostmakedepends="pkg-config"
makedepends="SFML-devel ffmpeg-devel fontconfig-devel glu-devel libarchive-devel
libcurl-devel libjpeg-turbo-devel xine-lib rapidjson libXrandr-devel"
depends="git"
libcurl-devel libjpeg-turbo-devel libXinerama-devel libXrandr-devel"
short_desc="Attract-Mode is a graphical frontend for emulators"
maintainer="Pedro Narciso García Revington <p.revington@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://attractmode.org/"
homepage="https://attractmode.org/"
distfiles="https://github.com/mickelson/attract/archive/v${version}.tar.gz"
checksum=0412722c9ff186b5f7081027eb04751ee38f89c318d159f2559d0c4ac3246376
checksum=497bc9d4d5846cb0eee71eaed2352d2350f789df3a913f423a3d6eed9ba428e8