[kodi-pvr-argustv] Use old cmake macro
by Leigh Scott
commit d152848c81d7144bf94289fc181c040d0c257001
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 11:21:08 2020 +0100
Use old cmake macro
kodi-pvr-argustv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi-pvr-argustv.spec b/kodi-pvr-argustv.spec
index 9fb74da..2555414 100644
--- a/kodi-pvr-argustv.spec
+++ b/kodi-pvr-argustv.spec
@@ -1,3 +1,6 @@
+# Use old cmake macro
+%global __cmake_in_source_build 1
+
%global kodi_addon pvr.argustv
%global kodi_version 18.0
%global kodi_codename Matrix
@@ -34,7 +37,7 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-%cmake3
+%cmake3 .
%make_build
3 years, 9 months
[kodi-pvr-stalker] Use old cmake macro
by Leigh Scott
commit 25695cf766b4eeb662b723be72b009c67a6f36fb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 11:17:55 2020 +0100
Use old cmake macro
kodi-pvr-stalker.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi-pvr-stalker.spec b/kodi-pvr-stalker.spec
index 3e5ac5f..ab3eaff 100644
--- a/kodi-pvr-stalker.spec
+++ b/kodi-pvr-stalker.spec
@@ -1,3 +1,6 @@
+# Use old cmake macro
+%global __cmake_in_source_build 1
+
%global kodi_addon pvr.stalker
%global kodi_version 18.0
%global kodi_codename Matrix
@@ -38,7 +41,7 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-%cmake3
+%cmake3 .
%make_build
3 years, 9 months
[plex-media-player] bump release
by Leigh Scott
commit 10f500f45a35e69a3235966c6f1854dc340fab84
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 10:58:31 2020 +0100
bump release
plex-media-player.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 6eff91e..7c6bb65 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -9,7 +9,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -209,7 +209,7 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
-* Fri Jul 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
+* Fri Jul 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-3
- Use old cmake macro
* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
3 years, 9 months
[plex-media-player] Use old cmake macro
by Leigh Scott
commit 048776116c3c04b0e94db1519e2f7f6df58cf140
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 10:57:14 2020 +0100
Use old cmake macro
plex-media-player.spec | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 6cd22c7..6eff91e 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -1,3 +1,6 @@
+# Use old cmake macro
+%global __cmake_in_source_build 1
+
%global plex_hash 2.58.0.1076-38e019da
%global clients_hash 183-045db5be50e175
%global web_client_desktop 4.29.2-e50e175
@@ -6,7 +9,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -206,6 +209,12 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Fri Jul 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
+- Use old cmake macro
+
+* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
+- Improve compatibility with new CMake macro
+
* Tue May 26 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-1
- Update to 2.58.0
3 years, 9 months
[plex-media-player] Revert "Improve compatibility with new CMake macro"
by Leigh Scott
commit 021ce6fb7f5ffc00e648d23cec653149253a18cf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 10:52:33 2020 +0100
Revert "Improve compatibility with new CMake macro"
This reverts commit c6cb79576a715123f77e1f86d5282d35b5624d6a.
plex-media-player.spec | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 34b5fe1..6cd22c7 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -1,5 +1,3 @@
-%undefine __cmake_in_source_build
-
%global plex_hash 2.58.0.1076-38e019da
%global clients_hash 183-045db5be50e175
%global web_client_desktop 4.29.2-e50e175
@@ -8,7 +6,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -99,27 +97,29 @@ Player in TV mode at boot for HTPC installations.
%build
rm -Rf build
-mkdir -p dependencies
-install -p %{SOURCE90} dependencies/buildid-%{clients_hash}.cmake
-install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} dependencies/
+mkdir -p build/dependencies
+install -p %{SOURCE90} build/dependencies/buildid-%{clients_hash}.cmake
+install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} build/dependencies/
+cd build
%cmake3 \
-GNinja \
-DOpenGL_GL_PREFERENCE=GLVND \
-DQTROOT=%{_qt5_prefix} \
-DMPV_INCLUDE_DIR=%{_includedir}/mpv \
-DLINUX_DBUS=ON \
- -DLINUX_X11POWER=ON
+ -DLINUX_X11POWER=ON \
+ ..
-%cmake3_build
+%ninja_build
%install
-%cmake3_install
+%ninja_install -C build
mkdir -p %{buildroot}%{_bindir}
-install -pm0755 %{_vpath_builddir}/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer
-install -pm0755 %{_vpath_builddir}/src/pmphelper %{buildroot}%{_bindir}/pmphelper
+install -pm0755 build/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer
+install -pm0755 build/src/pmphelper %{buildroot}%{_bindir}/pmphelper
install -pm0755 %{SOURCE6} %{buildroot}%{_bindir}/plexmediaplayer-standalone
mkdir -p %{buildroot}%{_metainfodir}/
@@ -206,9 +206,6 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
-* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
-- Improve compatibility with new CMake macro
-
* Tue May 26 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-1
- Update to 2.58.0
3 years, 9 months
[plex-media-player] Revert "fix"
by Leigh Scott
commit 5342533366df397b618a9d2ce493f176778f09c1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 10:52:28 2020 +0100
Revert "fix"
This reverts commit 9a3a2a33562943fdb3537b7a6c1b53296f1602a1.
plex-media-player.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index ad4c6aa..34b5fe1 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -99,9 +99,9 @@ Player in TV mode at boot for HTPC installations.
%build
rm -Rf build
-mkdir -p %{_vpath_builddir}/dependencies
-install -p %{SOURCE90} %{_vpath_builddir}/dependencies/buildid-%{clients_hash}.cmake
-install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} %{_vpath_builddir}/dependencies/
+mkdir -p dependencies
+install -p %{SOURCE90} dependencies/buildid-%{clients_hash}.cmake
+install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} dependencies/
%cmake3 \
3 years, 9 months
[x265] Use old cmake macro
by Leigh Scott
commit e65d99460c66abbf37c7f8f5476c47bcd14028dc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jul 24 00:20:24 2020 +0100
Use old cmake macro
x265.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/x265.spec b/x265.spec
index 76c2086..d9f9db3 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,9 +1,12 @@
+# Use old cmake macro
+%global __cmake_in_source_build 1
+
%global _so_version 192
Summary: H.265/HEVC encoder
Name: x265
Version: 3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -138,6 +141,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.4-2
+- Use old cmake macro
+
* Sun May 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.4-1
- Update to 3.4
3 years, 9 months
[plex-media-player] fix
by Leigh Scott
commit 9a3a2a33562943fdb3537b7a6c1b53296f1602a1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 23 17:28:23 2020 +0100
fix
plex-media-player.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 34b5fe1..ad4c6aa 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -99,9 +99,9 @@ Player in TV mode at boot for HTPC installations.
%build
rm -Rf build
-mkdir -p dependencies
-install -p %{SOURCE90} dependencies/buildid-%{clients_hash}.cmake
-install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} dependencies/
+mkdir -p %{_vpath_builddir}/dependencies
+install -p %{SOURCE90} %{_vpath_builddir}/dependencies/buildid-%{clients_hash}.cmake
+install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} %{_vpath_builddir}/dependencies/
%cmake3 \
3 years, 9 months
[plex-media-player] Improve compatibility with new CMake macro
by Leigh Scott
commit c6cb79576a715123f77e1f86d5282d35b5624d6a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 23 16:50:51 2020 +0100
Improve compatibility with new CMake macro
plex-media-player.spec | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 6cd22c7..34b5fe1 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
%global plex_hash 2.58.0.1076-38e019da
%global clients_hash 183-045db5be50e175
%global web_client_desktop 4.29.2-e50e175
@@ -6,7 +8,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -97,29 +99,27 @@ Player in TV mode at boot for HTPC installations.
%build
rm -Rf build
-mkdir -p build/dependencies
-install -p %{SOURCE90} build/dependencies/buildid-%{clients_hash}.cmake
-install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} build/dependencies/
+mkdir -p dependencies
+install -p %{SOURCE90} dependencies/buildid-%{clients_hash}.cmake
+install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} dependencies/
-cd build
%cmake3 \
-GNinja \
-DOpenGL_GL_PREFERENCE=GLVND \
-DQTROOT=%{_qt5_prefix} \
-DMPV_INCLUDE_DIR=%{_includedir}/mpv \
-DLINUX_DBUS=ON \
- -DLINUX_X11POWER=ON \
- ..
+ -DLINUX_X11POWER=ON
-%ninja_build
+%cmake3_build
%install
-%ninja_install -C build
+%cmake3_install
mkdir -p %{buildroot}%{_bindir}
-install -pm0755 build/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer
-install -pm0755 build/src/pmphelper %{buildroot}%{_bindir}/pmphelper
+install -pm0755 %{_vpath_builddir}/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer
+install -pm0755 %{_vpath_builddir}/src/pmphelper %{buildroot}%{_bindir}/pmphelper
install -pm0755 %{SOURCE6} %{buildroot}%{_bindir}/plexmediaplayer-standalone
mkdir -p %{buildroot}%{_metainfodir}/
@@ -206,6 +206,9 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-2
+- Improve compatibility with new CMake macro
+
* Tue May 26 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-1
- Update to 2.58.0
3 years, 9 months
[ffmpegthumbnailer] Switch to ninja
by Leigh Scott
commit 9942d9853183b68cb9e648dd766ea1af01cd8493
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 23 16:32:57 2020 +0100
Switch to ninja
ffmpegthumbnailer.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index d25047b..360da11 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -16,6 +16,7 @@ BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: chrpath
BuildRequires: cmake3
+BuildRequires: ninja-build
BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
@@ -36,7 +37,7 @@ development package.
chmod -x README INSTALL COPYING AUTHORS
%build
-%cmake3 -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON .
+%cmake3 -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON -GNinja
%cmake3_build
3 years, 9 months