diff --git a/ffmpeg.patch b/ffmpeg.patch deleted file mode 100644 index 58fa9dff61..0000000000 --- a/ffmpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt -index 54c852f831..ff35c8dc2c 100644 ---- a/externals/ffmpeg/CMakeLists.txt -+++ b/externals/ffmpeg/CMakeLists.txt -@@ -63,20 +63,22 @@ if (NOT WIN32 AND NOT ANDROID) - set(FFmpeg_HWACCEL_INCLUDE_DIRS) - set(FFmpeg_HWACCEL_LDFLAGS) - -- # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so -- if(PLATFORM_SUN) -- list(APPEND FFmpeg_HWACCEL_LIBRARIES -- X11 -- "/usr/lib/xorg/amd64/libdrm.so") -- else() -- pkg_check_modules(LIBDRM libdrm REQUIRED) -- list(APPEND FFmpeg_HWACCEL_LIBRARIES -- ${LIBDRM_LIBRARIES}) -- list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS -- ${LIBDRM_INCLUDE_DIRS}) -+ if (NOT APPLE) -+ # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so -+ if(PLATFORM_SUN) -+ list(APPEND FFmpeg_HWACCEL_LIBRARIES -+ X11 -+ "/usr/lib/xorg/amd64/libdrm.so") -+ else() -+ pkg_check_modules(LIBDRM libdrm REQUIRED) -+ list(APPEND FFmpeg_HWACCEL_LIBRARIES -+ ${LIBDRM_LIBRARIES}) -+ list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS -+ ${LIBDRM_INCLUDE_DIRS}) -+ endif() -+ list(APPEND FFmpeg_HWACCEL_FLAGS -+ --enable-libdrm) - endif() -- list(APPEND FFmpeg_HWACCEL_FLAGS -- --enable-libdrm) - - if(LIBVA_FOUND) - find_package(X11 REQUIRED) diff --git a/src/qt_common/qt_content_util.cpp b/src/qt_common/qt_content_util.cpp index 81ec7c9cea..9c3ae6e115 100644 --- a/src/qt_common/qt_content_util.cpp +++ b/src/qt_common/qt_content_util.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #include "qt_content_util.h" #include "common/fs/fs.h" #include "frontend_common/content_manager.h" diff --git a/src/qt_common/qt_content_util.h b/src/qt_common/qt_content_util.h index 9a1a4e5bc2..b7073d2d35 100644 --- a/src/qt_common/qt_content_util.h +++ b/src/qt_common/qt_content_util.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef QT_CONTENT_UTIL_H #define QT_CONTENT_UTIL_H diff --git a/src/qt_common/qt_meta.cpp b/src/qt_common/qt_meta.cpp index c972c0fe45..67ae659771 100644 --- a/src/qt_common/qt_meta.cpp +++ b/src/qt_common/qt_meta.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #include "qt_meta.h" #include "common/common_types.h" #include "core/core.h" diff --git a/src/qt_common/qt_meta.h b/src/qt_common/qt_meta.h index 36cafba2bf..c0a37db983 100644 --- a/src/qt_common/qt_meta.h +++ b/src/qt_common/qt_meta.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef QT_META_H #define QT_META_H diff --git a/src/qt_common/qt_rom_util.cpp b/src/qt_common/qt_rom_util.cpp index e707d1e471..08ccb05a97 100644 --- a/src/qt_common/qt_rom_util.cpp +++ b/src/qt_common/qt_rom_util.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #include "qt_rom_util.h" #include diff --git a/src/qt_common/qt_rom_util.h b/src/qt_common/qt_rom_util.h index 52ebb1e8d0..f76b09753d 100644 --- a/src/qt_common/qt_rom_util.h +++ b/src/qt_common/qt_rom_util.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef QT_ROM_UTIL_H #define QT_ROM_UTIL_H