On Sun Nov 08, 2026 at 06:56:15AM +0100, [email protected] wrote:
> hi,
> 
> vlc has been supporting qt6 since 3.0.22 and with fixes for it in .23 &
> .24, debian just switched for the upcoming forky
> (https://salsa.debian.org/multimedia-team/vlc/-/commit/de0a4cd96907fe047d36a37c0a33a5c07777b706)
> - so far in my testing the UI worked fine.
> 
> oks & testing welcome
> 
> Landry

> ? buildqt6
> ? buildqt6-gmake
> ? buildqt6-gmake2
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/Makefile,v
> diff -u -r1.300 Makefile
> --- Makefile  26 Sep 2026 13:46:37 -0000      1.300
> +++ Makefile  8 Nov 2026 05:49:32 -0000
> @@ -1,6 +1,7 @@
>  COMMENT-main=        VideoLAN client; multimedia player
>  COMMENT-jack=        JACK audio output module for VLC
>  
> +REVISION=    0
>  V=           3.0.24
>  DISTNAME=    vlc-${V}
>  PKGNAME-main=        ${DISTNAME}
> @@ -26,7 +27,7 @@
>  
>  WANTLIB-main += ${WANTLIB-common} ${MODLUA_WANTLIB}
>  
> -WANTLIB-main += EGL GL ICE LLVM Qt5Core Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras
> +WANTLIB-main += EGL GL ICE LLVM Qt6Core Qt6DBus Qt6Gui Qt6Svg Qt6Widgets
>  WANTLIB-main += SDL SDL_image SM SvtAv1Enc X11 X11-xcb XRes Xau Xcomposite
>  WANTLIB-main += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xpm Xrandr
>  WANTLIB-main += Xrender Xxf86vm absl_base absl_base_cpu_detect absl_city
> @@ -92,7 +93,7 @@
>  AUTORECONF=  ./bootstrap
>  
>  MODULES=     lang/lua \
> -             x11/qt5
> +             x11/qt6
>  
>  MODLUA_VERSION=      5.2
>  MODLUA_SA=   Yes
> @@ -105,8 +106,7 @@
>  
>  LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} \

Qt5 leftover.

>               ${MODLUA_LIB_DEPENDS} \
> -             x11/qt5/qtsvg,-main \
> -             x11/qt5/qtx11extras \
> +             x11/qt6/qtsvg \
>               archivers/libarchive \
>               audio/libcddb \
>               audio/libsoxr \
> @@ -226,8 +226,9 @@
>  CONFIGURE_ENV+=      BUILDCC="${CC}" \
>               CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
>               LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
> -             PKG_CONFIG_PATH="${LOCALBASE}/lib/qt5/pkgconfig" \
> -             RCC="${LOCALBASE}/bin/rcc-qt5" \
> +             PKG_CONFIG_PATH="${LOCALBASE}/lib/qt6/pkgconfig" \
> +             QMAKE6="${LOCALBASE}/bin/qmake-qt6" \
> +             RCC="${LOCALBASE}/bin/rcc-qt6" \
>               LUAC="${LOCALBASE}/bin/luac${MODLUA_DEP_VERSION}"
>  
>  PSEUDO_FLAVORS=      no_jack
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
> diff -u -r1.49 patch-configure_ac
> --- patches/patch-configure_ac        26 Sep 2026 13:46:37 -0000      1.49
> +++ patches/patch-configure_ac        8 Nov 2026 05:49:32 -0000
> @@ -11,11 +11,10 @@
>       ;;
>     netbsd*)
>       SYS=netbsd
> -@@ -1178,22 +1177,6 @@ AC_ARG_ENABLE(optimizations,
> - 
> +@@ -1179,22 +1178,6 @@ AC_ARG_ENABLE(optimizations,
>   dnl Check for various optimization flags
>   AS_IF([test "${enable_optimizations}" != "no"], [
> --
> + 
>  -  dnl -O3 only in production builds
>  -  AS_IF([test "${enable_debug}" = "no"], [
>  -    VLC_SAVE_FLAGS
> @@ -31,6 +30,29 @@
>  -    ])
>  -    AS_IF([test "${ac_cv_c_o3}" = "no"], [VLC_RESTORE_FLAGS])
>  -  ])
> - 
> +-
>     dnl Check for fast maths
>     AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations 
> -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CFLAGS])
> +   AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations 
> -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CXXFLAGS])
> +@@ -3995,9 +3978,9 @@ AS_IF([test "${enable_qt}" != "no"], [
> +         echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"  >> 
> ${ac_pwd}/modules/gui/qt/qmake-qt
> + 
> +         AC_MSG_RESULT([yes])
> +-        QT_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt 
> get_libs)
> +-        QT_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt 
> get_cflags)
> +-        QT_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-qt 
> get_ldflags)
> ++        QT_LIBS=$(cd ${ac_pwd}/modules/gui/qt && ${MAKE} -s -f qmake-qt 
> get_libs)
> ++        QT_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && ${MAKE} -s -f qmake-qt 
> get_cflags)
> ++        QT_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && ${MAKE} -s -f qmake-qt 
> get_ldflags)
> +         AC_SUBST([QT_LIBS])
> +         AC_SUBST([QT_CFLAGS])
> +         AC_SUBST([QT_LDFLAGS])
> +@@ -4018,7 +4001,7 @@ AS_IF([test "${enable_qt}" != "no"], [
> +           echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"        >> 
> ${ac_pwd}/modules/gui/qt/qmake-private-gui
> + 
> +           AC_MSG_RESULT([yes])
> +-          QT_GUI_PRIVATE_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f 
> qmake-private-gui get_cflags)
> ++          QT_GUI_PRIVATE_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && ${MAKE} -s 
> -f qmake-private-gui get_cflags)
> +           AC_SUBST([QT_GUI_PRIVATE_CFLAGS])
> +           have_qt_gui_private="yes"
> +         ],[

Reply via email to