[ppsspp] Release 1.14.2| Fix patch0
by sagitter
commit ed5fe92cac3a64e91ee4db380da256928f4c1a39
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Dec 31 19:43:47 2022 +0100
Release 1.14.2| Fix patch0
ppsspp-1.1.0-git-version.patch | 29 ++---------------------------
1 file changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/ppsspp-1.1.0-git-version.patch b/ppsspp-1.1.0-git-version.patch
index 0f9b268..b7d74e3 100644
--- a/ppsspp-1.1.0-git-version.patch
+++ b/ppsspp-1.1.0-git-version.patch
@@ -1,35 +1,10 @@
diff -urN a/git-version.cmake b/git-version.cmake
--- a/git-version.cmake 2015-10-05 02:52:23.000000000 +1000
+++ b/git-version.cmake 2015-10-05 23:23:47.691228897 +1000
-@@ -1,30 +1,7 @@
+@@ -1,5 +1,5 @@
set(GIT_VERSION_FILE "${OUTPUT_DIR}/git-version.cpp")
-set(GIT_VERSION "unknown")
+set(GIT_VERSION "@@unknown_version@@")
set(GIT_VERSION_UPDATE "1")
--find_package(Git)
--if(GIT_FOUND AND EXISTS "${SOURCE_DIR}/.git/")
-- execute_process(COMMAND ${GIT_EXECUTABLE} describe --always
-- WORKING_DIRECTORY ${SOURCE_DIR}
-- RESULT_VARIABLE exit_code
-- OUTPUT_VARIABLE GIT_VERSION)
-- if(NOT ${exit_code} EQUAL 0)
-- message(WARNING "git describe failed, unable to include version.")
-- endif()
-- string(STRIP ${GIT_VERSION} GIT_VERSION)
--else()
-- message(WARNING "git not found, unable to include version.")
--endif()
--
--if(EXISTS ${GIT_VERSION_FILE})
-- # Don't update if marked not to update.
-- file(STRINGS ${GIT_VERSION_FILE} match
-- REGEX "PPSSPP_GIT_VERSION_NO_UPDATE 1")
-- if(NOT ${match} EQUAL "")
-- set(GIT_VERSION_UPDATE "0")
-- endif()
--endif()
--
- set(code_string "// This is a generated file.\n\n"
- "const char *PPSSPP_GIT_VERSION = \"${GIT_VERSION}\"\;\n\n"
- "// If you don't want this file to update/recompile, change to 1.\n"
+ find_package(Git)
1 year, 10 months
[ppsspp] Release 1.14.2
by sagitter
commit 5b5e9d89f3cc6aa209b1e72e0b98d57e4f4f12fc
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Dec 31 19:28:55 2022 +0100
Release 1.14.2
.gitignore | 1 +
ppsspp.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b18e62..4cdfa75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/ppsspp-ffmpeg-1.13.1.tar.gz
/ppsspp-ffmpeg-1.13.2.tar.gz
/ppsspp-ffmpeg-1.14.tar.gz
+/ppsspp-ffmpeg-1.14.2.tar.gz
diff --git a/ppsspp.spec b/ppsspp.spec
index 7a42db0..bf29b7e 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -73,7 +73,7 @@ ExcludeArch: %{power64}
Name: ppsspp
-Version: 1.14
+Version: 1.14.2
Release: 1%{?dist}
Summary: A PSP emulator
License: BSD and GPLv2+
@@ -83,7 +83,7 @@ URL: https://www.ppsspp.org/
## We need to checkout it, then download relative submodules
## which are not included in the source code:
##
-# git clone -b v1.14 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
+# git clone -b v1.14.2 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
# cd ppsspp/ffmpeg && git checkout cea6dd17be4ea045946dc991ef0bca91f9005345
# rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu
# cd ..
@@ -420,6 +420,9 @@ fi
%{_datadir}/icons/%{name}/
%changelog
+* Sat Dec 31 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 1.14.2-1
+- Release 1.14.2
+
* Thu Dec 15 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 1.14-1
- Release 1.14
diff --git a/sources b/sources
index f54aa25..bc22ca7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ppsspp-ffmpeg-1.14.tar.gz) = 669bfecafbe5e39937942b627f94743b0a656fc6da0bc960064842c86baeadd88ec813226092b6e048d914f56cab22ea12a28ba9a99be8710d6c3959739a77de
+SHA512 (ppsspp-ffmpeg-1.14.2.tar.gz) = 33ecae0471db42cd5bb36ad697fc9b49e2815d110f4d64a027fbda3f7141868740099368aed52cc9baa95637ab4e51a78f5c6449e4d972393490308bb2256edd
1 year, 10 months
[telegram-desktop/f36] Fixed build against ffmpeg 5 (if enabled).
by Vitaly Zaitsev
commit c0e94ff96cdd63d9c72bbd0896705a5239159fb2
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Dec 31 11:27:10 2022 +0100
Fixed build against ffmpeg 5 (if enabled).
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 7f9b7fa..f5c681a 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -124,6 +124,7 @@ BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
+BuildRequires: ffmpeg-devel
Requires: ffmpeg-libs%{?_isa}
%endif
1 year, 10 months
[tg_owt/f37] Fixed build against ffmpeg 5 (if enabled).
by Vitaly Zaitsev
commit 3e9256a74bd5e75d4342ba4170fd35b6330c4b0b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Dec 31 11:25:20 2022 +0100
Fixed build against ffmpeg 5 (if enabled).
tg_owt.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index df46b3e..c57bd94 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -81,6 +81,7 @@ BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
+BuildRequires: ffmpeg-devel
%endif
# Video calls doesn't work when built against openssl 3.0:
@@ -141,6 +142,7 @@ Requires: pkgconfig(libavformat)
Requires: pkgconfig(libavutil)
Requires: pkgconfig(libswresample)
Requires: pkgconfig(libswscale)
+Requires: ffmpeg-devel
%endif
%if %{legacy_openssl}
1 year, 10 months
