Page MenuHomeFreeBSD

New port: multimedia/webcamoid: Full featured webcam suite
ClosedPublic

Authored by yuri on Dec 2 2017, 10:22 PM.

Details

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 13286
Build 13522: arc lint + arc unit

Event Timeline

yuri created this revision.Dec 2 2017, 10:22 PM
yuri retitled this revision from New port: Full featured webcam suite to New port: multimedia/webcamoid: Full featured webcam suite.Dec 2 2017, 10:22 PM
tcberner added inline comments.Dec 2 2017, 10:36 PM
multimedia/webcamoid/Makefile
17

^ depends twice on the same port

yuri marked an inline comment as done.Dec 2 2017, 10:43 PM
yuri updated this revision to Diff 36133.Dec 3 2017, 5:29 AM

Removed qmake_build, it's a duplicate.

tcberner added inline comments.Dec 3 2017, 8:14 AM
multimedia/webcamoid/pkg-plist
87

this should'n these two files be installed to QT_QMLDIR? (which would be lib/qt5/qml).

yuri marked an inline comment as done.Dec 3 2017, 8:24 AM
yuri added inline comments.
multimedia/webcamoid/pkg-plist
87

That's the upstream bug. I also noticed it, but I didn't think it was reasonable to patch it.

https://github.com/webcamoid/webcamoid/issues/102

yuri marked 2 inline comments as done.Dec 3 2017, 8:24 AM

The patch should be pretty simple to replace the fallback by $$[QT_INSTALL_QML] for INSTALLQMLDIR in commons.pri:

-isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $${LIBDIR}/qt/qml
+isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $$[QT_INSTALL_QML]
yuri added a comment.Dec 3 2017, 8:58 AM

The patch should be pretty simple to replace the fallback by $$[QT_INSTALL_QML] for INSTALLQMLDIR in commons.pri:

-isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $${LIBDIR}/qt/qml
+isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $$[QT_INSTALL_QML]

https://github.com/webcamoid/webcamoid/pull/103

I would add the url to the issue at the top of the two patches -- that way, one directly sees that they have been upstreamed.
Also you could simply add your git-commit as a patch (i..e. one patch for the two current ones). If you call it something like "patch-git_XXXXXX" it is also clearer that

  • this patch can probably be dropped in a future update
  • as it will likely be part of the next release
yuri added a comment.EditedDec 3 2017, 4:47 PM
In D13348#278583, @yuri wrote:

The patch should be pretty simple to replace the fallback by $$[QT_INSTALL_QML] for INSTALLQMLDIR in commons.pri:

-isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $${LIBDIR}/qt/qml
+isEmpty(INSTALLQMLDIR): INSTALLQMLDIR = $$[QT_INSTALL_QML]

https://github.com/webcamoid/webcamoid/pull/103

The upstream rejected the patch. They said that this is an intended behavior.

yuri updated this revision to Diff 36147.Dec 3 2017, 5:00 PM

Fixed Qml location in a different way.

tcberner accepted this revision.Dec 3 2017, 5:50 PM
tcberner added inline comments.
multimedia/webcamoid/Makefile
28

^ you can drop the comment, I think :)

This revision is now accepted and ready to land.Dec 3 2017, 5:50 PM
This revision was automatically updated to reflect the committed changes.