feat: 提交影院SP3版本

提交影院SP3版本 Log: 提交影院SP3版本 Change-Id: I07d2b73f08cc37caf6d63604d170b06c4a4b79f3 Reviewed-on: http://gerrit.uniontech.com/c/chengdu/deepin-movie-reborn/+/3480 Reviewed-by: xiepengfei <[email protected]> Reviewed-by: shuwenzhi <[email protected]> Reviewed-by: <[email protected]> Reviewed-by: liuzheng <[email protected]> Tested-by: <[email protected]>
linuxdeepin · Sep 3, 2020 · 69e78df · 69e78df
1 parent 1f56c95
commit 69e78df
Show file tree

Hide file tree

Showing 133 changed files with 7,410 additions and 6,063 deletions.
diff --git a/.project.json b/.project.json
diff --git a/config.h b/config.h
@@ -11,7 +11,7 @@
 /* only defined when build with flatpak */
 //#cmakedefine DTK_DMAN_PORTAL
 
-#define RADIUS 0
+#define RADIUS 8
 #define RADIUS_MV 18
 
 #endif  /* __CONFIG_H__ */
diff --git a/config.h.in b/config.h.in
@@ -11,7 +11,7 @@
 /* only defined when build with flatpak */
 #cmakedefine DTK_DMAN_PORTAL
 
-#define RADIUS 0
+#define RADIUS 8
 #define RADIUS_MV 18
 
 #endif  /* __CONFIG_H__ */
diff --git a/debian/control b/debian/control
@@ -17,13 +17,13 @@ Homepage: https://www.deepin.org/
 
 Package: deepin-movie
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, va-driver-all
+Depends: ${shlibs:Depends}, ${misc:Depends}, va-driver-all, libavcodec58(>= 7:4.0), libavformat58(>= 7:4.1), libavutil56(>= 7:4.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29), libpulse0(>= 0.99.1), libqt5concurrent5(>= 5.6.0~rc)
 Description: movie player
  Movie is a full-featured video player, supporting playing local and streaming media in multiple video formats.
 
 Package: libdmr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec58(>= 7:4.0), libavformat58(>= 7:4.1), libavutil56(>= 7:4.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29), libpulse0(>= 0.99.1), libqt5concurrent5(>= 5.6.0~rc)
 Multi-Arch: same
 Description: movie player widget library 
  deepin movie player widget library

diff --git a/deepin-movie.pro b/deepin-movie.pro
@@ -0,0 +1,17 @@
+
+
+
+TEMPLATE = subdirs
+CONFIG = ordered
+SUBDIRS += \
+    src/libdmr
+
+SUBDIRS +=  src
+
+
+#SUBDIRS += src/test
+
+
+
+
+
diff --git a/deepin-movie.pro.user b/deepin-movie.pro.user
diff --git a/gitcommit_template b/gitcommit_template
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,14 +18,11 @@ find_package(Qt5Sql)
 
 pkg_check_modules(Dtk REQUIRED IMPORTED_TARGET dtkwidget)
 pkg_check_modules(Dtk REQUIRED IMPORTED_TARGET dtkcore)
-pkg_check_modules(Mpv REQUIRED IMPORTED_TARGET mpv)
-pkg_check_modules(Xcb REQUIRED IMPORTED_TARGET xcb xcb-aux
-    xcb-proto xcb-ewmh xcb-shape)
-pkg_check_modules(AV REQUIRED IMPORTED_TARGET libavformat
-    libavutil libavcodec)
+#pkg_check_modules(Mpv REQUIRED IMPORTED_TARGET mpv)
+#pkg_check_modules(Xcb REQUIRED IMPORTED_TARGET xcb)
+#pkg_check_modules(AV REQUIRED IMPORTED_TARGET libavformat libavutil libavcodec)
 # IMPORTED_TARGET failed to work for some of libs under flatpak env
-pkg_check_modules(Other REQUIRED libffmpegthumbnailer
-    libpulse libpulse-simple openssl dvdnav gsettings-qt)
+pkg_check_modules(Other REQUIRED  gsettings-qt)
 
 qt5_add_resources(RCS resources.qrc)
 qt5_add_resources(RCS icons/theme-icons.qrc)
@@ -73,9 +70,13 @@ add_executable(${CMD_NAME} ${SRCS} ${RCS} ${QM})
 
 target_include_directories(${CMD_NAME} PUBLIC ${PROJECT_INCLUDE})
 
-set(TARGET_LIBS X11 Xext Xtst PkgConfig::Xcb Qt5::Widgets Qt5::X11Extras Qt5::Network
-    Qt5::Concurrent Qt5::DBus Qt5::Sql PkgConfig::Dtk PkgConfig::Mpv
-    PkgConfig::AV pthread GL)
+#set(TARGET_LIBS X11 Xtst  PkgConfig::Xcb Qt5::Widgets Qt5::X11Extras Qt5::Network
+#    Qt5::Concurrent Qt5::DBus Qt5::Sql PkgConfig::Dtk PkgConfig::Mpv
+#    PkgConfig::AV  GL)
+
+set(TARGET_LIBS X11 Xtst  Qt5::Widgets Qt5::X11Extras Qt5::Network
+    Qt5::Concurrent Qt5::DBus Qt5::Sql PkgConfig::Dtk GL)
+
 target_link_libraries(${CMD_NAME} ${TARGET_LIBS} ${Other_LIBRARIES})
 
 
@@ -91,5 +92,18 @@ install(FILES ${PROJECT_SOURCE_DIR}/src/resources/icons/logo-big.svg
     DESTINATION share/icons/hicolor/scalable/apps
     RENAME deepin-movie.svg)
 
+# 加速编译优化参数
+if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
+    SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3 -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -Wl,--as-need -fPIE")
+    SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O3 -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi")
+    #SET(CMAKE_CXX_FLAGS "-Wl,--as-need -fPIE")
+    SET(CMAKE_EXE_LINKER_FLAGS "-pie")
+else()
+    SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -std=c++14 -O3 -DNDEBUG -fPIC -Wl,--as-need -fPIE")
+    SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -std=c++14 -O3 -DNDEBUG -fPIC")
+    #SET(CMAKE_CXX_FLAGS "-Wl,--as-need -fPIE")
+    SET(CMAKE_EXE_LINKER_FLAGS "-pie")
+endif()
+
 add_subdirectory(libdmr)
 add_subdirectory(test)