On 2021/09/16 09:51, Stuart Henderson wrote:
> On 2021/09/16 12:38, Rafael Sadowski wrote:
> > On Thu Sep 16, 2021 at 08:58:02AM +0100, Stuart Henderson wrote:
> > > On 2021/09/16 09:37, Rafael Sadowski wrote:
> > > > On Wed Sep 15, 2021 at 11:03:12PM +0100, Stuart Henderson wrote:
> > > > > No qt dependency is listed for no_x11 so these can be randomly
> > > > > present and
> > > > > removed during the build.
> > > > >
> > > >
> > > > It comes with/from the qt5 module:
> > > >
> > > > env FLAVOR="no_x11" make show=LIB_DEPENDS
> > > > audio/flac audio/libogg audio/libvorbis devel/fmt devel/gettext,-runtime
> > > > devel/gmp devel/libdvdread STEM->=1.6.2:multimedia/libmatroska
> > > > STEM->=1.4.0:textproc/libebml textproc/pugixml x11/qt5/qtbase,-main
> > >
> > > Oh... Is there any point to a no_x11 flavour which depends on Qt?
> > >
> >
> > I asked for the same question
> > https://marc.info/?l=openbsd-ports&m=162954307913481&w=2
> >
>
> FWIW my vote would be to simplify the port and remove the flavour.
>
BTW I hit the build error too, this is how it looks in config.log:
configure:8750: checking for Qt 6
configure:8752: result: no: disabled by user request
configure:8828: checking for qmake-qt5
configure:8846: found /usr/local/bin/qmake-qt5
configure:8858: result: /usr/local/bin/qmake-qt5
configure:8996: checking for qmake's version
configure:9007: result: 5.15.2
configure:9019: checking for lconvert
configure:9049: result: /usr/local/lib/qt5/bin/lconvert
configure:9059: checking for moc
configure:9089: result: /usr/local/bin/moc-qt5
configure:9099: checking for rcc
configure:9117: found /usr/local/lib/qt5/bin/rcc
configure:9129: result: /usr/local/lib/qt5/bin/rcc
configure:9139: checking for uic
configure:9169: result: /usr/local/bin/uic-qt5
configure:9224: $PKG_CONFIG --exists --print-errors
"$with_qt_pkg_config_modules"
Package Qt5Multimedia was not found in the pkg-config search path
configure:9227: $? = 1
configure:9234: $PKG_CONFIG --exists --print-errors "Qt5PlatformSupport"
Package Qt5PlatformSupport was not found in the pkg-config search path
configure:9237: $? = 1
configure:9243: checking for Qt 5
configure:9245: result: no: not found by pkg-config
configure:9481: error: The Qt library is required for building MKVToolNix.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile 7 Sep 2021 05:58:12 -0000 1.106
+++ Makefile 16 Sep 2021 20:23:26 -0000
@@ -3,6 +3,7 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-60.0.0
+REVISION= 0
CATEGORIES= multimedia x11
@@ -13,8 +14,10 @@ MAINTAINER= Rafael Sadowski <rsadowski@o
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC Qt5Core c dvdread ebml fmt
-WANTLIB += gmp iconv intl m matroska ogg pugixml vorbis z
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += FLAC Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5Widgets c cmark dvdread ebml fmt gmp
+WANTLIB += iconv intl m matroska ogg pugixml vorbis z
MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -47,13 +50,17 @@ LIB_DEPENDS= audio/flac \
devel/gmp \
devel/libdvdread \
multimedia/libmatroska>=1.6.2 \
+ textproc/cmark \
textproc/libebml>=1.4.0 \
- textproc/pugixml
+ textproc/pugixml \
+ x11/qt5/qtmultimedia
-MAKE_ENV+= V=1
+RUN_DEPENDS= devel/desktop-file-utils \
+ misc/shared-mime-info \
+ x11/gtk+3,-guic
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.71
CONFIGURE_ARGS= --disable-optimization \
--disable-update-check \
@@ -64,30 +71,13 @@ CONFIGURE_ARGS= --disable-optimization \
--with-boost-regex=boost_regex \
--with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook
+MAKE_ENV+= V=1
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${MODQT5_LIBDIR}
CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt5/bin/lconvert" \
CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
-
-FLAVORS= no_x11
-FLAVOR?=
-
-.if ${FLAVOR:Mno_x11}
-CONFIGURE_ARGS+= --disable-gui
-.else
-
-WANTLIB += Qt5Concurrent Qt5DBus Qt5Gui Qt5Multimedia
-WANTLIB += Qt5Network Qt5Widgets cmark
-
-LIB_DEPENDS+= textproc/cmark \
- x11/qt5/qtmultimedia
-
-RUN_DEPENDS+= devel/desktop-file-utils \
- misc/shared-mime-info \
- x11/gtk+3,-guic
-.endif
pre-patch:
@cd ${WRKSRC}/src/mkvtoolnix-gui/jobs/program_runner/ && \
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: pkg/PFRAG.no-no_x11
diff -N pkg/PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 21 Oct 2018 08:17:41 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.14 2018/10/21 08:17:41 rsadowski Exp $
-@bin bin/mkvtoolnix-gui
-@man man/man1/mkvtoolnix-gui.1
-share/applications/org.bunkus.mkvtoolnix-gui.desktop
-share/icons/hicolor/128x128/apps/mkvextract.png
-share/icons/hicolor/128x128/apps/mkvinfo.png
-share/icons/hicolor/128x128/apps/mkvmerge.png
-share/icons/hicolor/128x128/apps/mkvpropedit.png
-share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
-share/icons/hicolor/16x16/apps/mkvextract.png
-share/icons/hicolor/16x16/apps/mkvinfo.png
-share/icons/hicolor/16x16/apps/mkvmerge.png
-share/icons/hicolor/16x16/apps/mkvpropedit.png
-share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
-share/icons/hicolor/24x24/apps/mkvextract.png
-share/icons/hicolor/24x24/apps/mkvinfo.png
-share/icons/hicolor/24x24/apps/mkvmerge.png
-share/icons/hicolor/24x24/apps/mkvpropedit.png
-share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
-share/icons/hicolor/256x256/apps/mkvextract.png
-share/icons/hicolor/256x256/apps/mkvinfo.png
-share/icons/hicolor/256x256/apps/mkvmerge.png
-share/icons/hicolor/256x256/apps/mkvpropedit.png
-share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
-share/icons/hicolor/32x32/apps/mkvextract.png
-share/icons/hicolor/32x32/apps/mkvinfo.png
-share/icons/hicolor/32x32/apps/mkvmerge.png
-share/icons/hicolor/32x32/apps/mkvpropedit.png
-share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
-share/icons/hicolor/48x48/apps/mkvextract.png
-share/icons/hicolor/48x48/apps/mkvinfo.png
-share/icons/hicolor/48x48/apps/mkvmerge.png
-share/icons/hicolor/48x48/apps/mkvpropedit.png
-share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
-share/icons/hicolor/64x64/apps/mkvextract.png
-share/icons/hicolor/64x64/apps/mkvinfo.png
-share/icons/hicolor/64x64/apps/mkvmerge.png
-share/icons/hicolor/64x64/apps/mkvpropedit.png
-share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
-share/icons/hicolor/96x96/apps/mkvextract.png
-share/icons/hicolor/96x96/apps/mkvinfo.png
-share/icons/hicolor/96x96/apps/mkvmerge.png
-share/icons/hicolor/96x96/apps/mkvpropedit.png
-share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
-share/metainfo/
-share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
-share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
-share/mkvtoolnix/
-share/mkvtoolnix/sounds/
-share/mkvtoolnix/sounds/finished-1.ogg
-share/mkvtoolnix/sounds/finished-2.ogg
-share/mkvtoolnix/sounds/finished-3.ogg
-@tag gtk-update-icon-cache %D/share/icons/hicolor
-@tag update-mime-database
-@tag update-desktop-database
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 2 Dec 2020 06:44:11 -0000 1.17
+++ pkg/PLIST 16 Sep 2021 20:23:26 -0000
@@ -1,12 +1,56 @@
@comment $OpenBSD: PLIST,v 1.17 2020/12/02 06:44:11 rsadowski Exp $
+@pkgpath multimedia/mkvtoolnix,no_x11
@bin bin/mkvextract
@bin bin/mkvinfo
@bin bin/mkvmerge
@bin bin/mkvpropedit
+@bin bin/mkvtoolnix-gui
@man man/man1/mkvextract.1
@man man/man1/mkvinfo.1
@man man/man1/mkvmerge.1
@man man/man1/mkvpropedit.1
+@man man/man1/mkvtoolnix-gui.1
+share/applications/org.bunkus.mkvtoolnix-gui.desktop
+share/icons/hicolor/128x128/apps/mkvextract.png
+share/icons/hicolor/128x128/apps/mkvinfo.png
+share/icons/hicolor/128x128/apps/mkvmerge.png
+share/icons/hicolor/128x128/apps/mkvpropedit.png
+share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
+share/icons/hicolor/16x16/apps/mkvextract.png
+share/icons/hicolor/16x16/apps/mkvinfo.png
+share/icons/hicolor/16x16/apps/mkvmerge.png
+share/icons/hicolor/16x16/apps/mkvpropedit.png
+share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
+share/icons/hicolor/24x24/apps/mkvextract.png
+share/icons/hicolor/24x24/apps/mkvinfo.png
+share/icons/hicolor/24x24/apps/mkvmerge.png
+share/icons/hicolor/24x24/apps/mkvpropedit.png
+share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
+share/icons/hicolor/256x256/apps/mkvextract.png
+share/icons/hicolor/256x256/apps/mkvinfo.png
+share/icons/hicolor/256x256/apps/mkvmerge.png
+share/icons/hicolor/256x256/apps/mkvpropedit.png
+share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
+share/icons/hicolor/32x32/apps/mkvextract.png
+share/icons/hicolor/32x32/apps/mkvinfo.png
+share/icons/hicolor/32x32/apps/mkvmerge.png
+share/icons/hicolor/32x32/apps/mkvpropedit.png
+share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
+share/icons/hicolor/48x48/apps/mkvextract.png
+share/icons/hicolor/48x48/apps/mkvinfo.png
+share/icons/hicolor/48x48/apps/mkvmerge.png
+share/icons/hicolor/48x48/apps/mkvpropedit.png
+share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
+share/icons/hicolor/64x64/apps/mkvextract.png
+share/icons/hicolor/64x64/apps/mkvinfo.png
+share/icons/hicolor/64x64/apps/mkvmerge.png
+share/icons/hicolor/64x64/apps/mkvpropedit.png
+share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
+share/icons/hicolor/96x96/apps/mkvextract.png
+share/icons/hicolor/96x96/apps/mkvinfo.png
+share/icons/hicolor/96x96/apps/mkvmerge.png
+share/icons/hicolor/96x96/apps/mkvpropedit.png
+share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
@@ -35,4 +79,14 @@ share/locale/tr/LC_MESSAGES/mkvtoolnix.m
share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
-!%%no_x11%%
+share/metainfo/
+share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
+share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
+share/mkvtoolnix/
+share/mkvtoolnix/sounds/
+share/mkvtoolnix/sounds/finished-1.ogg
+share/mkvtoolnix/sounds/finished-2.ogg
+share/mkvtoolnix/sounds/finished-3.ogg
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-mime-database
+@tag update-desktop-database
