Created attachment 240932 [details] Patch for libxine Fixed build with FFmpeg 6.0 Compile tested on FreeBSD 13.2-BETA1 (amd64) Poudriere testport OK 12.3-RELEASE (amd64)
Created attachment 240933 [details] Patch for xine Complementary patch for xine
Created attachment 240934 [details] Complementary patch for vdr-plugin-xineliboutput
fernape@ Can you give this a spin preferably on both ffmpeg 4 and 6 if possible?
(In reply to Daniel Engberg from comment #3) OK.
Hummm... building with ffmpeg 4 and these patches, this is what I get when trying to play a video: fernape@beastie:~$ xine vid.mp4 ld-elf.so.1: /usr/local/bin/xine: Undefined symbol "xine_sarray_set_hash" When installing, faad2 lcms libcddb libcdio libcdio-paranoia libfame libmng libmodplug libva-glx libxine popt speex vcdimager xine
That's odd, readelf -s work/stage/usr/local/lib/libxine.so |grep sarray_set_hash 168: 0000000000067760 144 FUNC GLOBAL PROTECTED 12 xine_sarray_set_hash grep -ir xine_sarray_set_hash work/xine-lib-1.2.13/ work/xine-lib-1.2.13/include/xine/sorted_array.h:void xine_sarray_set_hash (xine_sarray_t *sarray, xine_sarray_hash_func_t hash_func, unsigned int hash_size) XINE_PROTECTED; work/xine-lib-1.2.13/src/xine-engine/configfile.c: xine_sarray_set_hash (this->key_index, _config_fat_entry_hash, 16); work/xine-lib-1.2.13/src/xine-engine/load_plugins.c: xine_sarray_set_hash (cfg.list, _cfg_entry_hash, 128); work/xine-lib-1.2.13/src/xine-utils/sorted_array.c:void xine_sarray_set_hash (xine_sarray_t *sarray, xine_sarray_hash_func_t hash_func, unsigned int hash_size) { I did find this patch in Fedoras repo though... https://src.fedoraproject.org/rpms/xine-lib/blob/rawhide/f/xine-lib-1.2.13-ffmpeg6-compatibility.patch Can you give that a try on top and rebuild xine ?
Created attachment 240989 [details] patch for libxine v2 Include compatibility patch for FFmpeg 6.0 from upstream Reference: https://src.fedoraproject.org/rpms/xine-lib/blob/rawhide/f/xine-lib-1.2.13-ffmpeg6-compatibility.patch
The new patch for libxine have it included, I got a bit confused since release and modified date on Sourceforge mismatches (modified is a few days later) so I assumed that this commit was included in the release.
..it could be that it breaks compatibility with older versions of FFmpeg, that seems to be somewhat of a trend with several projects.
Sorry, my bad. I was using the old libxine. Now, it builds in 12.4{adm64,i386}, 13.1amd64 and current. It runs well in 13.1amd64 (limited testing) With ffmpeg6 it also builds fine in Now, it builds in 12.4{adm64,i386}, 13.1amd64 and current.
Thanks for testing, let's push this once FFmpeg 6.0 lands in tree
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ab8e3929ae30a30828d197781ffae6215a82599 commit 6ab8e3929ae30a30828d197781ffae6215a82599 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 10:57:00 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:45 +0000 multimedia/xine: Update path to (lib)xine plugins Update paths due to version bump of (lib)xine PR: 270291 Tested by: fernape multimedia/xine/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=968e42d8918bf1835872056607f4db374c21fe73 commit 968e42d8918bf1835872056607f4db374c21fe73 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 10:54:56 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:45 +0000 multimedia/vdr-plugin-xineliboutput: Update path to (lib)xine plugins Update paths due to version bump of (lib)xine PR: 270291 multimedia/vdr-plugin-xineliboutput/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=e20a7d8cb314dfcfc84b52f1534a3f20feff31dd commit e20a7d8cb314dfcfc84b52f1534a3f20feff31dd Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 10:50:08 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:45 +0000 multimedia/libxine: Update to 1.2.13 Include upstream commits for FFmpeg 6 support Changelog: https://sourceforge.net/projects/xine/files/xine-lib/1.2.13/ PR: 270291 Tested by: fernape multimedia/libxine/Makefile | 12 +- multimedia/libxine/distinfo | 6 +- multimedia/libxine/files/patch-dav1d-1.0 (gone) | 47 ------- .../files/patch-include-xine-xineutils.h (gone) | 22 --- ...tch-src_combined_ffmpeg_demux__avformat.c (new) | 35 +++++ ...-src_combined_ffmpeg_ff__audio__decoder.c (new) | 152 +++++++++++++++++++++ multimedia/libxine/pkg-plist | 2 +- 7 files changed, 197 insertions(+), 79 deletions(-)