8 Commits

3 changed files with 12 additions and 6 deletions

View File

@@ -29,7 +29,7 @@ Index: gzdoom-g4.12.2/CMakeLists.txt
endif() endif()
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" ) -set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
+pkg_check_modules(LZMA REQUIRED clzma) +pkg_check_modules(LZMA REQUIRED lzma-sdk)
if( NOT CMAKE_CROSSCOMPILING ) if( NOT CMAKE_CROSSCOMPILING )
if( NOT CROSS_EXPORTS ) if( NOT CROSS_EXPORTS )

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Aug 24 12:41:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Adjust gzdoom-lzma.patch for changes in the lzma-sdk package's
lzma-sdk-shlib.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 5 03:47:23 UTC 2025 - Jan Engelhardt <jengelh@inai.de> Mon May 5 03:47:23 UTC 2025 - Jan Engelhardt <jengelh@inai.de>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package gzdoom # spec file for package gzdoom
# #
# Copyright (c) 2025 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -46,10 +46,10 @@ BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(sdl2) >= 2.0.6
BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1599 %if 0%{?suse_version} >= 1650
BuildRequires: pkgconfig(clzma) >= 23.01 BuildRequires: pkgconfig(lzma-sdk) >= 23.01
%else %else
Provides: bundled(clzma) = 23.01 Provides: bundled(lzma-sdk) = 23.01
%endif %endif
Provides: qzdoom = 1.3.0 Provides: qzdoom = 1.3.0
Provides: zdoom = 2.8.1 Provides: zdoom = 2.8.1
@@ -79,7 +79,7 @@ SSE2 is a hard requirement even on 32-bit x86.
%prep %prep
%autosetup -n %name-g%version -p1 %autosetup -n %name-g%version -p1
%if 0%{?suse_version} < 1600 %if 0%{?suse_version} < 1690
# system lzma-sdk too old, use bundled copy # system lzma-sdk too old, use bundled copy
%patch -P 5 -R -p1 %patch -P 5 -R -p1
%endif %endif