games-fps/gzdoom: remove also headers patch
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
AUX gzdoom-4.10.0-headers.patch 3999 BLAKE2B 88a024fee77f89d4a58c29b51617f2f28ba8abc914b319bf0dfbbcc6e44dbc34a3af1d79f9196b9b3dad1a72ddbad4dfde879761728aef404b9138da712a4f60 SHA512 175d6ca534e2e8e934c385b399067a55055bb5de7162a3e1e01f396c7a97c229aabddc9bde133df6db9f2ccf53eb59afc823abfb0f749cd9705429fd13cca50b
|
||||
AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6
|
||||
DIST gzdoom-4.11.3.tar.gz 24354699 BLAKE2B 3ff436ad477a379f4ebeb68c211a85f77b446130687f754f5835a3e82044dd641d0301fda4d5e2fcf35d8eeb4cf511147ea8842ec377576b5ed840a6c59ec4aa SHA512 0abe69f85e2f0946e92d6ae2bbc4710c1e184a6748d4ef8a5f0c0daf31b67779b9085154877467144da650314e6c8dcde429cd47db06b17ec1ea66c63759568d
|
||||
EBUILD gzdoom-4.11.3.ebuild 2330 BLAKE2B 486b9505ecad0329d71ab07b2acb2f596af33669bd0906eaa9236dd113fbb181e304d1cfacb49fbbd8915033b8973a06fdc96f36e78bbc8a11588bf1e7f1c349 SHA512 318ccdd91f27bc7dfb158e35c0ed3ac91901de6e3f2891fd4de5c3dafc2e67ef9835d1472ea2633f2502403f01b9203cffff323bf853290ae3a95e7d3409e8b7
|
||||
EBUILD gzdoom-4.11.3.ebuild 2288 BLAKE2B 463cb92b3a4251643d4aee60337c0138f7ca401987bb925cfc3a9b9952067275ccf721cc7e9ad8faa265571057b703a31efe2ad833ca4253a1f9b0223d33f1de SHA512 f78d4162c9022f319d7ac6e9bef4ccb190e4ea6a6f5d2255413d2cb2cd5a323633f000cf4dbc4e305c9c979aeb89073dd9d8784d2e9df15b1500e5bf8d3c2adc
|
||||
MISC metadata.xml 244 BLAKE2B c868d151b81a299adb629476d8a1cf4aef25f0bfe22a0d3d1d0522dda5b9f18b7b6628655a1cea8a0ecf22c1284230b7fda98ee78eec53338d73e93d4df232d3 SHA512 e8dd6eabe095c2a205abbec715ce1d5ac0bd4209a78189b0141d2472165ca7dbee91cd49555f6861efa7a437ba621ae421308522b4dea9b5c6299721819fdafa
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <chewi@gentoo.org>
|
||||
Date: Sat, 1 Jul 2023 13:36:48 +0100
|
||||
Subject: [PATCH] Ensure local headers are used over system headers to avoid
|
||||
breakage
|
||||
|
||||
types.h was being picked up from webp rather than locally due to the
|
||||
`include_directories` call for GTK (and therefore its -I arguments)
|
||||
coming before the same call for the local sources. webp can be pulled in
|
||||
via GTK -> gdk-pixbuf -> tiff -> webp.
|
||||
|
||||
This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate
|
||||
when calling `include_directories`. I have done both for good measure.
|
||||
---
|
||||
src/CMakeLists.txt | 18 ++++++++++--------
|
||||
tools/zipdir/CMakeLists.txt | 2 +-
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index cf254ad6a..b4d06f9ce 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -97,7 +97,7 @@ else()
|
||||
if( NOT DYN_GTK )
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
|
||||
endif()
|
||||
- include_directories( ${GTK3_INCLUDE_DIRS} )
|
||||
+ include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} )
|
||||
link_directories( ${GTK3_LIBRARY_DIRS} )
|
||||
else()
|
||||
pkg_check_modules( GTK2 gtk+-2.0 )
|
||||
@@ -105,7 +105,7 @@ else()
|
||||
if( NOT DYN_GTK )
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
|
||||
endif()
|
||||
- include_directories( ${GTK2_INCLUDE_DIRS} )
|
||||
+ include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} )
|
||||
link_directories( ${GTK2_LIBRARY_DIRS} )
|
||||
else()
|
||||
set( NO_GTK ON )
|
||||
@@ -132,7 +132,7 @@ else()
|
||||
# Non-Windows version also needs SDL except native OS X backend
|
||||
if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
|
||||
find_package( SDL2 REQUIRED )
|
||||
- include_directories( "${SDL2_INCLUDE_DIR}" )
|
||||
+ include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" )
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
|
||||
endif()
|
||||
|
||||
@@ -143,7 +143,7 @@ if( NOT NO_OPENAL )
|
||||
find_package( OpenAL )
|
||||
mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
|
||||
if( OPENAL_INCLUDE_DIR )
|
||||
- include_directories( ${OPENAL_INCLUDE_DIR} )
|
||||
+ include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} )
|
||||
mark_as_advanced(CLEAR OPENAL_LIBRARY)
|
||||
if( OPENAL_LIBRARY )
|
||||
set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} )
|
||||
@@ -373,17 +373,17 @@ endif()
|
||||
|
||||
if( VPX_FOUND )
|
||||
add_definitions( "-DUSE_LIBVPX=1" )
|
||||
- include_directories( "${VPX_INCLUDE_DIR}" )
|
||||
+ include_directories( SYSTEM "${VPX_INCLUDE_DIR}" )
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
|
||||
else()
|
||||
message( SEND_ERROR "Could not find libvpx" )
|
||||
endif()
|
||||
|
||||
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
|
||||
+include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
|
||||
|
||||
if( ${HAVE_VM_JIT} )
|
||||
add_definitions( -DHAVE_VM_JIT )
|
||||
- include_directories( "${ASMJIT_INCLUDE_DIR}" )
|
||||
+ include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" )
|
||||
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
|
||||
endif()
|
||||
|
||||
@@ -1243,7 +1243,9 @@ endif()
|
||||
|
||||
target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} )
|
||||
|
||||
-include_directories( .
|
||||
+include_directories(
|
||||
+ BEFORE
|
||||
+ .
|
||||
common/audio/sound
|
||||
common/audio/music
|
||||
common/2d
|
||||
diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt
|
||||
index 65eb2fb72..762d9027f 100644
|
||||
--- a/tools/zipdir/CMakeLists.txt
|
||||
+++ b/tools/zipdir/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
cmake_minimum_required( VERSION 3.1.0 )
|
||||
|
||||
if( NOT CMAKE_CROSSCOMPILING )
|
||||
- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
|
||||
+ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
|
||||
add_executable( zipdir
|
||||
zipdir.c )
|
||||
target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -30,7 +30,6 @@ S="${WORKDIR}/${PN}-g${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
|
||||
"${FILESDIR}"/${PN}-4.10.0-headers.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user