[rpmfusion-nonfree-release/f34] Remove old key
by Leigh Scott
commit ccbea79151cfe13e38dafbfd4d9d6fbb6a78fc9a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 24 11:50:19 2021 +0100
Remove old key
rpmfusion-nonfree-release.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index fe92f15..6059b4a 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -65,9 +65,9 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-33
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-34
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-35
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-36
# Links for the keys
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
3 years
[rpmfusion-nonfree-release/f34] Release for f34
by Leigh Scott
commit 2db99d93af20e702f3828ce0fd4d9214a344b923
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 24 11:48:40 2021 +0100
Release for f34
rpmfusion-nonfree-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index dd840ac..fe92f15 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{_repo}-release
Version: 34
-Release: 0.2
+Release: 1
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Sat Apr 24 2021 Leigh Scott <leigh123linux(a)gmail.com> - 34-1
+- Release for f34
+
* Thu Feb 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 34-0.2
- Switch to branch layout
3 years
[rpmfusion-nonfree-release/f34] Switch to release mode
by Leigh Scott
commit cf5d038ee934404a395bde3c83f8eb46e9e0dd21
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 18:25:19 2019 +0100
Switch to release mode
rpmfusion-nonfree-updates-testing.repo | 3 ++-
rpmfusion-nonfree-updates.repo | 3 ++-
rpmfusion-nonfree.repo | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 36e4d55..498d504 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=1
+enabled=0
+enabled_metadata=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree-updates.repo b/rpmfusion-nonfree-updates.repo
index f41d15e..6d4d825 100644
--- a/rpmfusion-nonfree-updates.repo
+++ b/rpmfusion-nonfree-updates.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
+enabled_metadata=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 239b8fb..dfb5110 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -3,7 +3,8 @@ name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
enabled=1
-#metadata_expire=14d
+enabled_metadata=1
+metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
3 years
[rpmfusion-free-release] Remove old key
by Leigh Scott
commit 4fcfe0d730df75833fd920287bab61f80830f5b5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 24 11:20:18 2021 +0100
Remove old key
rpmfusion-free-release.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 39632f5..1e1684d 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -65,9 +65,9 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-33
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-34
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-35
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-36
# Links for the keys
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
3 years
[rpmfusion-free-release/f34] Remove old key
by Leigh Scott
commit 3bd0ca626e8ff0b9d2a82180946ffcf888553c28
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 24 11:20:18 2021 +0100
Remove old key
rpmfusion-free-release.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index a447146..7f4ed4f 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -65,9 +65,9 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-33
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-34
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-35
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-36
# Links for the keys
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
3 years
[rpmfusion-free-release/f34] Release for f34
by Leigh Scott
commit 3d9017e24c8b4d3bb7cdd15ca9a5c43558cbf998
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 24 11:15:07 2021 +0100
Release for f34
rpmfusion-free-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 6a58f24..a447146 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{_repo}-release
Version: 34
-Release: 0.3
+Release: 1
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Sat Apr 24 2021 Leigh Scott <leigh123linux(a)gmail.com> - 34-1
+- Release for f34
+
* Sat Feb 13 2021 Leigh Scott <leigh123linux(a)gmail.com> - 34-0.3
- Fix error
3 years
[rpmfusion-free-release/f34] Switch to release mode
by Leigh Scott
commit 245bc6d7ccf8becc86d1a429c612abe00184fcd7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 18:22:46 2019 +0100
Switch to release mode
rpmfusion-free-updates-testing.repo | 3 ++-
rpmfusion-free-updates.repo | 3 ++-
rpmfusion-free.repo | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 54112fd..707ff1c 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=1
+enabled=0
+enabled_metadata=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free-updates.repo b/rpmfusion-free-updates.repo
index 8cda551..1405931 100644
--- a/rpmfusion-free-updates.repo
+++ b/rpmfusion-free-updates.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free - Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=0
+enabled=1
+enabled_metadata=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 4f1611f..e65aa5b 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -3,7 +3,7 @@ name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release...
enabled=1
-#metadata_expire=14d
+metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
3 years
[deepin-movie/f34] Update to 5.7.11
by Leigh Scott
Summary of changes:
9147cb6... Update to 5.7.11 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years
[deepin-movie] Update to 5.7.11
by Leigh Scott
commit 9147cb6b33f0b26276d9e1517dbfb1e26afcc7d1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 23 21:32:09 2021 +0100
Update to 5.7.11
.gitignore | 1 +
add_missing-qt_includes.patch | 11 --
add_qthelper.patch | 422 ------------------------------------------
deepin-movie.spec | 34 ++--
fix_linking.patch | 24 +++
sources | 2 +-
6 files changed, 48 insertions(+), 446 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a664acb..e9f576c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/deepin-movie-3.2.14.tar.gz
/deepin-movie-3.2.24.3.tar.gz
+/deepin-movie-5.7.11.tar.gz
diff --git a/deepin-movie.spec b/deepin-movie.spec
index f1389fc..4d58bfe 100644
--- a/deepin-movie.spec
+++ b/deepin-movie.spec
@@ -1,27 +1,29 @@
%undefine __cmake_in_source_build
+%global _lto_cflags %{nil}
Name: deepin-movie
-Version: 3.2.24.3
-Release: 7%{?dist}
+Version: 5.7.11
+Release: 1%{?dist}
Summary: Deepin movie based on mpv
Summary(zh_CN): 深度影音
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-movie-reborn
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-appdata.xml
-Patch0: add_qthelper.patch
-Patch1: add_missing-qt_includes.patch
+Patch0: fix_linking.patch
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: pkgconfig(dtkcore)
BuildRequires: pkgconfig(dtkwidget) >= 2.0.6
BuildRequires: pkgconfig(dvdnav)
+BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(libffmpegthumbnailer)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
@@ -29,6 +31,7 @@ BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-simple)
+BuildRequires: pkgconfig(mpris-qt5)
BuildRequires: mpv-libs-devel
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(xtst)
@@ -40,6 +43,8 @@ BuildRequires: libappstream-glib
BuildRequires: gcc
BuildRequires: desktop-file-utils
+Requires: deepin-qt5integration
+
%description
Deepin movie for deepin desktop environment.
@@ -56,6 +61,8 @@ Header files and libraries for %{name}.
%prep
%autosetup -p1 -n %{name}-reborn-%{version}
sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt
+sed -i '/#include <DPalette>/a #include <QPainterPath>' src/widgets/{tip,toolbutton}.h
+sed -i 's/Exec=deepin-movie/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-movie/g' ./%{name}.desktop
%build
%cmake3 -DCMAKE_BUILD_TYPE=Release
@@ -63,10 +70,12 @@ sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt
%install
%cmake3_install
-install -Dm644 %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -Dm644 %SOURCE1 %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+rm -rf %{buildroot}/%{_datadir}/deepin-manual/
+
%find_lang %{name} --with-qt
%files
@@ -75,20 +84,21 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_bindir}/%{name}
%{_libdir}/libdmr.so.0.1
%{_libdir}/libdmr.so.0.1.0
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/%{name}
-%{_datadir}/%{name}/translations
-%{_datadir}/%{name}/translations/%{name}*.qm
+%{_metainfodir}/%{name}.appdata.xml
+%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/glib-2.0/schemas/com.deepin.%{name}.gschema.xml
%files devel
-%{_includedir}/libdmr
-%{_includedir}/libdmr/*.h
+%{_includedir}/libdmr/
%{_libdir}/pkgconfig/libdmr.pc
%{_libdir}/libdmr.so
%changelog
+* Fri Apr 23 2021 Leigh Scott <leigh123linux(a)gmail.com> - 5.7.11-1
+- Update to 5.7.11
+
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2.24.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/fix_linking.patch b/fix_linking.patch
new file mode 100644
index 0000000..2d202cb
--- /dev/null
+++ b/fix_linking.patch
@@ -0,0 +1,24 @@
+diff -Nur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,6 +7,7 @@
+
+ include_directories(${CMAKE_INCLUDE_CURRENT_DIR})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
++include_directories(/usr/include/ffmpeg)
+
+ find_package(Qt5Widgets)
+ find_package(Qt5DBus)
+diff -Nur a/src/libdmr/CMakeLists.txt b/src/libdmr/CMakeLists.txt
+--- a/src/libdmr/CMakeLists.txt
++++ b/src/libdmr/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/../backends/mpv)
+
+ target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent
+- Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::DBus PkgConfig::AV
++ Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::DBus PkgConfig::AV gsettings-qt
+ ${FFTHUMB_LIBRARIES} GL)
+ #target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent
+ # Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV GL png jpeg)
+
diff --git a/sources b/sources
index 2ffedcd..4f29a20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c63093e86ab5ee34ccb6a23b495b42bf deepin-movie-3.2.24.3.tar.gz
+SHA512 (deepin-movie-5.7.11.tar.gz) = 1710649da82caea0f70de73b7b00c48a50108ba7feb233507b8f46a33f8f3390e58beab5fc0fe4897d23bd4ff914709f29179d88fec9d50fb1ba6f1aa443706e
3 years
[kodi] Drop dependencies no longer required
by Michael Cronenworth
commit 1d88947f40618a7a47096a4a6b449cfbba6e604e
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri Apr 23 12:56:59 2021 -0500
Drop dependencies no longer required
kodi.spec | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 77fc68e..f23d530 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -42,7 +42,7 @@
Name: kodi
Version: 19.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -254,15 +254,6 @@ Requires: libmad%{?_isa}
Requires: librtmp%{?_isa}
Requires: shairplay-libs%{?_isa}
-# needed when doing a minimal install, see
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844
-Requires: glx-utils
-%if 0%{?fedora} > 33
-Requires: xdpyinfo
-%else
-Requires: xorg-x11-utils
-%endif
-
# This is just symlinked to, but needed both at build-time
# and for installation
Requires: python3-pillow%{?_isa}
@@ -465,6 +456,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Fri Apr 23 2021 Michael Cronenworth <mike(a)cchtml.com> - 19.0-3
+- Drop old dependencies
+
* Thu Apr 22 2021 Michael Cronenworth <mike(a)cchtml.com> - 19.0-2
- Update dependency on xdpyinfo (rfbz#5979)
3 years