Attachment 254630 Details for Bug 282188 – Related patch to make emulators/ppsspp build with ffmpeg3 static libs

[patch] Related patch to make emulators/ppsspp build with ffmpeg3 static libs

02 - modifications to ppsspp to use new ffmpeg3.patch (text/plain), 3.31 KB, created by Kevin Reinholz on 2024-10-30 03:43:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Reinholz

Created: 2024-10-30 03:43:03 UTC

Size: 3.31 KB

patch

obsolete

>From 2a4949daa97844e19a3ac9673bc16862d0ddb45d Mon Sep 17 00:00:00 2001
>From: Kevin Reinholz <kreinholz@gmail.com>
>Date: Tue, 29 Oct 2024 20:04:54 -0700
>Subject: [PATCH 2/2] Added new port: multimedia/ffmpeg3, and modified
> emulators/ppsspp to build with bundled static ffmpeg provided by new ffmpeg3
> port.
>
>---
> emulators/ppsspp/Makefile                     |  5 +--
> .../patch-cmake_Modules_FindFFmpeg.cmake      | 36 +++++++++++++++++++
> multimedia/Makefile                           |  1 +
> 3 files changed, 40 insertions(+), 2 deletions(-)
> create mode 100644 emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
>
>diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
>index 826d848eb..bf3a423dc 100644
>--- a/emulators/ppsspp/Makefile
>+++ b/emulators/ppsspp/Makefile
>@@ -19,10 +19,11 @@ NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe
> NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
> 		https://github.com/hrydgard/ppsspp/issues/8823
> 
>+BUILD_DEPENDS=	/usr/local/ffmpeg3/lib/libavcodec.a:multimedia/ffmpeg3
>+
> LIB_DEPENDS=	libzip.so:archivers/libzip \
> 		libsnappy.so:archivers/snappy \
> 		libzstd.so:archivers/zstd \
>-		libavcodec.so:multimedia/ffmpeg \
> 		libminiupnpc.so:net/miniupnpc
> RUN_DEPENDS=	xdg-open:devel/xdg-utils
> 
>@@ -40,7 +41,7 @@ GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
> 		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson
> EXCLUDE=	libzip zlib
> USE_GL=		glew opengl
>-CMAKE_ON=	${FFMPEG LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
>+CMAKE_ON=	${LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
> CMAKE_OFF=	USE_DISCORD
> LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network
> CONFLICTS_INSTALL=	${PORTNAME}-*
>diff --git a/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake b/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
>new file mode 100644
>index 000000000..2cbf2cfee
>--- /dev/null
>+++ b/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
>@@ -0,0 +1,36 @@
>+--- cmake/Modules/FindFFmpeg.cmake.orig	2024-02-04 13:08:02 UTC
>++++ cmake/Modules/FindFFmpeg.cmake
>+@@ -56,9 +56,7 @@ function(find_ffmpeg LIBNAME)
>+ set(_FFmpeg_HEADER_swscale swscale)
>+ 
>+ function(find_ffmpeg LIBNAME)
>+-  if(DEFINED ENV{FFMPEG_DIR})
>+-    set(FFMPEG_DIR $ENV{FFMPEG_DIR})
>+-  endif()
>++  set(FFMPEG_DIR /usr/local/ffmpeg3)
>+ 
>+   if(FFMPEG_DIR)
>+     list(APPEND INCLUDE_PATHS
>+@@ -79,17 +77,13 @@ function(find_ffmpeg LIBNAME)
>+       NO_CMAKE_FIND_ROOT_PATH
>+     )
>+   else()
>+-    list(APPEND INCLUDE_PATHS
>+-      /usr/local/include/ffmpeg
>+-      /usr/local/include/lib${LIBNAME}
>+-      /usr/include/ffmpeg
>+-      /usr/include/lib${LIBNAME}
>+-      /usr/include/ffmpeg/lib${LIBNAME}
>++    list(SET INCLUDE_PATHS
>++      /usr/local/ffmpeg3/include/ffmpeg
>++      /usr/local/ffmpeg3/include/lib${LIBNAME}
>+     )
>+ 
>+-    list(APPEND LIB_PATHS
>+-      /usr/local/lib
>+-      /usr/lib
>++    list(SET LIB_PATHS
>++      /usr/local/ffmpeg3/lib
>+     )
>+   endif()
>+ 
>diff --git a/multimedia/Makefile b/multimedia/Makefile
>index 817ce6aa1..e5ec2880b 100644
>--- a/multimedia/Makefile
>+++ b/multimedia/Makefile
>@@ -57,6 +57,7 @@
>     SUBDIR += ffaudioconverter
>     SUBDIR += ffdec
>     SUBDIR += ffmpeg
>+    SUBDIR += ffmpeg3
>     SUBDIR += ffmpeg4
>     SUBDIR += ffmpegthumbnailer
>     SUBDIR += ffms2
>-- 
>2.47.0
>

Actions: View | Diff

Attachments on bug 282188: 254346 | 254451 | 254498 | 254585 | 254601 | 254629 | 254630 | 255054