Bug 270313 - net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0
Summary: net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Richard Gallamore
URL:
Keywords:
Depends on:
Blocks: 261302
  Show dependency tree / graph
 
Reported: 2023-03-18 12:26 UTC by Daniel Engberg
Modified: 2023-04-10 08:36 UTC (History)
0 users

See Also:
ultima: maintainer-feedback+

Attachments
Patch for guacamole-server (1.51 KB, patch)
2023-03-18 12:26 UTC, Daniel Engberg 		ultima: maintainer-approval+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Engberg freebsd_committer freebsd_triage 2023-03-18 12:26:17 UTC 
Created attachment 240948 [details]
Patch for guacamole-server

Use upstream release archive as recommended by Porters Handbook
Backport upstream commit 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d to fix build with FFmpeg 6.0

References:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261302#c46
https://github.com/apache/guacamole-server/commit/5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch

Compile tested on FreeBSD 13.2-BETA1 (amd64)
Poudriere testport OK 12.3-RELEASE (amd64)
Comment 1 Daniel Engberg freebsd_committer freebsd_triage 2023-03-21 10:00:48 UTC 
Poudriere testport OK 12.4-RELEASE (amd64) - FFmpeg 4
Comment 2 Richard Gallamore freebsd_committer freebsd_triage 2023-03-24 03:49:43 UTC 
Hey Daniel,

Have busy traveling and don't have time to review the patch. If you have tested it and works, then lgtm.
Comment 3 Daniel Engberg freebsd_committer freebsd_triage 2023-03-25 10:03:55 UTC 
Unfortunately for the moment I don't have the ability to runtime test this one, the proposed soft deadline is in 2 weeks so no rush.
Comment 4 Daniel Engberg freebsd_committer freebsd_triage 2023-04-08 09:25:09 UTC 
Hi Richard,

Still busy travelling or can you find some time to test?

Best regards,
Daniel
Comment 5 Richard Gallamore freebsd_committer freebsd_triage 2023-04-08 17:36:50 UTC 
I'm back, working on it now.
Comment 6 Richard Gallamore freebsd_committer freebsd_triage 2023-04-10 01:20:15 UTC 
ltgm, thanks for the help!
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-04-10 08:35:37 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=284339db15d25aae9c32a820bd5a6295686373ed

commit 284339db15d25aae9c32a820bd5a6295686373ed
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-04-10 08:30:03 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-04-10 08:33:39 +0000

    net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0

    Use upstream release archive as recommended by Porters Handbook
    Backport upstream commit 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d to
    fix build with FFmpeg 6.0

    References:
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261302#c46
    https://github.com/apache/guacamole-server/commit/5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch

    PR:             270313
    Reported by:    antoine (via exp-run)
    Reviewed by:    ultima (maintainer)

 net/guacamole-server/Makefile | 7 ++++---
 net/guacamole-server/distinfo | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)
Comment 8 Daniel Engberg freebsd_committer freebsd_triage 2023-04-10 08:36:46 UTC 
Commmitted, thanks!