diff --git a/mame.spec b/mame.spec index 67fe7a7..47d8c2d 100644 --- a/mame.spec +++ b/mame.spec @@ -1,6 +1,6 @@ %define tagver %(echo %version | tr -d .) Name: mame -Version: 0.262 +Version: 0.267 Release: 1mamba Summary: A virtual environment where you can run software written for other platforms, namely old arcades Group: Applications/Emulators @@ -25,7 +25,6 @@ BuildRequires: libfreetype-devel BuildRequires: libgcc BuildRequires: libglvnd-devel BuildRequires: libjpeg-devel -BuildRequires: liblua-devel BuildRequires: libportaudio-devel BuildRequires: libportmidi-devel BuildRequires: libpulseaudio-devel @@ -33,10 +32,11 @@ BuildRequires: libsdl2_ttf-devel BuildRequires: libsqlite-devel BuildRequires: libstdc++6-devel BuildRequires: libutf8proc-devel +BuildRequires: libwayland-egl-devel BuildRequires: libz-devel BuildRequires: libzstd-devel BuildRequires: pugixml-devel -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: libutf8proc-devel >= 2.9.0-1mamba BuildRequires: python3 @@ -67,17 +67,26 @@ Summary: Data files used by MAME %setup -q #-D -T #:<< _EOF - -# Use system libraries -sed -e 's|\# USE_SYSTEM_LIB|USE_SYSTEM_LIB|g' -i makefile -# except for asio -sed -e 's|USE_SYSTEM_LIB_ASIO|\# USE_SYSTEM_LIB_ASIO|g' -i makefile -# Use C++ LUA -sed -e 's|ext_lib("lua")|ext_lib("lua++")|' -i scripts/src/main.lua -i scripts/src/3rdparty.lua - -# Hack to force linking to lua5.4 -#mkdir lib -#ln -s %{_libdir}/liblua.so.5.4 lib/liblua.so +#remove system libs or document themes to ensure system ones are used +#remove 3rdparty code not needed on Linux +rm -rf \ + 3rdparty/asio \ + 3rdparty/compat \ + 3rdparty/dxsdk \ + 3rdparty/expat \ + 3rdparty/glm \ + 3rdparty/flac \ + 3rdparty/libjpeg \ + 3rdparty/portaudio \ + 3rdparty/portmidi \ + 3rdparty/pugixml \ + 3rdparty/rapidjson \ + 3rdparty/sqlite3 \ + 3rdparty/tap-windows6 \ + 3rdparty/utf8proc \ + 3rdparty/zlib \ + 3rdparty/zstd \ + docs/themes # Create ini file cat > %{name}.ini << EOF @@ -123,20 +132,35 @@ RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-O2@-Os@") RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory -fuse-ld=gold" %endif -export CFLAGS+="`pkg-config lua --cflags`" -export CXXFLAGS+="`pkg-config lua --cflags`" -export LDFLAGS+="`pkg-config lua --libs`" - -%make_build -j2 \ +%make \ PYTHON_EXECUTABLE=%{__python3} \ NOWERROR=1 \ OPTIMIZE=2 \ + VERBOSE=1 \ TOOLS=1 \ + QT_HOME=%{_libdir}/qt6 \ + USE_SYSTEM_LIB_ASIO=1 \ + USE_SYSTEM_LIB_EXPAT=1 \ + USE_SYSTEM_LIB_FLAC=1 \ + USE_SYSTEM_LIB_GLM=1 \ + USE_SYSTEM_LIB_JPEG=1 \ + USE_SYSTEM_LIB_PORTAUDIO=1 \ + USE_SYSTEM_LIB_PORTMIDI=1 \ + USE_SYSTEM_LIB_PUGIXML=1 \ + USE_SYSTEM_LIB_RAPIDJSON=1 \ + USE_SYSTEM_LIB_SQLITE3=1 \ + USE_SYSTEM_LIB_UTF8PROC=1 \ + USE_SYSTEM_LIB_ZLIB=1 \ + USE_SYSTEM_LIB_ZSTD=1 \ + USE_WAYLAND=1 \ ARCHOPTS=-flifetime-dse=1 \ - OPT_FLAGS="$RPM_OPT_FLAGS" \ -%ifarch %{ix86} arm - LDOPTS="$RPM_LD_FLAGS" -%endif + LDOPTS="$RPM_LD_FLAGS" \ + OPT_FLAGS="$RPM_OPT_FLAGS" + +# OPT_FLAGS="$RPM_OPT_FLAGS" \ +#%ifarch %{ix86} arm +# LDOPTS="$RPM_LD_FLAGS" +#%endif #cd docs #% make html @@ -258,6 +282,9 @@ popd %license COPYING docs/legal/* %changelog +* Sat Jul 06 2024 Automatic Build System 0.267-1mamba +- automatic version update by autodist + * Tue Feb 06 2024 Silvan Calarco 0.262-1mamba - update to 0.262