Bug 270301 - multimedia/subtitlecomposer: Update to snapshot 2023-03-04 (WIP)
Summary: multimedia/subtitlecomposer: Update to snapshot 2023-03-04 (WIP)
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: Max Brazhnikov
URL:
Keywords:
Depends on:
Blocks: 261302
  Show dependency tree / graph
 
Reported: 2023-03-18 10:13 UTC by Daniel Engberg
Modified: 2023-04-09 11:18 UTC (History)
1 user (show)

See Also:
makc: maintainer-feedback+

Attachments
Patch for subtitlecomposer (4.57 KB, patch)
2023-03-18 10:13 UTC, Daniel Engberg 		no flags Details | Diff
Patch for subtitlecomposer v2 (5.21 KB, patch)
2023-03-21 21:07 UTC, Daniel Engberg 		no flags Details | Diff
Show Obsolete (1) 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 10:13:16 UTC 
Created attachment 240939 [details]
Patch for subtitlecomposer

Fixes build with FFmpeg 6.0

Compile tested on FreeBSD 13.2-BETA1 (amd64)

Poudreire complains about:
=>> Error: Files or directories left over:
@dir share/mime/subpicture
share/mime/subpicture/x-pgs.xml
Comment 1 Max Brazhnikov freebsd_committer freebsd_triage 2023-03-18 11:06:18 UTC 
(In reply to Daniel Engberg from comment #0)

> Poudreire complains about:
> =>> Error: Files or directories left over:
> @dir share/mime/subpicture
> share/mime/subpicture/x-pgs.xml

I prefer to ignore it. Upstream is aware of the problem:
https://invent.kde.org/multimedia/subtitlecomposer/-/issues/20
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2023-03-21 21:06:18 UTC 
Poudriere testport OK 12.4-RELEASE (amd64) - FFmpeg 4
Comment 3 Daniel Engberg freebsd_committer freebsd_triage 2023-03-21 21:07:29 UTC 
Created attachment 241044 [details]
Patch for subtitlecomposer v2

Drop mime file
Comment 4 Max Brazhnikov freebsd_committer freebsd_triage 2023-03-22 10:00:15 UTC 
(In reply to Daniel Engberg from comment #3)
No, Daniel, removing the file is overkill. If you really eager to pacify stage-qa, I suggest to patch out only <mime-type type="subpicture/x-pgs">…</mime-type> from the subtitlecomposer.xml.
Comment 5 Daniel Engberg freebsd_committer freebsd_triage 2023-04-08 09:27:36 UTC 
Hi Max,

Can you please adjust the patch so  we can get this in?

Best regards,
Daniel
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-04-09 10:48:12 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=59641eb229a03d2a88b75fb2925dee28a00c03cd

commit 59641eb229a03d2a88b75fb2925dee28a00c03cd
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2023-04-09 10:45:27 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2023-04-09 10:45:27 +0000

    multimedia/subtitlecomposer: update to git snapshot 2023.04.04

    - Update to git snapshot which fixes build with FFmpeg 6.0
    - Patch shared mime-info to pacify stage-qa

    PR:     270301

 multimedia/subtitlecomposer/Makefile               |  8 ++++----
 multimedia/subtitlecomposer/distinfo               |  6 +++---
 .../files/patch-src_CMakeLists.txt                 |  4 ++--
 .../files/patch-src_subtitlecomposer.xml (new)     | 17 +++++++++++++++++
 multimedia/subtitlecomposer/pkg-plist              | 22 +++++++++-------------
 5 files changed, 35 insertions(+), 22 deletions(-)
Comment 7 Daniel Engberg freebsd_committer freebsd_triage 2023-04-09 11:18:52 UTC 
Great, thanks!