1
0
Fork 0

first commit

This commit is contained in:
root 2024-11-23 01:15:11 +02:00
commit 528f89a79b
90 changed files with 13567 additions and 0 deletions

View file

@ -0,0 +1,27 @@
diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
--- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2023-09-27 22:20:26.000000000 +0900
+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2023-11-03 11:01:24.526257561 +0900
@@ -209,12 +209,6 @@
#ifdef HAVE_FFMPEG
-#ifdef AV_CODEC_CAP_TRUNCATED
-#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
-#else
-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
-#endif
-
const char *GfxProviderFreeImage::supportedformatsFfmpeg()
{
return ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
@@ -330,10 +324,6 @@
// Force seeking to key frames
formatContext->seek2any = false;
- if (decoder->capabilities & CAP_TRUNCATED)
- {
- codecContext->flags |= CAP_TRUNCATED;
- }
AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format

View file

@ -0,0 +1,45 @@
diff --git a/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro b/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
index 06cbb08cd..7ca767132 100644
--- a/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
+++ b/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
@@ -52,5 +52,4 @@ INSTALLS += emblems32 emblems64
!contains(DEFINES, no_desktop) {
update_cache.commands = gtk-update-icon-cache -f -t $${HICOLOR} || true
update_cache.path = $${HICOLOR}
- INSTALLS += update_cache
}
diff --git a/src/MEGAShellExtNemo/MEGAShellExtNemo.pro b/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
index 33668b4ee..061e0d445 100644
--- a/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
+++ b/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
@@ -43,5 +43,4 @@ INSTALLS += emblems32 emblems64
!contains(DEFINES, no_desktop) {
update_cache.commands = gtk-update-icon-cache -f -t $${HICOLOR} || true
update_cache.path = $$PWD
- INSTALLS += update_cache
}
diff --git a/src/MEGASync/google_breakpad/google_breakpad.pri b/src/MEGASync/google_breakpad/google_breakpad.pri
index 122268aba..cd141a5f9 100644
--- a/src/MEGASync/google_breakpad/google_breakpad.pri
+++ b/src/MEGASync/google_breakpad/google_breakpad.pri
@@ -43,8 +43,6 @@ unix:!macx {
SOURCES += $$PWD/common/linux/elfutils.cc
SOURCES += $$PWD/common/string_conversion.cc
SOURCES += $$PWD/common/convert_UTF.c
-
- QMAKE_CXXFLAGS+=-g
}
win32 {
diff --git a/src/MEGASync/platform/platform.pri b/src/MEGASync/platform/platform.pri
index 99f4dbd4f..ef5553508 100644
--- a/src/MEGASync/platform/platform.pri
+++ b/src/MEGASync/platform/platform.pri
@@ -89,7 +89,6 @@ unix:!macx {
# desktop
desktop.path = $$DESKTOP_DESTDIR/share/applications
desktop.files = $$PWD/linux/data/megasync.desktop
- desktop.commands = update-desktop-database &> /dev/null || true
INSTALLS += desktop
HICOLOR = $$DESKTOP_DESTDIR/share/icons/hicolor

View file

@ -0,0 +1,27 @@
--- a/contrib/cmake/modules/desktopapp_configuration.cmake
+++ b/contrib/cmake/modules/desktopapp_configuration.cmake
@@ -29,8 +29,6 @@ if(UNIX AND NOT APPLE)
# Note: using cmake --install --prefix /some/prefix will keep the RPATH as configured above.
# Used for building packages: in which install dir is a path construction folder that will not be there in packages
- set(CMAKE_INSTALL_LIBDIR "opt/megasync/lib") # override default "lib" from GNUInstallDirs
- set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs
# Override CMAKE_INSTALL_PREFIX
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false
--- a/src/MEGASync/CMakeLists.txt
+++ b/src/MEGASync/CMakeLists.txt
@@ -142,13 +142,6 @@ if (UNIX AND NOT APPLE)
set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/")
- install(DIRECTORY "${vcpkg_lib_folder}"
- TYPE LIB # In CMAKE_INSTALL_LIBDIR directory
- FILES_MATCHING
- PATTERN "*.so*"
- PATTERN "manual-link" EXCLUDE
- PATTERN "pkgconfig" EXCLUDE
- )
if(DEPLOY_QT_LIBRARIES)
include(desktopapp_deploy_qt)

View file

@ -0,0 +1,12 @@
--- a/src/MEGASync/control/control.cmake
+++ b/src/MEGASync/control/control.cmake
@@ -71,6 +71,9 @@ set(DESKTOP_APP_CONTROL_SOURCES
control/StatsEventHandler.cpp
)
+find_package(ZLIB REQUIRED)
+target_link_libraries(MEGAsync PRIVATE ZLIB::ZLIB)
+
target_sources(MEGAsync
PRIVATE
${DESKTOP_APP_CONTROL_HEADERS}

View file

@ -0,0 +1,11 @@
--- a/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
+++ b/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
@@ -95,7 +95,7 @@ macro(load_sdklib_libraries)
find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config
- pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)
+ pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
target_link_libraries(SDKlib PUBLIC PkgConfig::cryptopp) # TODO: Private for SDK core
pkg_check_modules(sodium REQUIRED IMPORTED_TARGET libsodium)