View | Details | Raw Unified | Return to bug 282792 | Differences between
and this patch

Collapse All | Expand All

(-)b/emulators/ppsspp/Makefile (-9 / +10 lines)
Lines 1-7 Link Here
1
PORTNAME=	ppsspp
1
PORTNAME=	ppsspp
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION?=	1.17.1
3
DISTVERSION?=	1.18.1
4
PORTREVISION?=	1
5
CATEGORIES=	emulators
4
CATEGORIES=	emulators
6
# XXX Get from Debian once #697821 lands
5
# XXX Get from Debian once #697821 lands
7
MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
6
MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
Lines 19-46 NOT_FOR_ARCHS= mips mips64 powerpc powerpc64 powerpcspe Link Here
19
NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
18
NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
20
		https://github.com/hrydgard/ppsspp/issues/8823
19
		https://github.com/hrydgard/ppsspp/issues/8823
21
20
21
BUILD_DEPENDS=	/usr/local/ffmpeg3/lib/libavcodec.a:multimedia/ffmpeg3
22
22
LIB_DEPENDS=	libzip.so:archivers/libzip \
23
LIB_DEPENDS=	libzip.so:archivers/libzip \
23
		libsnappy.so:archivers/snappy \
24
		libsnappy.so:archivers/snappy \
24
		libzstd.so:archivers/zstd \
25
		libzstd.so:archivers/zstd \
25
		libavcodec.so:multimedia/ffmpeg \
26
		libopenxr_loader.so:graphics/openxr
26
		libminiupnpc.so:net/miniupnpc
27
RUN_DEPENDS=	xdg-open:devel/xdg-utils
27
RUN_DEPENDS=	xdg-open:devel/xdg-utils
28
28
29
USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig
29
USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig
30
USE_GITHUB=	yes
30
USE_GITHUB=	yes
31
GH_ACCOUNT=	hrydgard
31
GH_ACCOUNT=	hrydgard
32
GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
32
GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
33
		google:cpu_features:v0.8.0-27-gfd4ffc1:cpu_features/ext/cpu_features \
33
		google:cpu_features:v0.9.0-gfd4ffc1:cpu_features/ext/cpu_features \
34
		rtissera:libchdr:26d27ca:libchdr/ext/libchdr \
34
		rtissera:libchdr:26d27ca:libchdr/ext/libchdr \
35
		unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \
35
		unknownbrackets:ppsspp-debugger:d358a87:debugger/assets/debugger \
36
		KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \
36
		KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \
37
		Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \
37
		Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \
38
		Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \
38
		Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \
39
		RetroAchievements:rcheevos:v11.0.0-26-ge7989c3:rcheevos/ext/rcheevos \
39
		RetroAchievements:rcheevos:v11.6.0-g32917bd:rcheevos/ext/rcheevos \
40
		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson
40
		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson \
41
		miniupnp:miniupnp:miniupnpd_2_3_7-g27d13ca:miniupnp/ext/miniupnp
41
EXCLUDE=	libzip zlib
42
EXCLUDE=	libzip zlib
42
USE_GL=		glew opengl
43
USE_GL=		glew opengl
43
CMAKE_ON=	${FFMPEG LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
44
CMAKE_ON=	${LIBZIP SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
44
CMAKE_OFF=	USE_DISCORD
45
CMAKE_OFF=	USE_DISCORD
45
LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network
46
LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network
46
CONFLICTS_INSTALL=	${PORTNAME}-*
47
CONFLICTS_INSTALL=	${PORTNAME}-*
(-)b/emulators/ppsspp/distinfo (-9 / +11 lines)
Lines 1-23 Link Here
1
TIMESTAMP = 1707052082
1
TIMESTAMP = 1731811906
2
SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
2
SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
3
SIZE (ppsspp.1) = 1598
3
SIZE (ppsspp.1) = 1598
4
SHA256 (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = dd65e7a317cd461386a1641ddf475686d8bdb2f408bdae910386d8b3ca6a8195
4
SHA256 (hrydgard-ppsspp-v1.18.1_GH0.tar.gz) = cc9425202552cbce8bc7ee5b883670703761011ab5c987c426887f7c2ef2703f
5
SIZE (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = 41876096
5
SIZE (hrydgard-ppsspp-v1.18.1_GH0.tar.gz) = 37089272
6
SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7
6
SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7
7
SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872
7
SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872
8
SHA256 (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 0bcb1a537b8fc184b9df9ddde9d15868efe7f651139ea84d3e20ac9900a43c60
8
SHA256 (google-cpu_features-v0.9.0-gfd4ffc1_GH0.tar.gz) = 971ccd178d6435a4718f13e8f14aa5ef52d2d4b3dcbfc113e9ad96cdbe32d4c8
9
SIZE (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 109044
9
SIZE (google-cpu_features-v0.9.0-gfd4ffc1_GH0.tar.gz) = 109034
10
SHA256 (rtissera-libchdr-26d27ca_GH0.tar.gz) = 49e028fadd0640926da158408c9eafb22fc89ccb0de69c67b167ef0a11f6a0c5
10
SHA256 (rtissera-libchdr-26d27ca_GH0.tar.gz) = 49e028fadd0640926da158408c9eafb22fc89ccb0de69c67b167ef0a11f6a0c5
11
SIZE (rtissera-libchdr-26d27ca_GH0.tar.gz) = 4274377
11
SIZE (rtissera-libchdr-26d27ca_GH0.tar.gz) = 4274377
12
SHA256 (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = adc88664cb127b7797b03ffe07274096ac8ac037f143bf636b6208084c47e4d7
12
SHA256 (unknownbrackets-ppsspp-debugger-d358a87_GH0.tar.gz) = 468ec2ca27aefa81657bc679c0983dbbd693b99e8b803a465bb42cd8e2993cb2
13
SIZE (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = 810213
13
SIZE (unknownbrackets-ppsspp-debugger-d358a87_GH0.tar.gz) = 815889
14
SHA256 (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = a1695022880e7ef3c2d407647f79876045dc2a3ed012753adc71ead5cc5178ba
14
SHA256 (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = a1695022880e7ef3c2d407647f79876045dc2a3ed012753adc71ead5cc5178ba
15
SIZE (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = 1707048
15
SIZE (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = 1707048
16
SHA256 (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 8a46d92b070de90cefcd89c2894344d040481e1cf6216b31f4a5e531254fed88
16
SHA256 (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 8a46d92b070de90cefcd89c2894344d040481e1cf6216b31f4a5e531254fed88
17
SIZE (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 223306
17
SIZE (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 223306
18
SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604
18
SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604
19
SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401
19
SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401
20
SHA256 (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 9b1374b2c82c67850481dbee21946d5b4acb5c45d0284e85e58fa0e68f7d24f8
20
SHA256 (RetroAchievements-rcheevos-v11.6.0-g32917bd_GH0.tar.gz) = 0cf21acaa01f3fc55718e5fd04cfd55a03d3135ec52f928dcd5956a11e78d660
21
SIZE (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 650457
21
SIZE (RetroAchievements-rcheevos-v11.6.0-g32917bd_GH0.tar.gz) = 673529
22
SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe
22
SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe
23
SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127
23
SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127
24
SHA256 (miniupnp-miniupnp-miniupnpd_2_3_7-g27d13ca_GH0.tar.gz) = d44ea2ea688ff851e55d9408bc64b4c81363a9d6646246b9cbcd2c2c057ec8bc
25
SIZE (miniupnp-miniupnp-miniupnpd_2_3_7-g27d13ca_GH0.tar.gz) = 464237
(-)a/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp (-25 lines)
Removed Link Here
1
--- Core/Util/PortManager.cpp.orig	2024-02-04 13:08:02 UTC
2
+++ Core/Util/PortManager.cpp
3
@@ -161,7 +161,21 @@ bool PortManager::Initialize(const unsigned int timeou
4
 
5
 		// Get LAN IP address that connects to the router
6
 		char lanaddr[64] = "unset";
7
-		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
8
+/*
9
+possible "status" values:
10
+-1 = Internal error
11
+ 0 = NO IGD found
12
+ 1 = A valid connected IGD has been found
13
+ 2 = A valid connected IGD has been found but its IP address is reserved (non routable)
14
+ 3 = A valid IGD has been found but it reported as not connected
15
+ 4 = an UPnP device has been found but was not recognized as an IGD
16
+*/
17
+		int status =
18
+#if (MINIUPNPC_API_VERSION >= 18)
19
+			UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr), nullptr, 0);
20
+#else
21
+			UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr));
22
+#endif
23
 		m_lanip = std::string(lanaddr);
24
 		INFO_LOG(SCENET, "PortManager - Detected LAN IP: %s", m_lanip.c_str());
25
 
(-)b/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake (+36 lines)
Added Link Here
1
--- cmake/Modules/FindFFmpeg.cmake.orig	2024-02-04 13:08:02 UTC
2
+++ cmake/Modules/FindFFmpeg.cmake
3
@@ -56,9 +56,7 @@ function(find_ffmpeg LIBNAME)
4
 set(_FFmpeg_HEADER_swscale swscale)
5
 
6
 function(find_ffmpeg LIBNAME)
7
-  if(DEFINED ENV{FFMPEG_DIR})
8
-    set(FFMPEG_DIR $ENV{FFMPEG_DIR})
9
-  endif()
10
+  set(FFMPEG_DIR /usr/local/ffmpeg3)
11
 
12
   if(FFMPEG_DIR)
13
     list(APPEND INCLUDE_PATHS
14
@@ -79,17 +77,13 @@ function(find_ffmpeg LIBNAME)
15
       NO_CMAKE_FIND_ROOT_PATH
16
     )
17
   else()
18
-    list(APPEND INCLUDE_PATHS
19
-      /usr/local/include/ffmpeg
20
-      /usr/local/include/lib${LIBNAME}
21
-      /usr/include/ffmpeg
22
-      /usr/include/lib${LIBNAME}
23
-      /usr/include/ffmpeg/lib${LIBNAME}
24
+    list(SET INCLUDE_PATHS
25
+      /usr/local/ffmpeg3/include/ffmpeg
26
+      /usr/local/ffmpeg3/include/lib${LIBNAME}
27
     )
28
 
29
-    list(APPEND LIB_PATHS
30
-      /usr/local/lib
31
-      /usr/lib
32
+    list(SET LIB_PATHS
33
+      /usr/local/ffmpeg3/lib
34
     )
35
   endif()
36
 
(-)a/emulators/ppsspp/files/patch-ffmpeg5 (-13 lines)
Removed Link Here
1
https://github.com/hrydgard/ppsspp/issues/15308
2
3
--- Core/HW/SimpleAudioDec.h.orig	2023-01-03 10:14:31 UTC
4
+++ Core/HW/SimpleAudioDec.h
5
@@ -78,7 +78,7 @@ class SimpleAudio { (private)
6
 	int wanted_resample_freq; // wanted resampling rate/frequency
7
 
8
 	AVFrame *frame_;
9
-	AVCodec *codec_;
10
+	const AVCodec *codec_;
11
 	AVCodecContext  *codecCtx_;
12
 	SwrContext      *swrCtx_;
13
 
(-)a/emulators/ppsspp/files/patch-no-egl (-18 lines)
Removed Link Here
1
EGL hangs on X11 and doesn't build without GLESv2.
2
https://github.com/hrydgard/ppsspp/issues/10626
3
4
--- CMakeLists.txt.orig	2022-07-08 09:11:27 UTC
5
+++ CMakeLists.txt
6
@@ -77,12 +77,6 @@ endif()
7
 	set(USE_SYSTEM_FFMPEG ON)
8
 endif()
9
 
10
-if(NOT ANDROID AND NOT IOS)
11
-	if(ARM_DEVICE OR SIMULATOR)
12
-		set(USING_EGL ON)
13
-	endif()
14
-endif()
15
-
16
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT USE_LIBNX)
17
 	set(LINUX ON)
18
 	add_definitions(-D__STDC_CONSTANT_MACROS)
(-)b/emulators/ppsspp/files/patch-no-egl-plus-warnings-fix (+33 lines)
Added Link Here
1
EGL hangs on X11 and doesn't build without GLESv2.
2
https://github.com/hrydgard/ppsspp/issues/10626
3
4
--- CMakeLists.txt.orig	2024-11-04 16:16:10 UTC
5
+++ CMakeLists.txt
6
@@ -79,12 +79,6 @@ endif()
7
 	set(USE_SYSTEM_FFMPEG ON)
8
 endif()
9
 
10
-if(NOT ANDROID AND NOT IOS)
11
-	if(ARM_DEVICE OR SIMULATOR)
12
-		set(USING_EGL ON)
13
-	endif()
14
-endif()
15
-
16
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT USE_LIBNX)
17
 	set(LINUX ON)
18
 	add_definitions(-D__STDC_CONSTANT_MACROS)
19
@@ -383,8 +377,12 @@ if(NOT MSVC)
20
 	add_definitions(-DPNG_ARM_NEON_OPT=0)
21
 
22
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wno-unused-function -Wno-sign-compare -Wno-unused-but-set-variable -Wno-reorder -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-variable")
23
-	# This one is very useful but has many false positives.
24
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
25
+	if(NOT CLANG)
26
+		# This one is very useful but has many false positives.
27
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
28
+	else()
29
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
30
+	endif()
31
 
32
 	if(ANDROID)
33
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
(-)b/multimedia/Makefile (+1 lines)
Lines 417-419 Link Here
417
    SUBDIR += zoneminder
417
    SUBDIR += zoneminder
418
418
419
.include <bsd.port.subdir.mk>
419
.include <bsd.port.subdir.mk>
420
    SUBDIR += ffmpeg3
(-)b/multimedia/ffmpeg3/Makefile (+128 lines)
Added Link Here
1
PORTNAME=	ffmpeg
2
PORTVERSION=	3.0.2
3
CATEGORIES=	multimedia audio net
4
MASTER_SITES=	https://ffmpeg.org/releases/
5
PKGNAMESUFFIX=	3
6
7
PATCH_SITES=	https://github.com/hrydgard/ppsspp-ffmpeg/commit/
8
PATCHFILES=	9c4f84d9d9ad147f4a44cff582829647a0c65420.patch:-p1
9
10
MAINTAINER=	kreinholz@gmail.com
11
COMMENT=	Realtime audio/video encoder/converter and streaming server (legacy 3.* series)
12
WWW=		https://ffmpeg.org/
13
14
LICENSE=	GPLv2+ LGPL21+
15
LICENSE_COMB=	multi
16
17
NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe
18
NOT_FOR_ARCHS_REASON=	emulators/ppsspp only supports little-endian, see \
19
		https://github.com/hrydgard/ppsspp/issues/8823
20
21
USES=		compiler:c11 cpe gmake localbase:ldflags perl5 pkgconfig \
22
		shebangfix tar:xz
23
USE_PERL5=	build
24
SHEBANG_FILES=	doc/texi2pod.pl
25
USE_LDCONFIG=	yes
26
27
.ifdef PKGNAMESUFFIX
28
PORTSCOUT=	limit:^3\.
29
PREFIX=		${LOCALBASE}/${PKGBASE} # avoid conflict with the default
30
.endif
31
32
HAS_CONFIGURE=	yes
33
CONFIGURE_LOG=	ffbuild/config.log
34
35
LDFLAGS_aarch64=-Wl,-z,notext
36
37
INSTALL_TARGET=	install-libs install-headers
38
39
NOPRECIOUSMAKEVARS=	yes
40
MAKE_ENV+=	V=1
41
42
.if defined(WITH_DEBUG)
43
CONFIGURE_ARGS=	--disable-stripping
44
.else
45
CONFIGURE_ARGS=	--disable-debug
46
.endif
47
48
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
49
		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
50
		--enable-static \
51
		--disable-shared \
52
		--enable-pic \
53
		--enable-zlib \
54
		--disable-everything \
55
		--enable-gpl \
56
		--cc="${CC}" \
57
		--cxx="${CXX}" \
58
		--disable-avdevice \
59
    		--disable-filters \
60
    		--disable-programs \
61
    		--disable-network \
62
    		--disable-avfilter \
63
    		--disable-postproc \
64
    		--disable-encoders \
65
    		--disable-doc \
66
    		--disable-ffplay \
67
    		--disable-ffprobe \
68
    		--disable-ffserver \
69
		--disable-ffmpeg \
70
    		--enable-decoder=h264 \
71
    		--enable-decoder=mpeg4 \
72
    		--enable-decoder=h263 \
73
    		--enable-decoder=h263p \
74
    		--enable-decoder=mpeg2video \
75
    		--enable-decoder=mjpeg \
76
    		--enable-decoder=mjpegb \
77
    		--enable-decoder=aac \
78
    		--enable-decoder=aac_latm \
79
    		--enable-decoder=atrac3 \
80
    		--enable-decoder=atrac3p \
81
    		--enable-decoder=mp3 \
82
    		--enable-decoder=pcm_s16le \
83
    		--enable-decoder=pcm_s8 \
84
    		--enable-demuxer=h264 \
85
    		--enable-demuxer=h263 \
86
    		--enable-demuxer=m4v \
87
    		--enable-demuxer=mpegps \
88
    		--enable-demuxer=mpegvideo \
89
    		--enable-demuxer=avi \
90
    		--enable-demuxer=mp3 \
91
    		--enable-demuxer=aac \
92
    		--enable-demuxer=pmp \
93
    		--enable-demuxer=oma \
94
    		--enable-demuxer=pcm_s16le \
95
    		--enable-demuxer=pcm_s8 \
96
    		--enable-demuxer=wav \
97
    		--enable-encoder=ffv1 \
98
    		--enable-encoder=huffyuv \
99
    		--enable-encoder=mpeg4 \
100
    		--enable-encoder=pcm_s16le \
101
    		--enable-muxer=avi \
102
    		--enable-parser=h264 \
103
    		--enable-parser=mpeg4video \
104
    		--enable-parser=mpegvideo \
105
    		--enable-parser=aac \
106
    		--enable-parser=aac_latm \
107
    		--enable-parser=mpegaudio \
108
    		--enable-protocol=file \
109
		--disable-sdl \
110
		--disable-asm \
111
		--disable-iconv \
112
		--disable-vaapi \
113
		--disable-hwaccels
114
115
OPTIONS_DEFINE=		LTO OPTIMIZED_CFLAGS RTCPU
116
OPTIONS_DEFAULT=	LTO OPTIMIZED_CFLAGS
117
OPTIONS_DEFAULT_amd64=	RTCPU
118
OPTIONS_EXCLUDE_aarch64=RTCPU
119
120
RTCPU_DESC=		Detect CPU capabilities at runtime
121
122
LTO_CONFIGURE_ENABLE=	lto
123
124
OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
125
126
RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
127
128
.include <bsd.port.mk>
(-)b/multimedia/ffmpeg3/distinfo (+5 lines)
Added Link Here
1
TIMESTAMP = 1730140299
2
SHA256 (ffmpeg-3.0.2.tar.xz) = 82943cc7b0c4d14b612404de0dd7b24cd8ca3511d51e4fd3ae36b2d71bb95223
3
SIZE (ffmpeg-3.0.2.tar.xz) = 7461808
4
SHA256 (9c4f84d9d9ad147f4a44cff582829647a0c65420.patch) = 120263d3b5a97e98ed9968d3a69da1e6e0770b870f4d0e5cb30e64a8036bdf60
5
SIZE (9c4f84d9d9ad147f4a44cff582829647a0c65420.patch) = 1135
(-)b/multimedia/ffmpeg3/files/patch-configure (+17 lines)
Added Link Here
1
--- configure.orig	2024-05-15 16:58:49 UTC
2
+++ configure
3
@@ -3024,13 +3024,7 @@ host_os=$target_os_default
4
 target_os_default=$(tolower $(uname -s))
5
 host_os=$target_os_default
6
 
7
-# machine
8
-if test "$target_os_default" = aix; then
9
-    arch_default=$(uname -p)
10
-    strip_default="strip -X32_64"
11
-else
12
-    arch_default=$(uname -m)
13
-fi
14
+arch_default=$(uname -p)
15
 cpu="generic"
16
 intrinsics="none"
17
 
(-)b/multimedia/ffmpeg3/files/patch-libavformat_rtsp.c (+44 lines)
Added Link Here
1
--- libavformat/rtsp.c.orig	2024-05-15 16:46:06 UTC
2
+++ libavformat/rtsp.c
3
@@ -1607,7 +1607,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, con
4
             }
5
             if (ttl > 0)
6
                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
7
-            getnameinfo((struct sockaddr*) &addr, sizeof(addr),
8
+            getnameinfo((struct sockaddr*) &addr,
9
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
10
+			((struct sockaddr*) &addr)->sa_len,
11
+#else
12
+			sizeof(addr),
13
+#endif
14
                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
15
             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
16
                         port, "%s", optbuf);
17
@@ -1815,8 +1820,13 @@ redirect:
18
         goto fail;
19
     }
20
     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
21
-        getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
22
-                    NULL, 0, NI_NUMERICHOST);
23
+        getnameinfo((struct sockaddr*) &peer,
24
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
25
+		    ((struct sockaddr*) &peer)->sa_len,
26
+#else
27
+		    peer_len,
28
+#endif
29
+                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
30
     }
31
 
32
     /* request options supported by the server; this also detects server
33
@@ -2295,7 +2305,11 @@ static int sdp_read_header(AVFormatContext *s)
34
             AVDictionary *opts = map_to_opts(rt);
35
 
36
             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
37
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
38
+			      ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
39
+#else
40
                               sizeof(rtsp_st->sdp_ip),
41
+#endif
42
                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
43
             if (err) {
44
                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
(-)b/multimedia/ffmpeg3/files/patch-libavutil_common.h (+13 lines)
Added Link Here
1
--- libavutil/common.h.orig	2024-05-15 16:55:52 UTC
2
+++ libavutil/common.h
3
@@ -50,6 +50,10 @@
4
 #   define AV_NE(be, le) (le)
5
 #endif
6
 
7
+#ifndef		UINT64_C
8
+#define		UINT64_C(c)	(c ## UL)
9
+#endif
10
+
11
 //rounded division & shift
12
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
13
 /* assume b>0 */
(-)b/multimedia/ffmpeg3/override.mk (+8 lines)
Added Link Here
1
FF_SUFFIX=	3
2
3
BUILD_DEPENDS:=	${BUILD_DEPENDS:S/ffmpeg/&${FF_SUFFIX}/g}
4
LIB_DEPENDS:=	${LIB_DEPENDS:S/ffmpeg$/&${FF_SUFFIX}/}
5
6
USES+=		localbase # -isystem
7
CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig"
8
MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig"
(-)b/multimedia/ffmpeg3/pkg-descr (+3 lines)
Added Link Here
1
FFmpeg is a complete, cross-platform solution to record, convert and stream
2
audio and video. It includes libavcodec - the leading audio/video codec
3
library. This is a custom build of FFmpeg-3.0.2, a legacy version released in 2016, intended for use with PPSSPP.
(-)b/multimedia/ffmpeg3/pkg-plist (-1 / +99 lines)
Added Link Here
0
- 
1
include/libavcodec/avcodec.h
2
include/libavcodec/avdct.h
3
include/libavcodec/avfft.h
4
include/libavcodec/d3d11va.h
5
include/libavcodec/dirac.h
6
include/libavcodec/dv_profile.h
7
include/libavcodec/dxva2.h
8
include/libavcodec/qsv.h
9
include/libavcodec/vaapi.h
10
include/libavcodec/vda.h
11
include/libavcodec/vdpau.h
12
include/libavcodec/version.h
13
include/libavcodec/videotoolbox.h
14
include/libavcodec/vorbis_parser.h
15
include/libavcodec/xvmc.h
16
include/libavformat/avformat.h
17
include/libavformat/avio.h
18
include/libavformat/version.h
19
include/libavutil/adler32.h
20
include/libavutil/aes.h
21
include/libavutil/aes_ctr.h
22
include/libavutil/attributes.h
23
include/libavutil/audio_fifo.h
24
include/libavutil/avassert.h
25
include/libavutil/avconfig.h
26
include/libavutil/avstring.h
27
include/libavutil/avutil.h
28
include/libavutil/base64.h
29
include/libavutil/blowfish.h
30
include/libavutil/bprint.h
31
include/libavutil/bswap.h
32
include/libavutil/buffer.h
33
include/libavutil/camellia.h
34
include/libavutil/cast5.h
35
include/libavutil/channel_layout.h
36
include/libavutil/common.h
37
include/libavutil/cpu.h
38
include/libavutil/crc.h
39
include/libavutil/des.h
40
include/libavutil/dict.h
41
include/libavutil/display.h
42
include/libavutil/downmix_info.h
43
include/libavutil/error.h
44
include/libavutil/eval.h
45
include/libavutil/ffversion.h
46
include/libavutil/fifo.h
47
include/libavutil/file.h
48
include/libavutil/frame.h
49
include/libavutil/hash.h
50
include/libavutil/hmac.h
51
include/libavutil/imgutils.h
52
include/libavutil/intfloat.h
53
include/libavutil/intreadwrite.h
54
include/libavutil/lfg.h
55
include/libavutil/log.h
56
include/libavutil/macros.h
57
include/libavutil/mastering_display_metadata.h
58
include/libavutil/mathematics.h
59
include/libavutil/md5.h
60
include/libavutil/mem.h
61
include/libavutil/motion_vector.h
62
include/libavutil/murmur3.h
63
include/libavutil/opt.h
64
include/libavutil/parseutils.h
65
include/libavutil/pixdesc.h
66
include/libavutil/pixelutils.h
67
include/libavutil/pixfmt.h
68
include/libavutil/random_seed.h
69
include/libavutil/rational.h
70
include/libavutil/rc4.h
71
include/libavutil/replaygain.h
72
include/libavutil/ripemd.h
73
include/libavutil/samplefmt.h
74
include/libavutil/sha.h
75
include/libavutil/sha512.h
76
include/libavutil/stereo3d.h
77
include/libavutil/tea.h
78
include/libavutil/threadmessage.h
79
include/libavutil/time.h
80
include/libavutil/timecode.h
81
include/libavutil/timestamp.h
82
include/libavutil/tree.h
83
include/libavutil/twofish.h
84
include/libavutil/version.h
85
include/libavutil/xtea.h
86
include/libswresample/swresample.h
87
include/libswresample/version.h
88
include/libswscale/swscale.h
89
include/libswscale/version.h
90
lib/libavcodec.a
91
lib/libavformat.a
92
lib/libavutil.a
93
lib/libswresample.a
94
lib/libswscale.a
95
libdata/pkgconfig/libavcodec.pc
96
libdata/pkgconfig/libavformat.pc
97
libdata/pkgconfig/libavutil.pc
98
libdata/pkgconfig/libswresample.pc
99
libdata/pkgconfig/libswscale.pc

Return to bug 282792