Request 6361 (accepted)

Overview

Request 6361 (accepted)

Build with qt6

Created by enzokiel 8 months ago
In state accepted

Submit avidemux3

Submit package home:enzokiel:Testing / avidemux3 to package home:enzokiel / avidemux3

avidemux3.spec Changed

@@ -29,7 +29,7 @@
 Patch3:         avidemux-desktop-file.patch
 Patch4:         avidemux-backport_Fix_threads_setup.patch
 Patch5:         avidemux-translations.patch
-##Patch6:         avidemux-lrelease6.patch
+Patch6:         avidemux-lrelease6.patch
 
 # Utilities / Libraries
 BuildRequires:  cmake
@@ -41,8 +41,8 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  pkg-config
-##BuildRequires:  qt5-tools
-##BuildRequires:  qt5-tools-linguist
+BuildRequires:  qt6-tools
+BuildRequires:  qt6-tools-linguist
 BuildRequires:  yasm
 BuildRequires:  pkgconfig(vapoursynth)
 BuildRequires:  pkgconfig(vapoursynth-script)
@@ -94,21 +94,14 @@
 BuildRequires:  pkgconfig(x265)
 
 # GUI
-##BuildRequires:  pkgconfig(Qt6Core)
-##BuildRequires:  pkgconfig(Qt6Gui)
-##BuildRequires:  pkgconfig(Qt6Network)
-##BuildRequires:  pkgconfig(Qt6OpenGL)
-##BuildRequires:  pkgconfig(Qt6OpenGLWidgets)
-##BuildRequires:  pkgconfig(Qt6Widgets)
-
-BuildRequires:  cmake(Qt5Core)
-BuildRequires:  cmake(Qt5LinguistTools)
-BuildRequires:  cmake(Qt5Network)
-BuildRequires:  cmake(Qt5OpenGL)
-BuildRequires:  cmake(Qt5Script)
-BuildRequires:  cmake(Qt5Widgets)
-
-# Main package requires at least one frontend (cli or qt5)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Network)
+BuildRequires:  pkgconfig(Qt6OpenGL)
+BuildRequires:  pkgconfig(Qt6OpenGLWidgets)
+BuildRequires:  pkgconfig(Qt6Widgets)
+
+# Main package requires at least one frontend (cli or qt6)
 Requires:       avidemux3-frontend = %{version}-%{release}
 
 %description
@@ -141,14 +134,14 @@
 
 This package provides a command-line interface to editing videos with avidemux.
 
-%package qt5
+%package qt6
 Summary:        Qt interface for avidemux
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       avidemux3-frontend = %{version}-%{release}
 Requires:       avidemux3 = %{version}-%{release}
-Recommends:     avidemux3-qt5-lang = %{version}-%{release}
+Recommends:     avidemux3-qt6-lang = %{version}-%{release}
 
-%description qt5
+%description qt6
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -161,13 +154,13 @@
 
 This package contains the Qt graphical interface for avidemux.
 
-%package qt5-lang
-Summary:        Languages for package avidemux3-qt5
+%package qt6-lang
+Summary:        Languages for package avidemux3-qt6
 Group:          System/Localization
-Requires:       avidemux3-qt5 = %{version}-%{release}
+Requires:       avidemux3-qt6 = %{version}-%{release}
 BuildArch:      noarch
 
-%description qt5-lang
+%description qt6-lang
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -178,7 +171,7 @@
 from other people and projects has been used as well. Patches, translations
 and even bug reports are always welcome.
 
-This package provides translations for package avidemux3-qt5.
+This package provides translations for package avidemux3-qt6.
 
 %prep
 %autosetup -p1 -n avidemux2-%{version}
@@ -192,7 +185,7 @@
 %endif
 export CXXFLAGS="$flags"
 
-options+="--enable-qt5 --with-system-liba52 --with-system-libmad "
+options+="--with-system-liba52 --with-system-libmad "
 ./bootStrap.bash $options
 
 %install
@@ -200,12 +193,12 @@
 
 # Install man
 install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1
-rm -f %{buildroot}%{_datadir}/avidemux3/qt5/translations/qtbase_*.qm
+rm -f %{buildroot}%{_datadir}/avidemux3/qt6/translations/qtbase_*.qm
 
 # delete devel file (only needed for build)
 rm -rf %{buildroot}%{_includedir}
 
-%find_lang avidemux %{name}-qt5.lang --with-qt
+%find_lang avidemux %{name}-qt6.lang --with-qt
 
 cat /tmp/logCmakebuild*
 
@@ -219,9 +212,9 @@
 
 %postun cli -p /sbin/ldconfig
 
-%post qt5 -p /sbin/ldconfig
+%post qt6 -p /sbin/ldconfig
 
-%postun qt5 -p /sbin/ldconfig
+%postun qt6 -p /sbin/ldconfig
 
 %files
 %{_bindir}/vsProxy
@@ -463,81 +456,81 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_waveletSharpCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_ZoomCli.so
 
-%files qt5
-%{_bindir}/avidemux3_jobs_qt5
-%{_bindir}/avidemux3_qt5
-%{_bindir}/vsProxy_gui_qt5
-%{_libdir}/libADM_openGLQT56.so
-%{_libdir}/libADM_render6_QT5.so
-%{_libdir}/libADM_UIQT56.so
+%files qt6
+%{_bindir}/avidemux3_jobs_qt6
+%{_bindir}/avidemux3_qt6
+%{_bindir}/vsProxy_gui_qt6
+%{_libdir}/libADM_openGLQT66.so
+%{_libdir}/libADM_render6_QT6.so
+%{_libdir}/libADM_UIQT66.so
 %dir %{_libdir}/ADM_plugins6/shaderDemo
 %dir %{_libdir}/ADM_plugins6/shaderDemo/1
-%dir %{_libdir}/ADM_plugins6/videoEncoders/qt5
-%dir %{_libdir}/ADM_plugins6/videoFilters/qt5
+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt6
+%dir %{_libdir}/ADM_plugins6/videoFilters/qt6
 %{_libdir}/ADM_plugins6/shaderDemo/1/bump.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/lightning.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/ripple.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
-%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so
-%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_aiEnhanceQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_analyzerQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCartoonQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCharcoalQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaHoldQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaKeyQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artColorEffectQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artDynThresholdQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artGridQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artMirrorQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPixelizeQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPosterizeQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVHSQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVignetteQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blurQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorBalanceQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorTempQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cubicLUTQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_debandQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_delogoHQQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeFromImageQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeInQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeOutQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeThroughQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fitToSizeQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_flat360QT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_flipQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_grainQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_imageStabQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_lumaStabQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_quadTransQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletDenoiseQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletSharpQT5.so
-%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_zoomQT5.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt6/libADM_ve_x264_QT6.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt6/libADM_ve_x265_QT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_aiEnhanceQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_analyzerQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artCartoonQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artCharcoalQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artChromaHoldQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artChromaKeyQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artColorEffectQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artDynThresholdQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artGridQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artMirrorQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artPixelizeQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artPosterizeQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artVHSQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_artVignetteQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_asharpQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_blackenBordersQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_blurQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_chromaShiftQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_colorBalanceQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_colorTempQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_contrastQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_cropQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_cubicLUTQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_debandQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_delogoHQQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_eq2QT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_fadeFromImageQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_fadeInQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_fadeOutQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_fadeThroughQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_fitToSizeQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_flat360QT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_flipQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_glBenchmark.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_glResize.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_grainQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_HueQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_imageStabQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_lumaStabQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_logoQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_mpdelogoQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_msharpenQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_quadTransQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_rotateGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_sampleGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_sampleGlVertex.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_shaderLoaderGl.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_swscaleResizeQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_waveletDenoiseQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_waveletSharpQT6.so
+%{_libdir}/ADM_plugins6/videoFilters/qt6/libADM_vf_zoomQT6.so
 %{_datadir}/applications/org.avidemux.Avidemux.desktop
 %{_datadir}/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png
 %{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
 
-%files qt5-lang -f %{name}-qt5.lang
+%files qt6-lang -f %{name}-qt6.lang
 %dir %{_datadir}/avidemux3
-%dir %{_datadir}/avidemux3/qt5
-%dir %{_datadir}/avidemux3/qt5/translations
+%dir %{_datadir}/avidemux3/qt6
+%dir %{_datadir}/avidemux3/qt6/translations
 
 %changelog

Build Results
RPM Lint

Refresh

Comments for request 6361 0

Request History

enzokiel created request 8 months ago

Build with qt6

enzokiel accepted request 8 months ago