summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bouvier2022-04-18 21:47:07 +0200
committerAlexandre Bouvier2022-04-18 21:47:07 +0200
commit6f703bbe9fbfd317049659719341f64780f4a7b5 (patch)
treea0c38bd55923c4af67a7e33707bfdac7339fd63b
parentfd6249dd8240fcb3fd52354e98526ed704143c8b (diff)
downloadaur-6f703bbe9fbfd317049659719341f64780f4a7b5.tar.gz
update patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--unbundle-libs.patch15
3 files changed, 4 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f83bfdf174db..9529f3103c6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,7 +28,7 @@ pkgbase = libretro-flycast-git
source = flycast::git+https://github.com/flyinghead/flycast.git
source = unbundle-libs.patch
b2sums = SKIP
- b2sums = ad99c975bdfdeb6592a0496ac3e90665dda539de610003131dcaa98c4acf000e9b8c2a5b8567710dee6bd9710289e5b6081fef24f202d7e70955e56f1074e9a5
+ b2sums = e958858e145819df2156856b55b441b960716403c140cf79c6bbec5fbfae06303e27ea42f9fa4d58250046c9700ac04e5d26feb6a469ea9cd9cdda4c471ad896
pkgname = libretro-flycast-git
depends = libgl
diff --git a/PKGBUILD b/PKGBUILD
index 45968bc9e4cf..d04c3fe1dc7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ source=(
)
b2sums=(
'SKIP'
- 'ad99c975bdfdeb6592a0496ac3e90665dda539de610003131dcaa98c4acf000e9b8c2a5b8567710dee6bd9710289e5b6081fef24f202d7e70955e56f1074e9a5'
+ 'e958858e145819df2156856b55b441b960716403c140cf79c6bbec5fbfae06303e27ea42f9fa4d58250046c9700ac04e5d26feb6a469ea9cd9cdda4c471ad896'
)
pkgver() {
diff --git a/unbundle-libs.patch b/unbundle-libs.patch
index 76faf1a7e7c9..1331c8dcdaa3 100644
--- a/unbundle-libs.patch
+++ b/unbundle-libs.patch
@@ -2,17 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 151dc653..3e18378d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1,10 +1,5 @@
- cmake_minimum_required(VERSION 3.10.2)
-
--find_program(CCACHE_PROGRAM ccache)
--if(CCACHE_PROGRAM)
-- set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE STRING "Compiler launcher for C.")
-- set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE STRING "Compiler launcher for CXX.")
--endif()
-
- option(ENABLE_CTEST "Enables unit tests" OFF)
- option(ENABLE_OPROFILE "Enable OProfile" OFF)
@@ -217,14 +212,12 @@ else()
target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET_NO_OPENMP)
endif()
@@ -45,7 +34,7 @@ index 151dc653..3e18378d 100644
target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
endif()
-
-+if(NOT LIBRETRO)
++if(FALSE)
find_package(Lua)
if(NOT APPLE AND LUA_FOUND)
target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
@@ -75,7 +64,7 @@ index 151dc653..3e18378d 100644
endif()
endif()
-
-+if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
++if(FALSE)
if(ENABLE_OPROFILE)
target_compile_definitions(${PROJECT_NAME} PRIVATE DYNA_OPROF)
target_link_libraries(${PROJECT_NAME} PRIVATE opagent)