On Sat Nov 02, 2024 at 08:29:56AM +0100, Antoine Jacoutot wrote:
> This fixes it.
> Dunno if it's the right fix.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
> diff -u -p -r1.136 Makefile
> --- Makefile 31 Oct 2024 07:10:16 -0000 1.136
> +++ Makefile 2 Nov 2024 07:27:33 -0000
> @@ -63,14 +63,13 @@ AUTOCONF_VERSION= 2.71
>
> CONFIGURE_ARGS= --disable-optimization \
> --disable-update-check \
> - --disable-qt6 \
> --disable-precompiled-headers \
> --with-boost=${LOCALBASE} \
> --with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook \
> - --with-qmake=${MODQT6_QMAKE}
> + --with-qmake6=${MODQT6_QMAKE}
>
> MAKE_ENV+= V=1
> -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -I${MODQT6_INCDIR}
> +CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -I${MODQT6_INCDIR} -I${MODQT6_INCDIR}/QtCore
> LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${MODQT6_LIBDIR}
>
> CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt6/bin/lconvert" \
>
Thanks aja, and sorry for the breakage. I ran this diff last night. I
have no clue how I committed such a wired update diff. Maybe I picked up
a wrong diff.
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ed7e8e05ab9..827beae4917 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -63,14 +63,14 @@ AUTOCONF_VERSION= 2.71
CONFIGURE_ARGS= --disable-optimization \
--disable-update-check \
- --disable-qt6 \
--disable-precompiled-headers \
--with-boost=${LOCALBASE} \
--with-docbook-xsl-root=${LOCALBASE}/share/xsl/docbook \
--with-qmake=${MODQT6_QMAKE}
MAKE_ENV+= V=1
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -I${MODQT6_INCDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+CPPFLAGS+= -I${MODQT6_INCDIR} -I${MODQT6_INCDIR}/QtCore
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${MODQT6_LIBDIR}
CONFIGURE_ENV+= LCONVERT="${LOCALBASE}/lib/qt6/bin/lconvert" \
No comments:
Post a Comment