Attachment 255210 Details for Bug 282792 – Ports tree patch updating emulators/ppsspp to 1.18.1 with proposed multimedia/ffmpeg3 port as build dependency

[patch] Ports tree patch updating emulators/ppsspp to 1.18.1 with proposed multimedia/ffmpeg3 port as build dependency

ppsspp-1.18.1_update_with_new_ffmpeg3_bundled_dep.patch (text/plain), 20.76 KB, created by Kevin Reinholz on 2024-11-16 00:47:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Reinholz

Created: 2024-11-16 00:47:58 UTC

Size: 20.76 KB

patch

obsolete

>From 434f873fd25a8188bc13479b34c7a5c13e095f5a Mon Sep 17 00:00:00 2001
>From: Kevin Reinholz <kreinholz@gmail.com>
>Date: Fri, 15 Nov 2024 16:03:18 -0800
>Subject: [PATCH] emulators/ppsspp: update to 1.18.1; build against
> static/bundled ffmpeg3 (proposed new port) while we're at it.
>
>---
> emulators/ppsspp/Makefile                     |  15 +-
> emulators/ppsspp/distinfo                     |  12 +-
> .../files/patch-Core_Util_PortManager.cpp     |  25 ----
> .../patch-cmake_Modules_FindFFmpeg.cmake      |  36 +++++
> emulators/ppsspp/files/patch-ffmpeg5          |  13 --
> multimedia/Makefile                           |   1 +
> multimedia/ffmpeg3/Makefile                   | 128 ++++++++++++++++++
> multimedia/ffmpeg3/distinfo                   |   5 +
> multimedia/ffmpeg3/files/patch-configure      |  17 +++
> .../ffmpeg3/files/patch-libavformat_rtsp.c    |  44 ++++++
> .../ffmpeg3/files/patch-libavutil_common.h    |  13 ++
> multimedia/ffmpeg3/override.mk                |   8 ++
> multimedia/ffmpeg3/pkg-descr                  |   3 +
> multimedia/ffmpeg3/pkg-plist                  |  99 ++++++++++++++
> 14 files changed, 369 insertions(+), 50 deletions(-)
> delete mode 100644 emulators/ppsspp/files/patch-Core_Util_PortManager.cpp
> create mode 100644 emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
> delete mode 100644 emulators/ppsspp/files/patch-ffmpeg5
> create mode 100644 multimedia/ffmpeg3/Makefile
> create mode 100644 multimedia/ffmpeg3/distinfo
> create mode 100644 multimedia/ffmpeg3/files/patch-configure
> create mode 100644 multimedia/ffmpeg3/files/patch-libavformat_rtsp.c
> create mode 100644 multimedia/ffmpeg3/files/patch-libavutil_common.h
> create mode 100644 multimedia/ffmpeg3/override.mk
> create mode 100644 multimedia/ffmpeg3/pkg-descr
> create mode 100644 multimedia/ffmpeg3/pkg-plist
>
>diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
>index 826d848eb..3cec1418a 100644
>--- a/emulators/ppsspp/Makefile
>+++ b/emulators/ppsspp/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	ppsspp
> DISTVERSIONPREFIX=	v
>-DISTVERSION?=	1.17.1
>-PORTREVISION?=	1
>+DISTVERSION?=	1.18.1
> CATEGORIES=	emulators
> # XXX Get from Debian once #697821 lands
> MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
>@@ -19,11 +18,12 @@ 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
>+		libopenxr_loader.so:graphics/openxr
> RUN_DEPENDS=	xdg-open:devel/xdg-utils
> 
> USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig
>@@ -36,11 +36,12 @@ GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
> 		KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \
> 		Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \
> 		Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \
>-		RetroAchievements:rcheevos:v11.0.0-26-ge7989c3:rcheevos/ext/rcheevos \
>-		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson
>+		RetroAchievements:rcheevos:v11.6.0:rcheevos/ext/rcheevos \
>+		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson \
>+		miniupnp:miniupnp:miniupnpd_2_3_7:miniupnp/ext/miniupnp
> 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 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/distinfo b/emulators/ppsspp/distinfo
>index cdc57c2eb..25c6ca829 100644
>--- a/emulators/ppsspp/distinfo
>+++ b/emulators/ppsspp/distinfo
>@@ -1,8 +1,8 @@
>-TIMESTAMP = 1707052082
>+TIMESTAMP = 1731713343
> SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
> SIZE (ppsspp.1) = 1598
>-SHA256 (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = dd65e7a317cd461386a1641ddf475686d8bdb2f408bdae910386d8b3ca6a8195
>-SIZE (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = 41876096
>+SHA256 (hrydgard-ppsspp-v1.18.1_GH0.tar.gz) = cc9425202552cbce8bc7ee5b883670703761011ab5c987c426887f7c2ef2703f
>+SIZE (hrydgard-ppsspp-v1.18.1_GH0.tar.gz) = 37089272
> SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7
> SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872
> SHA256 (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 0bcb1a537b8fc184b9df9ddde9d15868efe7f651139ea84d3e20ac9900a43c60
>@@ -17,7 +17,9 @@ SHA256 (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 8a46d92b070de90cefcd89
> SIZE (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 223306
> SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604
> SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401
>-SHA256 (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 9b1374b2c82c67850481dbee21946d5b4acb5c45d0284e85e58fa0e68f7d24f8
>-SIZE (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 650457
>+SHA256 (RetroAchievements-rcheevos-v11.6.0_GH0.tar.gz) = 4e51672e9b9cd9338cadebfb893e654ccd22536e7f021622b249c571a25fc915
>+SIZE (RetroAchievements-rcheevos-v11.6.0_GH0.tar.gz) = 672704
> SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe
> SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127
>+SHA256 (miniupnp-miniupnp-miniupnpd_2_3_7_GH0.tar.gz) = bbcada94edb0ae6340533cac4633f7a36a515c81bd2815ec0c4e97164c577e8b
>+SIZE (miniupnp-miniupnp-miniupnpd_2_3_7_GH0.tar.gz) = 465760
>diff --git a/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp b/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp
>deleted file mode 100644
>index e2b3ae859..000000000
>--- a/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- Core/Util/PortManager.cpp.orig	2024-02-04 13:08:02 UTC
>-+++ Core/Util/PortManager.cpp
>-@@ -161,7 +161,21 @@ bool PortManager::Initialize(const unsigned int timeou
>- 
>- 		// Get LAN IP address that connects to the router
>- 		char lanaddr[64] = "unset";
>--		int status = UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr)); //possible "status" values, 0 = NO IGD found, 1 = A valid connected IGD has been found, 2 = A valid IGD has been found but it reported as not connected, 3 = an UPnP device has been found but was not recognized as an IGD
>-+/*
>-+possible "status" values:
>-+-1 = Internal error
>-+ 0 = NO IGD found
>-+ 1 = A valid connected IGD has been found
>-+ 2 = A valid connected IGD has been found but its IP address is reserved (non routable)
>-+ 3 = A valid IGD has been found but it reported as not connected
>-+ 4 = an UPnP device has been found but was not recognized as an IGD
>-+*/
>-+		int status =
>-+#if (MINIUPNPC_API_VERSION >= 18)
>-+			UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr), nullptr, 0);
>-+#else
>-+			UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr));
>-+#endif
>- 		m_lanip = std::string(lanaddr);
>- 		INFO_LOG(SCENET, "PortManager - Detected LAN IP: %s", m_lanip.c_str());
>- 
>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/emulators/ppsspp/files/patch-ffmpeg5 b/emulators/ppsspp/files/patch-ffmpeg5
>deleted file mode 100644
>index 4e9a92758..000000000
>--- a/emulators/ppsspp/files/patch-ffmpeg5
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-https://github.com/hrydgard/ppsspp/issues/15308
>-
>---- Core/HW/SimpleAudioDec.h.orig	2023-01-03 10:14:31 UTC
>-+++ Core/HW/SimpleAudioDec.h
>-@@ -78,7 +78,7 @@ class SimpleAudio { (private)
>- 	int wanted_resample_freq; // wanted resampling rate/frequency
>- 
>- 	AVFrame *frame_;
>--	AVCodec *codec_;
>-+	const AVCodec *codec_;
>- 	AVCodecContext  *codecCtx_;
>- 	SwrContext      *swrCtx_;
>- 
>diff --git a/multimedia/Makefile b/multimedia/Makefile
>index ebb05908d..fba02bcb9 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
>diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
>new file mode 100644
>index 000000000..0dcabb2a2
>--- /dev/null
>+++ b/multimedia/ffmpeg3/Makefile
>@@ -0,0 +1,128 @@
>+PORTNAME=	ffmpeg
>+PORTVERSION=	3.0.2
>+CATEGORIES=	multimedia audio net
>+MASTER_SITES=	https://ffmpeg.org/releases/
>+PKGNAMESUFFIX=	3
>+
>+PATCH_SITES=	https://github.com/hrydgard/ppsspp-ffmpeg/commit/
>+PATCHFILES=	9c4f84d9d9ad147f4a44cff582829647a0c65420.patch:-p1
>+
>+MAINTAINER=	kreinholz@gmail.com
>+COMMENT=	Realtime audio/video encoder/converter and streaming server (legacy 3.* series)
>+WWW=		https://ffmpeg.org/
>+
>+LICENSE=	GPLv2+ LGPL21+
>+LICENSE_COMB=	multi
>+
>+NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe
>+NOT_FOR_ARCHS_REASON=	emulators/ppsspp only supports little-endian, see \
>+		https://github.com/hrydgard/ppsspp/issues/8823
>+
>+USES=		compiler:c11 cpe gmake localbase:ldflags perl5 pkgconfig \
>+		shebangfix tar:xz
>+USE_PERL5=	build
>+SHEBANG_FILES=	doc/texi2pod.pl
>+USE_LDCONFIG=	yes
>+
>+.ifdef PKGNAMESUFFIX
>+PORTSCOUT=	limit:^3\.
>+PREFIX=		${LOCALBASE}/${PKGBASE} # avoid conflict with the default
>+.endif
>+
>+HAS_CONFIGURE=	yes
>+CONFIGURE_LOG=	ffbuild/config.log
>+
>+LDFLAGS_aarch64=-Wl,-z,notext
>+
>+INSTALL_TARGET=	install-libs install-headers
>+
>+NOPRECIOUSMAKEVARS=	yes
>+MAKE_ENV+=	V=1
>+
>+.if defined(WITH_DEBUG)
>+CONFIGURE_ARGS=	--disable-stripping
>+.else
>+CONFIGURE_ARGS=	--disable-debug
>+.endif
>+
>+CONFIGURE_ARGS+=--prefix="${PREFIX}" \
>+		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
>+		--enable-static \
>+		--disable-shared \
>+		--enable-pic \
>+		--enable-zlib \
>+		--disable-everything \
>+		--enable-gpl \
>+		--cc="${CC}" \
>+		--cxx="${CXX}" \
>+		--disable-avdevice \
>+    		--disable-filters \
>+    		--disable-programs \
>+    		--disable-network \
>+    		--disable-avfilter \
>+    		--disable-postproc \
>+    		--disable-encoders \
>+    		--disable-doc \
>+    		--disable-ffplay \
>+    		--disable-ffprobe \
>+    		--disable-ffserver \
>+		--disable-ffmpeg \
>+    		--enable-decoder=h264 \
>+    		--enable-decoder=mpeg4 \
>+    		--enable-decoder=h263 \
>+    		--enable-decoder=h263p \
>+    		--enable-decoder=mpeg2video \
>+    		--enable-decoder=mjpeg \
>+    		--enable-decoder=mjpegb \
>+    		--enable-decoder=aac \
>+    		--enable-decoder=aac_latm \
>+    		--enable-decoder=atrac3 \
>+    		--enable-decoder=atrac3p \
>+    		--enable-decoder=mp3 \
>+    		--enable-decoder=pcm_s16le \
>+    		--enable-decoder=pcm_s8 \
>+    		--enable-demuxer=h264 \
>+    		--enable-demuxer=h263 \
>+    		--enable-demuxer=m4v \
>+    		--enable-demuxer=mpegps \
>+    		--enable-demuxer=mpegvideo \
>+    		--enable-demuxer=avi \
>+    		--enable-demuxer=mp3 \
>+    		--enable-demuxer=aac \
>+    		--enable-demuxer=pmp \
>+    		--enable-demuxer=oma \
>+    		--enable-demuxer=pcm_s16le \
>+    		--enable-demuxer=pcm_s8 \
>+    		--enable-demuxer=wav \
>+    		--enable-encoder=ffv1 \
>+    		--enable-encoder=huffyuv \
>+    		--enable-encoder=mpeg4 \
>+    		--enable-encoder=pcm_s16le \
>+    		--enable-muxer=avi \
>+    		--enable-parser=h264 \
>+    		--enable-parser=mpeg4video \
>+    		--enable-parser=mpegvideo \
>+    		--enable-parser=aac \
>+    		--enable-parser=aac_latm \
>+    		--enable-parser=mpegaudio \
>+    		--enable-protocol=file \
>+		--disable-sdl \
>+		--disable-asm \
>+		--disable-iconv \
>+		--disable-vaapi \
>+		--disable-hwaccels
>+
>+OPTIONS_DEFINE=		LTO OPTIMIZED_CFLAGS RTCPU
>+OPTIONS_DEFAULT=	LTO OPTIMIZED_CFLAGS
>+OPTIONS_DEFAULT_amd64=	RTCPU
>+OPTIONS_EXCLUDE_aarch64=RTCPU
>+
>+RTCPU_DESC=		Detect CPU capabilities at runtime
>+
>+LTO_CONFIGURE_ENABLE=	lto
>+
>+OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
>+
>+RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
>+
>+.include <bsd.port.mk>
>diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo
>new file mode 100644
>index 000000000..4707639a5
>--- /dev/null
>+++ b/multimedia/ffmpeg3/distinfo
>@@ -0,0 +1,5 @@
>+TIMESTAMP = 1730140299
>+SHA256 (ffmpeg-3.0.2.tar.xz) = 82943cc7b0c4d14b612404de0dd7b24cd8ca3511d51e4fd3ae36b2d71bb95223
>+SIZE (ffmpeg-3.0.2.tar.xz) = 7461808
>+SHA256 (9c4f84d9d9ad147f4a44cff582829647a0c65420.patch) = 120263d3b5a97e98ed9968d3a69da1e6e0770b870f4d0e5cb30e64a8036bdf60
>+SIZE (9c4f84d9d9ad147f4a44cff582829647a0c65420.patch) = 1135
>diff --git a/multimedia/ffmpeg3/files/patch-configure b/multimedia/ffmpeg3/files/patch-configure
>new file mode 100644
>index 000000000..dc52cf1ac
>--- /dev/null
>+++ b/multimedia/ffmpeg3/files/patch-configure
>@@ -0,0 +1,17 @@
>+--- configure.orig	2024-05-15 16:58:49 UTC
>++++ configure
>+@@ -3024,13 +3024,7 @@ host_os=$target_os_default
>+ target_os_default=$(tolower $(uname -s))
>+ host_os=$target_os_default
>+ 
>+-# machine
>+-if test "$target_os_default" = aix; then
>+-    arch_default=$(uname -p)
>+-    strip_default="strip -X32_64"
>+-else
>+-    arch_default=$(uname -m)
>+-fi
>++arch_default=$(uname -p)
>+ cpu="generic"
>+ intrinsics="none"
>+ 
>diff --git a/multimedia/ffmpeg3/files/patch-libavformat_rtsp.c b/multimedia/ffmpeg3/files/patch-libavformat_rtsp.c
>new file mode 100644
>index 000000000..ba9e13d5b
>--- /dev/null
>+++ b/multimedia/ffmpeg3/files/patch-libavformat_rtsp.c
>@@ -0,0 +1,44 @@
>+--- libavformat/rtsp.c.orig	2024-05-15 16:46:06 UTC
>++++ libavformat/rtsp.c
>+@@ -1607,7 +1607,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, con
>+             }
>+             if (ttl > 0)
>+                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
>+-            getnameinfo((struct sockaddr*) &addr, sizeof(addr),
>++            getnameinfo((struct sockaddr*) &addr,
>++#if HAVE_STRUCT_SOCKADDR_SA_LEN
>++			((struct sockaddr*) &addr)->sa_len,
>++#else
>++			sizeof(addr),
>++#endif
>+                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
>+             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
>+                         port, "%s", optbuf);
>+@@ -1815,8 +1820,13 @@ redirect:
>+         goto fail;
>+     }
>+     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
>+-        getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
>+-                    NULL, 0, NI_NUMERICHOST);
>++        getnameinfo((struct sockaddr*) &peer,
>++#if HAVE_STRUCT_SOCKADDR_SA_LEN
>++		    ((struct sockaddr*) &peer)->sa_len,
>++#else
>++		    peer_len,
>++#endif
>++                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
>+     }
>+ 
>+     /* request options supported by the server; this also detects server
>+@@ -2295,7 +2305,11 @@ static int sdp_read_header(AVFormatContext *s)
>+             AVDictionary *opts = map_to_opts(rt);
>+ 
>+             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
>++#if HAVE_STRUCT_SOCKADDR_SA_LEN
>++			      ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
>++#else
>+                               sizeof(rtsp_st->sdp_ip),
>++#endif
>+                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
>+             if (err) {
>+                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
>diff --git a/multimedia/ffmpeg3/files/patch-libavutil_common.h b/multimedia/ffmpeg3/files/patch-libavutil_common.h
>new file mode 100644
>index 000000000..d1f70b663
>--- /dev/null
>+++ b/multimedia/ffmpeg3/files/patch-libavutil_common.h
>@@ -0,0 +1,13 @@
>+--- libavutil/common.h.orig	2024-05-15 16:55:52 UTC
>++++ libavutil/common.h
>+@@ -50,6 +50,10 @@
>+ #   define AV_NE(be, le) (le)
>+ #endif
>+ 
>++#ifndef		UINT64_C
>++#define		UINT64_C(c)	(c ## UL)
>++#endif
>++
>+ //rounded division & shift
>+ #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
>+ /* assume b>0 */
>diff --git a/multimedia/ffmpeg3/override.mk b/multimedia/ffmpeg3/override.mk
>new file mode 100644
>index 000000000..2141b02b8
>--- /dev/null
>+++ b/multimedia/ffmpeg3/override.mk
>@@ -0,0 +1,8 @@
>+FF_SUFFIX=	3
>+
>+BUILD_DEPENDS:=	${BUILD_DEPENDS:S/ffmpeg/&${FF_SUFFIX}/g}
>+LIB_DEPENDS:=	${LIB_DEPENDS:S/ffmpeg$/&${FF_SUFFIX}/}
>+
>+USES+=		localbase # -isystem
>+CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig"
>+MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig"
>diff --git a/multimedia/ffmpeg3/pkg-descr b/multimedia/ffmpeg3/pkg-descr
>new file mode 100644
>index 000000000..e8c52c22f
>--- /dev/null
>+++ b/multimedia/ffmpeg3/pkg-descr
>@@ -0,0 +1,3 @@
>+FFmpeg is a complete, cross-platform solution to record, convert and stream
>+audio and video. It includes libavcodec - the leading audio/video codec
>+library. This is a custom build of FFmpeg-3.0.2, a legacy version released in 2016, intended for use with PPSSPP.
>diff --git a/multimedia/ffmpeg3/pkg-plist b/multimedia/ffmpeg3/pkg-plist
>new file mode 100644
>index 000000000..a700a4451
>--- /dev/null
>+++ b/multimedia/ffmpeg3/pkg-plist
>@@ -0,0 +1,99 @@
>+include/libavcodec/avcodec.h
>+include/libavcodec/avdct.h
>+include/libavcodec/avfft.h
>+include/libavcodec/d3d11va.h
>+include/libavcodec/dirac.h
>+include/libavcodec/dv_profile.h
>+include/libavcodec/dxva2.h
>+include/libavcodec/qsv.h
>+include/libavcodec/vaapi.h
>+include/libavcodec/vda.h
>+include/libavcodec/vdpau.h
>+include/libavcodec/version.h
>+include/libavcodec/videotoolbox.h
>+include/libavcodec/vorbis_parser.h
>+include/libavcodec/xvmc.h
>+include/libavformat/avformat.h
>+include/libavformat/avio.h
>+include/libavformat/version.h
>+include/libavutil/adler32.h
>+include/libavutil/aes.h
>+include/libavutil/aes_ctr.h
>+include/libavutil/attributes.h
>+include/libavutil/audio_fifo.h
>+include/libavutil/avassert.h
>+include/libavutil/avconfig.h
>+include/libavutil/avstring.h
>+include/libavutil/avutil.h
>+include/libavutil/base64.h
>+include/libavutil/blowfish.h
>+include/libavutil/bprint.h
>+include/libavutil/bswap.h
>+include/libavutil/buffer.h
>+include/libavutil/camellia.h
>+include/libavutil/cast5.h
>+include/libavutil/channel_layout.h
>+include/libavutil/common.h
>+include/libavutil/cpu.h
>+include/libavutil/crc.h
>+include/libavutil/des.h
>+include/libavutil/dict.h
>+include/libavutil/display.h
>+include/libavutil/downmix_info.h
>+include/libavutil/error.h
>+include/libavutil/eval.h
>+include/libavutil/ffversion.h
>+include/libavutil/fifo.h
>+include/libavutil/file.h
>+include/libavutil/frame.h
>+include/libavutil/hash.h
>+include/libavutil/hmac.h
>+include/libavutil/imgutils.h
>+include/libavutil/intfloat.h
>+include/libavutil/intreadwrite.h
>+include/libavutil/lfg.h
>+include/libavutil/log.h
>+include/libavutil/macros.h
>+include/libavutil/mastering_display_metadata.h
>+include/libavutil/mathematics.h
>+include/libavutil/md5.h
>+include/libavutil/mem.h
>+include/libavutil/motion_vector.h
>+include/libavutil/murmur3.h
>+include/libavutil/opt.h
>+include/libavutil/parseutils.h
>+include/libavutil/pixdesc.h
>+include/libavutil/pixelutils.h
>+include/libavutil/pixfmt.h
>+include/libavutil/random_seed.h
>+include/libavutil/rational.h
>+include/libavutil/rc4.h
>+include/libavutil/replaygain.h
>+include/libavutil/ripemd.h
>+include/libavutil/samplefmt.h
>+include/libavutil/sha.h
>+include/libavutil/sha512.h
>+include/libavutil/stereo3d.h
>+include/libavutil/tea.h
>+include/libavutil/threadmessage.h
>+include/libavutil/time.h
>+include/libavutil/timecode.h
>+include/libavutil/timestamp.h
>+include/libavutil/tree.h
>+include/libavutil/twofish.h
>+include/libavutil/version.h
>+include/libavutil/xtea.h
>+include/libswresample/swresample.h
>+include/libswresample/version.h
>+include/libswscale/swscale.h
>+include/libswscale/version.h
>+lib/libavcodec.a
>+lib/libavformat.a
>+lib/libavutil.a
>+lib/libswresample.a
>+lib/libswscale.a
>+libdata/pkgconfig/libavcodec.pc
>+libdata/pkgconfig/libavformat.pc
>+libdata/pkgconfig/libavutil.pc
>+libdata/pkgconfig/libswresample.pc
>+libdata/pkgconfig/libswscale.pc
>-- 
>2.47.0
>

Actions: View | Diff

Attachments on bug 282792: 255210 | 255228 | 255421 | 255422