[EmptyEpsilon] Release 2023.06.17
by sagitter
commit 2964c6633a6c3d7097d32fc9d924bbec051e4e79
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Fri Mar 22 11:32:26 2024 +0100
Release 2023.06.17
.gitignore | 5 +
EmptyEpsilon-avoid_basis_libs_downloading.patch | 56 +++
EmptyEpsilon-avoid_glm_libs_downloading.patch | 28 ++
...ilon-avoid_meshoptimizer_libs_downloading.patch | 43 +++
EmptyEpsilon.spec | 130 ++++---
gcc12.patch | 39 ---
sources | 7 +-
upstream_EE_001_69d93e6acd.patch | 45 ---
upstream_EE_002_872ef2667c.patch | 25 --
upstream_EE_003_ee0cd42bfe.patch | 27 --
upstream_EE_004_530fe32f95.patch | 387 ---------------------
upstream_SP_001_32509f2db9.patch | 59 ----
upstream_SP_002_d52a1b1b61.patch | 25 --
upstream_SP_003_ec30d87c22.patch | 88 -----
upstream_SP_004_adbba45fd9.patch | 131 -------
upstream_SP_005_0d1ac45b73.patch | 44 ---
16 files changed, 216 insertions(+), 923 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7a5bbf..61eb2d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
/*.src.rpm
/*.zip
/*/
+/EmptyEpsilon-EE-2023.06.17.tar.gz
+/SeriousProton-EE-2023.06.12PR.tar.gz
+/basis_universal-1_15_update2.tar.gz
+/glm-0.9.9.8.tar.gz
+/meshoptimizer-0.16.tar.gz
diff --git a/EmptyEpsilon-avoid_basis_libs_downloading.patch b/EmptyEpsilon-avoid_basis_libs_downloading.patch
new file mode 100644
index 0000000..3391b01
--- /dev/null
+++ b/EmptyEpsilon-avoid_basis_libs_downloading.patch
@@ -0,0 +1,56 @@
+--- a/SeriousProton-EE-2023.06.12PR/libs/basis_universal/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200
++++ b/SeriousProton-EE-2023.06.12PR/libs/basis_universal/CMakeLists.txt 2024-03-10 19:04:39.372885921 +0100
+@@ -3,35 +3,8 @@
+
+ find_package(Threads REQUIRED)
+
+-set(BASIS_VERSION "v1_15_update2")
+-set(BASIS_URL "https://github.com/BinomialLLC/basis_universal")
+-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
+- include(FetchContent)
+- FetchContent_Declare(
+- basis
+- GIT_REPOSITORY "${BASIS_URL}"
+- GIT_TAG "${BASIS_VERSION}"
+- )
+- FetchContent_GetProperties(basis)
+-else()
+- set(BASIS_BASE_PATH "${EXTERNALS_DIR}")
+- set(basis_POPULATED FALSE)
+- if(NOT EXISTS "${BASIS_BASE_PATH}/basis/CMakeLists.txt")
+- set(BASIS_ZIP "${DOWNLOADS_DIR}/basis.zip")
+- file(DOWNLOAD "${BASIS_URL}/archive/refs/tags/${BASIS_VERSION}.zip" "${BASIS_ZIP}" TIMEOUT 60 TLS_VERIFY ON)
+-
+- file(MAKE_DIRECTORY "${BASIS_BASE_PATH}/basis")
+- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${BASIS_ZIP}" WORKING_DIRECTORY "${BASIS_BASE_PATH}")
+- endif()
++set(basis_SOURCE_DIR "./")
+
+- set(basis_SOURCE_DIR "${BASIS_BASE_PATH}/basis")
+- set(basis_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/basis")
+-endif()
+-
+-if(NOT basis_POPULATED)
+- if(COMMAND FetchContent_Populate)
+- FetchContent_Populate(basis)
+- endif()
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(BUILD_X64 FALSE CACHE BOOL "")
+ endif()
+@@ -117,4 +90,3 @@
+ )
+ target_compile_features(basisu-transcoder PUBLIC cxx_std_11)
+ target_include_directories(basisu-transcoder INTERFACE "${basis_SOURCE_DIR}")
+-endif()
+\ No newline at end of file
+--- a/SeriousProton-EE-2023.06.12PR/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200
++++ b/SeriousProton-EE-2023.06.12PR/CMakeLists.txt 2024-03-10 20:05:58.833718666 +0100
+@@ -132,7 +132,7 @@
+ endif()
+
+ # BASIS Universal (Supercompressed GPU Texture Codec)
+-add_subdirectory(libs/basis_universal)
++add_subdirectory(libs/basis_universal/basis)
+
+ #---------------------------------File lists-----------------------------------
+ set(source_files #All SeriousProton's objects to compile
diff --git a/EmptyEpsilon-avoid_glm_libs_downloading.patch b/EmptyEpsilon-avoid_glm_libs_downloading.patch
new file mode 100644
index 0000000..67b58cb
--- /dev/null
+++ b/EmptyEpsilon-avoid_glm_libs_downloading.patch
@@ -0,0 +1,28 @@
+--- a/SeriousProton-EE-2023.06.12PR/CMakeLists.txt.backup_basis 2023-06-09 10:35:14.000000000 +0200
++++ b/SeriousProton-EE-2023.06.12PR/CMakeLists.txt 2024-03-12 18:50:31.811860098 +0100
+@@ -55,23 +55,8 @@
+ # * 'auto', if we failed to find a suitable system package,
+ # * 'bundled'
+ message(STATUS "GLM version used: BUNDLED")
+-
+- set(GLM_VERSION "0.9.9.8")
+- set(GLM_URL "https://github.com/g-truc/glm")
+- include(FetchContent)
+- FetchContent_Declare(
+- glm
+- GIT_REPOSITORY "${GLM_URL}"
+- GIT_TAG "${GLM_VERSION}"
+- )
+- FetchContent_GetProperties(glm)
+-
+- if(NOT glm_POPULATED)
+- if(COMMAND FetchContent_Populate)
+- FetchContent_Populate(glm)
+- endif()
+- add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR} EXCLUDE_FROM_ALL)
+- endif()
++ set(glm_SOURCE_DIR "glm")
++ add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR} EXCLUDE_FROM_ALL)
+ endif()
+
+ add_subdirectory(libs/Box2D)
diff --git a/EmptyEpsilon-avoid_meshoptimizer_libs_downloading.patch b/EmptyEpsilon-avoid_meshoptimizer_libs_downloading.patch
new file mode 100644
index 0000000..c02a4b3
--- /dev/null
+++ b/EmptyEpsilon-avoid_meshoptimizer_libs_downloading.patch
@@ -0,0 +1,43 @@
+--- a/CMakeLists.orig.txt 2023-06-14 09:23:22.000000000 +0200
++++ b/CMakeLists.txt 2024-03-12 18:03:05.165741793 +0100
+@@ -108,36 +108,11 @@
+
+ # Meshoptimizer
+ set(MESHOPTIMIZER_VERSION 0.16)
+-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
+- include(FetchContent)
+- FetchContent_Declare(
+- meshoptimizer
+- GIT_REPOSITORY https://github.com/zeux/meshoptimizer/
+- GIT_TAG "v${MESHOPTIMIZER_VERSION}"
+- )
+- FetchContent_GetProperties(meshoptimizer)
+-else()
+- # Poor man's FetchContent.
+- set(MESHOPTIMIZER_BASE_PATH "${EXTERNALS_DIR}")
+- set(meshoptimizer_POPULATED FALSE)
+- if(NOT EXISTS "${MESHOPTIMIZER_BASE_PATH}/meshoptimizer/CMakeLists.txt")
+- set(MESHOPTIMIZER_ZIP "${DOWNLOADS_DIR}/meshoptimizer.zip")
+- file(DOWNLOAD "https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MESHOPTIMIZER_..." "${MESHOPTIMIZER_ZIP}" TIMEOUT 60 TLS_VERIFY ON)
++set(MESHOPTIMIZER_BASE_PATH "./")
++set(meshoptimizer_SOURCE_DIR "${MESHOPTIMIZER_BASE_PATH}/meshoptimizer")
++set(meshoptimizer_BINARY_DIR "${PROJECT_BINARY_DIR}/meshoptimizer")
+
+- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${MESHOPTIMIZER_ZIP}" WORKING_DIRECTORY "${MESHOPTIMIZER_BASE_PATH}")
+- execute_process(COMMAND ${CMAKE_COMMAND} -E rename "meshoptimizer-${MESHOPTIMIZER_VERSION}" meshoptimizer WORKING_DIRECTORY "${MESHOPTIMIZER_BASE_PATH}")
+- endif()
+-
+- set(meshoptimizer_SOURCE_DIR "${MESHOPTIMIZER_BASE_PATH}/meshoptimizer")
+- set(meshoptimizer_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/meshoptimizer")
+-endif()
+-
+-if(NOT meshoptimizer_POPULATED)
+- if(COMMAND FetchContent_Populate)
+- FetchContent_Populate(meshoptimizer)
+- endif()
+- add_subdirectory(${meshoptimizer_SOURCE_DIR} ${meshoptimizer_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
++add_subdirectory(${meshoptimizer_SOURCE_DIR} ${meshoptimizer_BINARY_DIR} EXCLUDE_FROM_ALL)
+
+ set(GUI_LIB_SOURCES
+ src/gui/colorConfig.cpp
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 58d571e..1b50bb5 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -1,12 +1,14 @@
-%global version_major 2021
+%global version_major 2023
%global version_minor 06
-%global version_patch 23
+%global version_patch 17
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
Version: %{version_major}.%{version_minor}.%{version_patch}
-Release: 7%{?dist}
-License: GPLv2
+Release: 1%{?dist}
+# Apache-2.0, BSD-3-Clause and Zlib are used in basis_universal
+# MIT is used by meshoptimizer and GLM
+License: GPL-2.0-only AND Apache-2.0 AND BSD-3-Clause AND Zlib AND MIT
BuildRequires: cmake
BuildRequires: dos2unix
@@ -14,38 +16,27 @@ BuildRequires: gcc-c++
BuildRequires: SFML-devel >= 2.5.1
BuildRequires: mesa-libGLU-devel >= 9.0.0
BuildRequires: desktop-file-utils
-# The following version of "glm-devel" is not currently available for Fedora 33 and older
+%if 0%{?fedora} < 41
BuildRequires: glm-devel >= 0.9.9.8
+%endif
+BuildRequires: SDL2-devel
-ExcludeArch: ppc64 ppc64le
+ExcludeArch: %{power64}
URL: http://emptyepsilon.org/
-Source0: https://github.com/daid/EmptyEpsilon/archive/EE-%{version}.zip#/EmptyEpsi...
-Source1: https://github.com/daid/SeriousProton/archive/EE-%{version}.zip#/SeriousP...
+Source0: https://github.com/daid/EmptyEpsilon/archive/EE-%{version}/EmptyEpsilon-E...
+Source1: https://github.com/daid/SeriousProton/archive/EE-2023.06.12/SeriousProton...
+# Upstream wants to download following libraries; we need to bundle them
+Source2: https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_up...
+Source3: https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16/meshoptimiz...
+# EmptyEpsilon is not compatible with GLM-1.0.1 yet
+Source4: https://github.com/g-truc/glm/archive/refs/tags/0.9.9.8.tar.gz/glm-0.9.9....
-# EmptyEpsilon downstream patches:
-Patch1: gcc12.patch
-
-# SeriousProton downstream patches:
-#Patch20:
-
-# EmptyEpsilon upstream patches:
-Patch40: upstream_EE_001_69d93e6acd.patch
-Patch41: upstream_EE_002_872ef2667c.patch
-Patch42: upstream_EE_003_ee0cd42bfe.patch
-Patch43: upstream_EE_004_530fe32f95.patch
-
-# SeriousProton upstream patches:
-Patch60: upstream_SP_001_32509f2db9.patch
-Patch61: upstream_SP_002_d52a1b1b61.patch
-Patch62: upstream_SP_003_ec30d87c22.patch
-Patch63: upstream_SP_004_adbba45fd9.patch
-Patch64: upstream_SP_005_0d1ac45b73.patch
-
-
-Recommends: xclip
+Patch0: EmptyEpsilon-avoid_basis_libs_downloading.patch
+Patch1: EmptyEpsilon-avoid_meshoptimizer_libs_downloading.patch
+Patch2: EmptyEpsilon-avoid_glm_libs_downloading.patch
%description
EmptyEpsilon places you in the roles of a spaceship's bridge officers, like
@@ -60,39 +51,68 @@ information and follow orders.
Note: Network play require port 35666 UDP and TCP allowed in firewall.
%prep
-%setup -q -a 1 -n EmptyEpsilon-EE-%{version}
-dos2unix SeriousProton-EE-2021.06.23/src/httpServer.cpp \
- SeriousProton-EE-2021.06.23/src/scriptInterfaceMagic.cpp
-
-%patch 1 -p1
-%patch 40 -p1
-%patch 41 -p1
-%patch 42 -p1
-%patch 43 -p1
-%patch 60 -p1 -d SeriousProton-EE-%{version}
-%patch 61 -p1 -d SeriousProton-EE-%{version}
-%patch 62 -p1 -d SeriousProton-EE-%{version}
-%patch 63 -p1 -d SeriousProton-EE-%{version}
-%patch 64 -p1 -d SeriousProton-EE-%{version}
-
+%autosetup -a 1 -n EmptyEpsilon-EE-%{version} -N
+
+# basis
+%patch -P 0 -p1 -b .backup_basis
+%if 0%{?fedora} > 40
+%patch -P 2 -p1 -b .backup_glm
+%endif
+pushd SeriousProton-EE-2023.06.12PR/libs/basis_universal
+tar -xf %{SOURCE2}
+mv basis_universal-1_15_update2 basis
+mv basis/LICENSE basis/basis-LICENSE
+# Use CMakeLists.txt from EmptyEpsilon upstream to compile 'basis' static library
+cp -p CMakeLists.txt basis/
+popd
+
+# GLM
+%if 0%{?fedora} > 40
+tar -xf %{SOURCE4}
+mv glm-0.9.9.8 glm
+mv glm/copying.txt glm/glm-copying.txt
+mv glm SeriousProton-EE-2023.06.12PR/
+%endif
+
+# meshoptimizer
+tar -xf %{SOURCE3}
+mv meshoptimizer-0.16 meshoptimizer
+mv meshoptimizer/LICENSE.md meshoptimizer/meshoptimizer-LICENSE.md
+%patch -P 1 -p1 -b .backup
%build
+%global __cmake_in_source_build 1
+pushd SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+%cmake
+%cmake_build
+popd
+
+export CXXFLAGS="%{optflags} -I../SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis"
+export LDFLAGS="%{__global_ldflags} -L../SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis"
%cmake \
- -DSERIOUS_PROTON_DIR=SeriousProton-EE-%{version}/ \
+ -DSERIOUS_PROTON_DIR=SeriousProton-EE-2023.06.12PR/ \
-DCPACK_PACKAGE_VERSION_MAJOR=%{version_major} \
-DCPACK_PACKAGE_VERSION_MINOR=%{version_minor} \
-DCPACK_PACKAGE_VERSION_PATCH=%{version_patch} \
+%if 0%{?fedora} > 40
+ -DWITH_GLM="bundled" \
+%else
-DWITH_GLM="system" \
+%endif
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DCONFIG_DIR=%{_sysconfdir}/emptyepsilon/
-
-
%cmake_build
%install
%cmake_install
+rm -f %{buildroot}%{_datadir}/emptyepsilon/scripts/.gitignore
+
+install -pm 644 README.md CHANGELOG.md %{buildroot}%{_docdir}/EmptyEpsilon/
+
# icon to pixmaps
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m 644 ./logo.png %{buildroot}%{_datadir}/pixmaps/EmptyEpsilon.png
@@ -113,14 +133,22 @@ EOF
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%files
-%doc README.md script_reference.html
-%license LICENSE
-%{_bindir}/EmptyEpsilon
+%license LICENSE meshoptimizer/meshoptimizer-LICENSE.md
+%license SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis/basis-LICENSE
+%if 0%{?fedora} > 40
+%license SeriousProton-EE-2023.06.12PR/glm/glm-copying.txt
+%endif
+%{_bindir}/%{name}
%{_datadir}/emptyepsilon
-%{_datadir}/pixmaps/EmptyEpsilon.png
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/1024x1024/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
+%{_docdir}/EmptyEpsilon/
%changelog
+* Sun Mar 10 2024 Antonio Trande <sagitter(a)fedoraproject.org> - 2023.06.17-1
+- Release 2023.06.17
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2021.06.23-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index c543d6a..c249817 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,5 @@
-SHA512 (EmptyEpsilon-EE-2021.06.23.zip) = 40efed8eb7433323e1d554f66e5ec1a75c4dab23e42664a46e4758dfcb518f51f1d28e1ff76117b319f963bfc2d810d06bbd25d4c0d1f652adf4990332cd43ce
-SHA512 (SeriousProton-EE-2021.06.23.zip) = 63a7fa7022f58fb1b87de509bd4ab122cd17ce3360d1ff48d50c0a7ad1fa55f1a18c512c3e0910a56ff814540983d62edf44b1a45b4a0054e0a01ce81aa4bea2
+SHA512 (EmptyEpsilon-EE-2023.06.17.tar.gz) = d03740f5ed59cf0b8e111eb907ea56a6a92076816808a1289352ddc158d28faa692f5a164d23449ff37570adde2552d7f92a7d30caf8584bfdae03c83766872c
+SHA512 (SeriousProton-EE-2023.06.12PR.tar.gz) = 1152fd1246e524ac0f34ad59cc00016e98b20ec8c6ff3634ee0b75b708c944d8e8aa46c456720036d5c12927e5e42a7231dcd14fee9f388061bf2398beb80fc7
+SHA512 (basis_universal-1_15_update2.tar.gz) = a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32
+SHA512 (glm-0.9.9.8.tar.gz) = 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
+SHA512 (meshoptimizer-0.16.tar.gz) = cc6d28359fb99a615e1046a4af1b247cbc6ea0266d9e7f41ea0516c1fc09fa1e67376071daf138a126c77bca3baf9d565636ed0e3adf045f1a08498c38b7a7e7
1 month, 4 weeks
[kodi/f40] (4 commits) ...Fix PRERELEASE macro because I am not awake
by Michael Cronenworth
Summary of changes:
5cbb97f... Update to 21.0 RC2 (*)
6db18ba... Fix version macro for release candidates (*)
0803ad6... Fix version macro everywhere (*)
3b9e9b4... Fix PRERELEASE macro because I am not awake (*)
(*) This commit already existed in another branch; no separate mail sent
1 month, 4 weeks
[kodi] Fix PRERELEASE macro because I am not awake
by Michael Cronenworth
commit 3b9e9b4271a7b309ec9079de70524123802a6c58
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu Mar 21 11:22:15 2024 -0500
Fix PRERELEASE macro because I am not awake
kodi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index c001ec1..c7e5581 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-#global PRERELEASE rc2
+%global PRERELEASE rc2
#global DIRVERSION %{version}
#global GITCOMMIT db40b2a
# use the line below for pre-releases
1 month, 4 weeks
[kodi] Fix version macro everywhere
by Michael Cronenworth
commit 0803ad693d0a1b056db1e4ead93d937f06a2d77c
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu Mar 21 11:16:29 2024 -0500
Fix version macro everywhere
kodi.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 8b885e9..c001ec1 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,9 +1,9 @@
#global PRERELEASE rc2
-%global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}
#global GITCOMMIT db40b2a
# use the line below for pre-releases
#global DIRVERSION %{version}-%{GITCOMMIT}
-#global DIRVERSION %{version}%{PRERELEASE}
+%global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
%ifarch %{arm} %{arm64}
# Disable LTO for arm, see http://koji.rpmfusion.org/koji/taskinfo?taskID=424139
@@ -308,7 +308,7 @@ This package contains FirewallD files for Kodi.
%prep
-%setup -q -n %{name}-%{DIRVERSION}rc1
+%setup -q -n %{name}-%{DIRVERSION}
pushd ..
unzip %{SOURCE6}
popd
1 month, 4 weeks
[kodi] Fix version macro for release candidates
by Michael Cronenworth
commit 6db18ba49e01d70226f7c6e6239c978f84defb25
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu Mar 21 11:15:15 2024 -0500
Fix version macro for release candidates
kodi.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 03d43f1..8b885e9 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,5 +1,5 @@
#global PRERELEASE rc2
-%global DIRVERSION %{version}
+%global DIRVERSION %{version}%{PRERELEASE}
#global GITCOMMIT db40b2a
# use the line below for pre-releases
#global DIRVERSION %{version}-%{GITCOMMIT}
@@ -47,7 +47,7 @@ License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
# Some supporting libraries use the LGPL / BSD / MIT license
Group: Applications/Multimedia
URL: https://www.kodi.tv/
-Source0: %{name}-%{DIRVERSION}rc1-patched.tar.xz
+Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# kodi contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
1 month, 4 weeks
[kodi] Update to 21.0 RC2
by Michael Cronenworth
commit 5cbb97f626c4df436b71cc0cdb34393dc2a4d28e
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu Mar 21 11:05:21 2024 -0500
Update to 21.0 RC2
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 246abb6..68fd334 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=21
-MINORVERSION=0rc1
+MINORVERSION=0rc2
#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
#GITSHORT=b6daed5
CODENAME=Omega
diff --git a/kodi.spec b/kodi.spec
index 34bbb52..03d43f1 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -39,7 +39,7 @@
Name: kodi
Version: 21.0
-Release: 0.0rc1%{?dist}
+Release: 0.0rc2%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -446,6 +446,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker
%changelog
+* Thu Mar 21 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.0-0.0rc2
+- Kodi 21.0 RC2
+
* Mon Mar 11 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.0-0.0rc1
- Kodi 21.0 RC1
diff --git a/sources b/sources
index 79f92b5..7ef6175 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (kodi-21.0rc1-patched.tar.xz) = 52dddec70444bf7fb0081f8b4b52c24e6a33cdde385dc7c7ff9f1fc3a36e4efb49758329c9c4fce7e0416709a19de5936e0718f08c7f2ed07abb5f1d0df4ca65
+SHA512 (kodi-21.0rc2-patched.tar.xz) = e5671ea207434f59c4753366c92ffa9c3afa30a60a0d1d35e4e8c584f481778cb37931397027325b0a05bb44c4c3086ae8f145858199e410513cb4d0ccc6284a
SHA512 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d
SHA512 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
SHA512 (apache-groovy-binary-4.0.16.zip) = 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
1 month, 4 weeks
[v4l2loopback/f40] Update to 0.13.1
by Leigh Scott
Summary of changes:
e726b32... Update to 0.13.1 (*)
(*) This commit already existed in another branch; no separate mail sent
1 month, 4 weeks
[v4l2loopback] Update to 0.13.1
by Leigh Scott
commit e726b32c1513fe8c9626e616044e8c516c0834c8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Mar 21 14:52:49 2024 +0000
Update to 0.13.1
sources | 2 +-
v4l2loopback.spec | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index f1b1d48..6322a69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v4l2loopback-2c9b670.tar.gz) = 77a6a6c757b496d3d2cc12c3adf6353c652d3c4f78e5deaa4c763fbd4aa5b70e356a49624a7988dab12e0645b7f51ede00b27fb8c209fb5293192bc3c1284557
+SHA512 (v4l2loopback-0.13.1.tar.gz) = 28b8c90f1e5fe48d19f41dbc188bf383ce8a6db33707ef161b55cae3217704a7e45e91a782bc3bf08db338f8ba0f045afd52899026be7e2e9bfeb6799a876628
diff --git a/v4l2loopback.spec b/v4l2loopback.spec
index 9bd6952..3ec8bec 100644
--- a/v4l2loopback.spec
+++ b/v4l2loopback.spec
@@ -4,12 +4,12 @@
Name: v4l2loopback
Summary: Utils for V4L2 loopback devices
-Version: 0.12.7^%{commitdate}g%{shortcommit}
-Release: 3%{?dist}
+Version: 0.13.1
+Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/umlaeute/v4l2loopback
-Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: modprobe-d-98-v4l2loopback.conf
Source2: modules-load-d-v4l2loopback.conf
@@ -34,7 +34,7 @@ This package contains the utilties for %{name}.
%prep
-%autosetup -p1 -n %{name}-%{commit}
+%autosetup -p1 -n %{name}-%{version}
%build
%{set_build_flags}
@@ -58,6 +58,9 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf
%changelog
+* Thu Mar 21 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.13.1-1
+- Update to 0.13.1
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.12.7^20230503g2c9b670-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
1 month, 4 weeks