diff --git a/common/shlibs b/common/shlibs index 1bcd8bbad37..bc38cda9e1e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -828,7 +828,6 @@ libpeas-gtk-1.0.so.0 libpeas-1.0.0_2 libtotem.so.0 libtotem-3.6.2_1 libclutter-1.0.so.0 clutter-1.14.0_1 libavfs.so.0 libavfs-1.0.5_1 -libdmr.so.0.1 deepin-movie-reborn-3.2.5_1 libgjs.so.0 gjs-1.65.2_1 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1 libaccountsservice.so.0 accountsservice-0.6.4_1 diff --git a/srcpkgs/deepin-movie-reborn-devel b/srcpkgs/deepin-movie-reborn-devel deleted file mode 120000 index 85b9a40f39d..00000000000 --- a/srcpkgs/deepin-movie-reborn-devel +++ /dev/null @@ -1 +0,0 @@ -deepin-movie-reborn \ No newline at end of file diff --git a/srcpkgs/deepin-movie-reborn/patches/48.patch b/srcpkgs/deepin-movie-reborn/patches/48.patch deleted file mode 100644 index 4acd009ad15..00000000000 --- a/srcpkgs/deepin-movie-reborn/patches/48.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0a46b32065fc7508cc9af611d6809187a42be91d Mon Sep 17 00:00:00 2001 -From: Gary Wang -Date: Tue, 30 Jul 2019 11:24:28 +0800 -Subject: [PATCH] fix: build failed if cannot find dtk-settings tool - ---- - src/CMakeLists.txt | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git src/CMakeLists.txt src/CMakeLists.txt -index b403c96..55b0318 100644 ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -42,12 +42,15 @@ list(APPEND SRCS ${MPV_SRCS}) - list(APPEND PROJECT_INCLUDE ${PROJECT_SOURCE_DIR}/src/backends/mpv) - #~ - --add_custom_target(json_i18n ALL -- /usr/lib/dtk2/dtk-settings resources/data/settings.json -o common/settings_translation.cpp -- COMMAND sed -i "s,#include .*,#include ," common/settings_translation.cpp -- VERBATIM -- SOURCES resources/data/settings.json -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/) -+set (DTK_SETTINGS_TOOLS_EXECUTABLE ${DTKCORE_TOOL_DIR}/dtk-settings) -+if (EXISTS ${DTK_SETTINGS_TOOLS_EXECUTABLE}) -+ add_custom_target(json_i18n ALL -+ ${DTKCORE_TOOL_DIR}/dtk-settings resources/data/settings.json -o common/settings_translation.cpp -+ COMMAND sed -i "s,#include .*,#include ," common/settings_translation.cpp -+ VERBATIM -+ SOURCES resources/data/settings.json -+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/) -+endif () - - ## translations - file(GLOB TS LIST_DIRECTORIES false translations/${CMD_NAME}*.ts) -@@ -61,7 +64,6 @@ endif () - # ~ - - add_executable(${CMD_NAME} ${SRCS} ${RCS} ${QM}) --add_dependencies(${CMD_NAME} json_i18n) - target_include_directories(${CMD_NAME} PUBLIC ${PROJECT_INCLUDE}) - - set(TARGET_LIBS X11 Xext Xtst PkgConfig::Xcb Qt5::Widgets Qt5::X11Extras Qt5::Network diff --git a/srcpkgs/deepin-movie-reborn/patches/cross.patch b/srcpkgs/deepin-movie-reborn/patches/cross.patch deleted file mode 100644 index 8439ce5dc6f..00000000000 --- a/srcpkgs/deepin-movie-reborn/patches/cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/backends/mpv/mpv_glwidget.cpp 2018-05-04 10:15:32.000000000 +0200 -+++ - 2018-05-22 22:08:57.552655817 +0200 -@@ -38,6 +38,7 @@ - #include - DWIDGET_USE_NAMESPACE - -+#include - - static const char* vs_blend = R"( - attribute vec2 position; diff --git a/srcpkgs/deepin-movie-reborn/patches/locale.patch b/srcpkgs/deepin-movie-reborn/patches/locale.patch deleted file mode 100644 index b7837db82f1..00000000000 --- a/srcpkgs/deepin-movie-reborn/patches/locale.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libdmr/player_engine.cpp 2018-05-04 10:15:32.000000000 +0200 -+++ - 2018-05-05 14:43:52.094245514 +0200 -@@ -48,6 +48,8 @@ - auto *l = new QVBoxLayout(this); - l->setContentsMargins(0, 0, 0, 0); - -+ setlocale(LC_NUMERIC, "C"); -+ - _current = new MpvProxy(this); - if (_current) { - connect(_current, &Backend::stateChanged, this, &PlayerEngine::onBackendStateChanged); diff --git a/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch b/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch deleted file mode 100644 index de5543fdb32..00000000000 --- a/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- compositing_manager.cpp 2018-02-16 23:26:46.157644103 +0100 -+++ src/libdmr/compositing_manager.cpp 2018-02-16 23:31:57.378630531 +0100 -@@ -46,6 +46,10 @@ - #undef Bool - #include - -+#if !defined(__GLIBC__) -+#include -+#endif -+ - typedef const char * glXGetScreenDriver_t (Display *dpy, int scrNum); - - static glXGetScreenDriver_t *GetScreenDriver; diff --git a/srcpkgs/deepin-movie-reborn/template b/srcpkgs/deepin-movie-reborn/template deleted file mode 100644 index a46bcbb63ac..00000000000 --- a/srcpkgs/deepin-movie-reborn/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'deepin-movie-reborn' -pkgname=deepin-movie-reborn -version=5.0.0 -revision=2 -build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-qmake" -makedepends="dtkwidget-devel ffmpegthumbnailer-devel libdvdnav-devel mpv-devel - pulseaudio-devel qt5-declarative-devel qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel - qt5-x11extras-devel xcb-util-wm-devel" -depends="qt5integration" -short_desc="Deepin Movie Player" -maintainer="John " -license="GPL-3.0-or-later" -homepage="https://github.com/linuxdeepin/deepin-movie-reborn" -changelog="https://github.com/linuxdeepin/deepin-movie-reborn/blob/${version}/CHANGELOG.md" -distfiles="https://github.com/linuxdeepin/deepin-movie-reborn/archive/${version}.tar.gz" -checksum=b52456ef8c373c1738edc15cfbdb7127f2dbdf57153594bb2b716f02573ef1ef -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget" -CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore" -CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" dtkcore-devel" -fi - -case $XBPS_TARGET_MACHINE in - arm*) broken="https://travis-ci.org/void-linux/void-packages/jobs/394936356";; -esac - -deepin-movie-reborn-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/lib/pkgconfig - vmove usr/include - vmove "usr/lib/*.so" - } -}