Renew files v3.1.11

CineEncoder · Feb 20, 2021 · 6d8c156 · 6d8c156
1 parent 37e5ee2
commit 6d8c156
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # Generated by qmake (3.1) (Qt 5.15.2)
 # Project:  ../cine-encoder-3.1/app/cine_encoder.pro
 # Template: app
-# Command: /usr/bin/qmake -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler
+# Command: /usr/bin/qmake -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
 #############################################################################
 
 MAKEFILE      = Makefile
@@ -14,9 +14,9 @@ EQ            = =
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_NO_DEBUG -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
-CFLAGS        = -pipe -O2 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
-CXXFLAGS      = -pipe -O2 -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
+DEFINES       = -DQT_QML_DEBUG -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
+CFLAGS        = -pipe -g -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
+CXXFLAGS      = -pipe -g -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
 INCPATH       = -I../cine-encoder-3.1/app -I. -I/usr/include/qt -I/usr/include/qt/QtMultimedia -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I. -I. -I/usr/lib/qt/mkspecs/linux-g++
 QMAKE         = /usr/bin/qmake
 DEL_FILE      = rm -f
@@ -39,7 +39,7 @@ COMPRESS      = gzip -9f
 DISTNAME      = cine_encoder1.0.0
 DISTDIR = /home/helg/Documents/QtCreatorProjects/builddir/.tmp/cine_encoder1.0.0
 LINK          = g++
-LFLAGS        = -Wl,-O1
+LFLAGS        = 
 LIBS          = $(SUBLIBS) -lmediainfo /usr/lib/libQt5Multimedia.so /usr/lib/libQt5Widgets.so /usr/lib/libQt5Gui.so /usr/lib/libQt5Network.so /usr/lib/libQt5Core.so -lGL -lpthread   
 AR            = ar cqs
 RANLIB        = 
@@ -314,7 +314,7 @@ DIST          = /usr/lib/qt/mkspecs/features/spec_pre.prf \
 		/usr/lib/qt/mkspecs/features/default_pre.prf \
 		/usr/lib/qt/mkspecs/features/resolve_config.prf \
 		/usr/lib/qt/mkspecs/features/default_post.prf \
-		/usr/lib/qt/mkspecs/features/qtquickcompiler.prf \
+		/usr/lib/qt/mkspecs/features/qml_debug.prf \
 		/usr/lib/qt/mkspecs/features/warn_on.prf \
 		/usr/lib/qt/mkspecs/features/qt.prf \
 		/usr/lib/qt/mkspecs/features/resources_functions.prf \
@@ -583,7 +583,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
 		/usr/lib/qt/mkspecs/features/default_pre.prf \
 		/usr/lib/qt/mkspecs/features/resolve_config.prf \
 		/usr/lib/qt/mkspecs/features/default_post.prf \
-		/usr/lib/qt/mkspecs/features/qtquickcompiler.prf \
+		/usr/lib/qt/mkspecs/features/qml_debug.prf \
 		/usr/lib/qt/mkspecs/features/warn_on.prf \
 		/usr/lib/qt/mkspecs/features/qt.prf \
 		/usr/lib/qt/mkspecs/features/resources_functions.prf \
@@ -600,7 +600,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
 		/usr/lib/qt/mkspecs/features/lex.prf \
 		../cine-encoder-3.1/app/cine_encoder.pro \
 		../cine-encoder-3.1/app/files.qrc
-	$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler
+	$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
 /usr/lib/qt/mkspecs/features/spec_pre.prf:
 /usr/lib/qt/mkspecs/common/unix.conf:
 /usr/lib/qt/mkspecs/common/linux.conf:
@@ -828,7 +828,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
 /usr/lib/qt/mkspecs/features/default_pre.prf:
 /usr/lib/qt/mkspecs/features/resolve_config.prf:
 /usr/lib/qt/mkspecs/features/default_post.prf:
-/usr/lib/qt/mkspecs/features/qtquickcompiler.prf:
+/usr/lib/qt/mkspecs/features/qml_debug.prf:
 /usr/lib/qt/mkspecs/features/warn_on.prf:
 /usr/lib/qt/mkspecs/features/qt.prf:
 /usr/lib/qt/mkspecs/features/resources_functions.prf:
@@ -846,7 +846,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
 ../cine-encoder-3.1/app/cine_encoder.pro:
 ../cine-encoder-3.1/app/files.qrc:
 qmake: FORCE
-	@$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler
+	@$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
 
 qmake_all: FORCE
 
@@ -1414,7 +1414,7 @@ compiler_moc_predefs_make_all: moc_predefs.h
 compiler_moc_predefs_clean:
 	-$(DEL_FILE) moc_predefs.h
 moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp
-	g++ -pipe -O2 -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp
+	g++ -pipe -g -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp
 
 compiler_moc_header_make_all: moc_about.cpp moc_dialog.cpp moc_donate.cpp moc_mainwindow.cpp moc_preset.cpp moc_selectpreset.cpp moc_settings.cpp moc_taskcomplete.cpp
 compiler_moc_header_clean:
@@ -1586,7 +1586,6 @@ moc_taskcomplete.o: moc_taskcomplete.cpp
 install_target: first FORCE
 	@test -d $(INSTALL_ROOT)/usr/bin || mkdir -p $(INSTALL_ROOT)/usr/bin
 	$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
-	-$(STRIP) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
 
 uninstall_target: FORCE
 	-$(DEL_FILE) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
@@ -35,7 +35,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
-    this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+    this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
+                         Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint);
     this->setMouseTracking(true);
     this->setAcceptDrops(true);
 }
@@ -802,18 +803,18 @@ void MainWindow::make_preset()  //*********************************** Make prese
     };
 
     QString arr_codec[12][2] = {
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p10le -c:v libx265 -profile:v main10 ",        ""},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p -c:v libx265 -profile:v main ",              ""},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p -c:v libx264 -profile:v high ",              ""},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt p010le -c:v hevc_nvenc -profile:v main10 ",          " -hwaccel cuda"},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p -c:v hevc_nvenc -profile:v main ",           " -hwaccel cuda"},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p -c:v h264_nvenc -profile:v high ",           " -hwaccel cuda"},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p10le -c:v libvpx-vp9 -speed 4 -profile:v 2 ", ""},
-        {"-map_metadata -1 -map ?0:v:0 -pix_fmt yuv420p10le -c:v librav1e -strict -2 ",              ""},
-        {"-map ?0:v:0 -pix_fmt yuv422p10le -c:v prores_ks -profile:v 3 ",                            ""},
-        {"-map ?0:v:0 -pix_fmt yuv444p10 -c:v prores_ks -profile:v 4 ",                              ""},
-        {"-map ?0:v:0 -pix_fmt yuv422p10le -c:v dnxhd -profile:v dnxhr_hqx ",                        ""},
-        {"-map ?0:v:0 -movflags +write_colr -c:v copy ",                                             ""}
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p10le -c:v libx265 -profile:v main10 ",        ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p -c:v libx265 -profile:v main ",              ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p -c:v libx264 -profile:v high ",              ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt p010le -c:v hevc_nvenc -profile:v main10 ",          " -hwaccel cuda"},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p -c:v hevc_nvenc -profile:v main ",           " -hwaccel cuda"},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p -c:v h264_nvenc -profile:v high ",           " -hwaccel cuda"},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p10le -c:v libvpx-vp9 -speed 4 -profile:v 2 ", ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv420p10le -c:v librav1e -strict -2 ",              ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv422p10le -c:v prores_ks -profile:v 3 ",           ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv444p10 -c:v prores_ks -profile:v 4 ",             ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -pix_fmt yuv422p10le -c:v dnxhd -profile:v dnxhr_hqx ",       ""},
+        {"-map 0:v:0? -map 0:a? -map 0:s? -map_metadata:g -1 -movflags +write_colr -c:v copy ",                            ""}
     };
     QString codec = arr_codec[p1][0];
     QString hwaccel = arr_codec[p1][1];
@@ -924,31 +925,31 @@ void MainWindow::make_preset()  //*********************************** Make prese
     };
     QString acodec = "";
     if (arr_acodec[p1][p21] == "AAC") {
-        acodec = QString("-map ?0:a -c:a aac -b:a %1").arg(arr_bitrate[0][p22]);
+        acodec = QString("-c:a aac -b:a %1").arg(arr_bitrate[0][p22]);
     };
     if (arr_acodec[p1][p21] == "AC3") {
-        acodec = QString("-map ?0:a -c:a ac3 -b:a %1").arg(arr_bitrate[1][p22]);
+        acodec = QString("-c:a ac3 -b:a %1").arg(arr_bitrate[1][p22]);
     };
     if (arr_acodec[p1][p21] == "DTS") {
-        acodec = QString("-map ?0:a -strict -2 -c:a dca -b:a %1 -ar 48000").arg(arr_bitrate[2][p22]);
+        acodec = QString("-strict -2 -c:a dca -b:a %1 -ar 48000").arg(arr_bitrate[2][p22]);
     };
     if (arr_acodec[p1][p21] == "Vorbis") {
-        acodec = QString("-map ?0:a -c:a libvorbis -b:a %1").arg(arr_bitrate[3][p22]);
+        acodec = QString("-c:a libvorbis -ac 2 -b:a %1").arg(arr_bitrate[3][p22]);
     };
     if (arr_acodec[p1][p21] == "Opus") {
-        acodec = QString("-map ?0:a -c:a libopus -b:a %1").arg(arr_bitrate[4][p22]);
+        acodec = QString("-c:a libopus -ac 2 -b:a %1").arg(arr_bitrate[4][p22]);
     };
     if (arr_acodec[p1][p21] == "PCM16") {
-        acodec = "-map ?0:a:0 -c:a pcm_s16le";
+        acodec = "-c:a pcm_s16le";
     };
     if (arr_acodec[p1][p21] == "PCM24") {
-        acodec = "-map ?0:a:0 -c:a pcm_s24le";
+        acodec = "-c:a pcm_s24le";
     };
     if (arr_acodec[p1][p21] == "PCM32") {
-        acodec = "-map ?0:a:0 -c:a pcm_s32le";
+        acodec = "-c:a pcm_s32le";
     };
     if (arr_acodec[p1][p21] == "Source") {
-        acodec = "-map ?0:a -c:a copy";
+        acodec = "-c:a copy";
     };
 
     QString colorprim = "";                         // color primaries
@@ -976,12 +977,12 @@ void MainWindow::make_preset()  //*********************************** Make prese
     if (_hdr[1] == "DCI P3") {
         colorprim = "-color_primaries smpte431 ";
     };
-//    if (_hdr[1] == "") {
-//        colorprim = "-color_primaries smpte428 ";
-//    };
-//    if (_hdr[1] == "Display P3") {
-//        colorprim = "-color_primaries smpte432 ";
-//    };
+    if (_hdr[1] == "XYZ") {
+        colorprim = "-color_primaries smpte428 ";
+    };
+    if (_hdr[1] == "Display P3") {
+        colorprim = "-color_primaries smpte432 ";
+    };
 
     QString colormatrix = "";                       // color matrix
     if (_hdr[2] == "BT709") {
@@ -1017,12 +1018,12 @@ void MainWindow::make_preset()  //*********************************** Make prese
     if (_hdr[2] == "ICtCp") {
         colormatrix = "-colorspace ICtCp ";
     };
-//    if (_hdr[2] == "") {
-//        colormatrix = "-colorspace smpte170m ";
-//    };
-//    if (_hdr[2] == "") {
-//        colormatrix = "-colorspace GBR ";
-//    };
+    if (_hdr[2] == "BT601") {
+        colormatrix = "-colorspace smpte170m ";
+    };
+    if (_hdr[2] == "Identity") {
+        colormatrix = "-colorspace GBR ";
+    };
 
     QString transfer = "";                          // transfer characteristics
     if (_hdr[3] == "BT709") {
@@ -1070,9 +1071,9 @@ void MainWindow::make_preset()  //*********************************** Make prese
     if (_hdr[3] == "SMPTE 428M") {
         transfer = "-color_trc smpte428 ";
     };
-//    if (_hdr[3] == "") {
-//        transfer = "-color_trc smpte170m ";
-//    };
+    if (_hdr[3] == "BT601") {
+        transfer = "-color_trc smpte170m ";
+    };
 
     QString color_range = "";
     QString max_lum = "";
@@ -1324,8 +1325,9 @@ void MainWindow::encode()   //***************************************** Encode *
     if (_mux_mode == true) {
         std::cout << "Muxing mode ..." << std::endl;  //  Debug info //
         ui->label_53->setText("Muxing:");
-        arguments << "-hide_banner" << "-i" << _temp_file << "-map" << "0:0" << "-movflags" << "+write_colr"
-                  << "-c:v" << "copy" << "-map" << "?0:a" << "-c:a" << "copy" << "-y" << _output_file;
+        arguments << "-hide_banner" << "-i" << _temp_file << "-map" << "0:v:0?" << "-map" << "0:a?"
+                  << "-map" << "0:s?" << "-movflags" << "+write_colr"
+                  << "-c:v" << "copy" << "-c:a" << "copy" << "-y" << _output_file;
     } else {
         int dur_mod = static_cast<int>(round(_dur));
         float fps_mod = _fps.toFloat();
@@ -1441,7 +1443,7 @@ void MainWindow::complete() //**************************************** Complete
             }
             _message = "Task completed!\n\n Elapsed time: " + QString::fromStdString(tm);
             call_task_complete(_message, false);
-        };
+        }
     } else {
         restore_initial_state();
         time_t end_t = time(nullptr);
@@ -1476,12 +1478,21 @@ void MainWindow::progress_1()   //*********************************** Progress 1
 {
     QString line = process_1->readAllStandardOutput();
     QString line_mod6 = line.replace("   ", " ").replace("  ", " ").replace("  ", " ").replace("= ", "=");
-    std::cout << line_mod6.toStdString() << std::endl;
-    int pos_err = line_mod6.indexOf("[error]:");
-    if (pos_err != -1){
+    //std::cout << line_mod6.toStdString() << std::endl;
+    int pos_err_1 = line_mod6.indexOf("[error]:");
+    int pos_err_2 = line_mod6.indexOf("Error");
+    int pos_err_3 = line_mod6.indexOf(" @ ");
+    if (pos_err_1 != -1) {
         QStringList error = line_mod6.split(":");
         _error_message = error[1];
-    };
+    }
+    if (pos_err_2 != -1) {
+        _error_message = line_mod6;
+    }
+    if (pos_err_3 != -1) {
+        QStringList error = line_mod6.split("]");
+        _error_message = error[1];
+    }
     int pos_st = line_mod6.indexOf("frame=");
     if (pos_st == 0) {
         QStringList data = line_mod6.split(" ");
@@ -1679,15 +1690,6 @@ void MainWindow::on_actionStop_clicked()    //************************** Stop **
     std::cout << "Call Stop ..." << std::endl;  //  Debug info //
     short s1 = process_1->state();
     if (s1 != 0) {
-        /*QMessageBox msgBox(this);
-        msgBox.setStyleSheet("color: rgb(255, 255, 255); background-color: rgb(5, 30, 35);");
-        msgBox.setIcon(QMessageBox::Question);
-        msgBox.setWindowTitle("Cine Encoder");
-        msgBox.setText("Stop?");
-        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
-        msgBox.setDefaultButton(QMessageBox::Cancel);
-        int confirm = msgBox.exec();
-        if (confirm == QMessageBox::Yes) {*/
         _message = "Stop encoding?";
         bool confirm = call_dialog(_message);
         if (confirm == true) {
@@ -1724,7 +1726,7 @@ void MainWindow::error_1()  //***************************************** Error **
     newItem_status->setTextAlignment(Qt::AlignCenter);
     ui->tableWidget->setItem(_row, 6, newItem_status);
     restore_initial_state();
-    _message = "An error occured!\n" + _error_message;
+    _message = "An error occured! " + _error_message;
     call_task_complete(_message, false);
 }
 

diff --git a/app/taskcomplete.cpp b/app/taskcomplete.cpp
@@ -78,6 +78,9 @@ void Taskcomplete::show_message(QString _message)   // Show message
     ui_taskcomplete->textBrowser->clear();
     ui_taskcomplete->textBrowser->setAlignment(Qt::AlignCenter);
     ui_taskcomplete->textBrowser->append(_message);
+    QTextCursor textCursor = ui_taskcomplete->textBrowser->textCursor();
+    textCursor.movePosition(QTextCursor::Start);
+    ui_taskcomplete->textBrowser->setTextCursor(textCursor);
 }
 
 bool Taskcomplete::eventFilter(QObject *watched, QEvent *event)

diff --git a/distros/archlinux/PKGBUILD b/distros/archlinux/PKGBUILD
@@ -20,15 +20,16 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   install -Dm755 cine_encoder "$pkgdir"/usr/bin/cine_encoder
 
-  # install documentation
-  install -Dm644 ABOUT -t "${pkgdir}/usr/share/doc/${pkgname}"
   # install license
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  # install icon
-  install -Dm644 cine-encoder.png -t "${pkgdir}/usr/share/icons/hicolor/64x64/apps/"
+  # install documentation
+  install -Dm644 share/ABOUT -t "${pkgdir}/usr/share/doc/${pkgname}"
+
   # install .desktop
-  install -Dm644 cine-encoder.desktop -t "${pkgdir}/usr/share/applications/"
+  install -Dm644 share/cine-encoder.desktop -t "${pkgdir}/usr/share/applications/"
+  # install icon
+  install -Dm644 share/cine-encoder.png -t "${pkgdir}/usr/share/icons/hicolor/64x64/apps/"
   # install sound
-  install -Dm644 cine-encoder.wav -t "${pkgdir}/usr/share/sounds/"
+  install -Dm644 share/cine-encoder.wav -t "${pkgdir}/usr/share/sounds/"
 
 }
diff --git a/distros/centos/cine-encoder.spec b/distros/centos/cine-encoder.spec
@@ -41,32 +41,23 @@ Licence: GNU GPL v.3
 qmake-qt5 -o Makefile app/cine_encoder.pro -spec linux-g++ \
   CONFIG+=qtquickcompiler
 
-# Modify the Makefile to use Fedora flags.  This would not be necessary if the
-# Makefile allowed overriding variable settings (e.g., with ?=).
-# sed -e 's|-pipe -O2 -Wall -Wextra|%{build_cflags}|' \
-#     -e 's|-pipe -O2 -std=gnu++11 -Wall -Wextra|%{build_cxxflags}|' \
-#    -e 's|-Wl,-O1|%{build_ldflags}|' \
-#    -e 's|= strip|=|' \
-#    -e 's|/opt/cine_encoder|%{_prefix}|' \
-#    -i Makefile
-
 %make_build
 
 %install
 %make_install INSTALL_ROOT=%{buildroot}
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
 mkdir -p %{buildroot}/%{_datadir}/applications
 mkdir -p %{buildroot}/%{_datadir}/sounds
-install -m 0644 %{name}.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
-install -m 0644 %{name}.desktop %{buildroot}/%{_datadir}/applications
-install -m 0644 %{name}.wav %{buildroot}/%{_datadir}/sounds
+install -m 0644 share/%{name}.desktop %{buildroot}/%{_datadir}/applications
+install -m 0644 share/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
+install -m 0644 share/%{name}.wav %{buildroot}/%{_datadir}/sounds
 
 %files
 %doc ABOUT README.md
 %license LICENSE
 %{_bindir}/cine_encoder
-%{_datadir}/icons/hicolor/64x64/apps/cine-encoder.png
 %{_datadir}/applications/cine-encoder.desktop
+%{_datadir}/icons/hicolor/64x64/apps/cine-encoder.png
 %{_datadir}/sounds/cine-encoder.wav
 
 %changelog

diff --git a/distros/fedora/cine-encoder.spec b/distros/fedora/cine-encoder.spec
@@ -57,16 +57,16 @@ sed -e 's|-pipe -O2 -Wall -Wextra|%{build_cflags}|' \
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
 mkdir -p %{buildroot}/%{_datadir}/applications
 mkdir -p %{buildroot}/%{_datadir}/sounds
-install -m 0644 %{name}.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
-install -m 0644 %{name}.desktop %{buildroot}/%{_datadir}/applications
-install -m 0644 %{name}.wav %{buildroot}/%{_datadir}/sounds
+install -m 0644 share/%{name}.desktop %{buildroot}/%{_datadir}/applications
+install -m 0644 share/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps
+install -m 0644 share/%{name}.wav %{buildroot}/%{_datadir}/sounds
 
 %files
 %doc ABOUT README.md
 %license LICENSE
 %{_bindir}/cine_encoder
-%{_datadir}/icons/hicolor/64x64/apps/cine-encoder.png
 %{_datadir}/applications/cine-encoder.desktop
+%{_datadir}/icons/hicolor/64x64/apps/cine-encoder.png
 %{_datadir}/sounds/cine-encoder.wav
 
 %changelog