[ffmpeg] Add spec fixes from rfbz #4964
by Julian Sikorski
commit 6a4ece2c892c35e8629a10996555f2ac5bc4eeca
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sun Jul 29 12:24:44 2018 +0200
Add spec fixes from rfbz #4964
ffmpeg.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 38c7924..74b4b2f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -72,7 +72,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.0.2
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -114,7 +114,7 @@ BuildRequires: libiec61883-devel
BuildRequires: libdrm-devel
BuildRequires: libgcrypt-devel
BuildRequires: libGL-devel
-Buildrequires: libmodplug-devel
+BuildRequires: libmodplug-devel
BuildRequires: librsvg2-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
@@ -124,7 +124,7 @@ BuildRequires: libv4l-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
+%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
%ifarch %{ix86} x86_64
%{!?_without_mfx:BuildRequires: libmfx-devel >= 1.23-1}
BuildRequires: libXvMC-devel
@@ -141,7 +141,7 @@ BuildRequires: opencl-headers ocl-icd-devel
%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg2-devel
-BuildRequires: opus-devel
+BuildRequires: opus-devel >= 1.1.3
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
%{?_with_rubberband:BuildRequires: rubberband-devel}
@@ -405,6 +405,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Jul 29 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 4.0.2-3
+- Add spec fixes from rfbz #4964
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 8 months
[pcsx2/f28] (9 commits) ...Add -SDL2_API=TRUE as ask by configure
by Sérgio M. Basto
Summary of changes:
14cf311... Fix build on F27 (*)
c403623... Simpler scriptlet (*)
3889f4f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
f231010... Try fix rfbz #4962 Use the same SDL that wxGTK depends on ( (*)
fdf756d... Fix typo: forgot apply the patch2 (*)
027186a... Rebase pcsx2-wxWidgets-SDL2.patch (*)
7149d21... Fix typo (*)
ed493b7... BR gcc (*)
e898ea9... Add -SDL2_API=TRUE as ask by configure (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[pcsx2] Add -SDL2_API=TRUE as ask by configure
by Sérgio M. Basto
commit e898ea98b2a0495e2ef882faab23e8e28476d07f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 21:02:33 2018 +0100
Add -SDL2_API=TRUE as ask by configure
pcsx2.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/pcsx2.spec b/pcsx2.spec
index 844613f..6dfb3e9 100644
--- a/pcsx2.spec
+++ b/pcsx2.spec
@@ -106,8 +106,12 @@ export WX_CONFIG=wx-config-3.0-gtk2
%else
-DWX28_API=TRUE \
%endif
- -DEXTRA_PLUGINS=FALSE \
+%if (0%{?fedora} >= 28)
+ -DSDL2_API=TRUE \
+%else
-DSDL2_API=FALSE \
+%endif
+ -DEXTRA_PLUGINS=FALSE \
-DDISABLE_ADVANCE_SIMD=TRUE \
-DOpenGL_GL_PREFERENCE=GLVND \
-DCMAKE_BUILD_TYPE=Release
5 years, 8 months
[pcsx2] BR gcc
by Sérgio M. Basto
commit ed493b7676944ed11d3b3c72a099889dda7e5f5f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 21:02:16 2018 +0100
BR gcc
pcsx2.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/pcsx2.spec b/pcsx2.spec
index 1fcb9f4..844613f 100644
--- a/pcsx2.spec
+++ b/pcsx2.spec
@@ -13,6 +13,7 @@ Patch2: pcsx2-wxWidgets-SDL2.patch
# PCSX2 does not support running as a 64 bit application.
# http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
ExclusiveArch: i686
+BuildRequires: gcc gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: cmake
BuildRequires: zlib-devel
5 years, 8 months
[kdenlive] Fix build
by Sérgio M. Basto
commit 41732dc2233cc6e7b110840f121653db9455f80a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 19:15:35 2018 +0100
Fix build
kdenlive.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 103c2ba..68ae8a3 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -135,7 +135,7 @@ fi
%{_kf5_datadir}/applications/org.kde.%{name}.desktop
%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%{_kf5_datadir}/kdenlive/
-%{_kf5_datadir}/mime/packages/kdenlive.xml
+%{_kf5_datadir}/mime/packages/org.kde.kdenlive.xml
%{_kf5_datadir}/mime/packages/westley.xml
%{_kf5_datadir}/icons/hicolor/*/*/*
%{_kf5_datadir}/config.kcfg/kdenlivesettings.kcfg
5 years, 8 months
[pcsx2] Fix typo
by Sérgio M. Basto
commit 7149d21152dd1077e6e4bc9195ae2c35e432af60
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 19:11:48 2018 +0100
Fix typo
pcsx2-wxWidgets-SDL2.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/pcsx2-wxWidgets-SDL2.patch b/pcsx2-wxWidgets-SDL2.patch
index b7a7f69..16ec3a2 100644
--- a/pcsx2-wxWidgets-SDL2.patch
+++ b/pcsx2-wxWidgets-SDL2.patch
@@ -10,8 +10,8 @@ Fedora 27).
cmake/ApiValidation.cmake | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
---- cmake/ApiValidation.cmake.orig 2016-02-11 22:03:53.000000000 +0000
-+++ cmake/ApiValidation.cmake 2018-07-28 19:02:46.396522565 +0100
+--- ./cmake/ApiValidation.cmake.orig 2016-02-11 22:03:53.000000000 +0000
++++ ./cmake/ApiValidation.cmake 2018-07-28 19:02:46.396522565 +0100
@@ -1,27 +1,42 @@
set(wx_sdl_c_code "
#include <wx/setup.h>
5 years, 8 months
[pcsx2] Rebase pcsx2-wxWidgets-SDL2.patch
by Sérgio M. Basto
commit 027186aa5d0a061f8efbd0622a0214c8276ee88b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 19:04:33 2018 +0100
Rebase pcsx2-wxWidgets-SDL2.patch
pcsx2-wxWidgets-SDL2.patch | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/pcsx2-wxWidgets-SDL2.patch b/pcsx2-wxWidgets-SDL2.patch
index ce313ae..b7a7f69 100644
--- a/pcsx2-wxWidgets-SDL2.patch
+++ b/pcsx2-wxWidgets-SDL2.patch
@@ -10,11 +10,9 @@ Fedora 27).
cmake/ApiValidation.cmake | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
-diff --git a/cmake/ApiValidation.cmake b/cmake/ApiValidation.cmake
-index e7a4f99a77..f93bc67fcd 100644
---- a/cmake/ApiValidation.cmake
-+++ b/cmake/ApiValidation.cmake
-@@ -1,9 +1,14 @@
+--- cmake/ApiValidation.cmake.orig 2016-02-11 22:03:53.000000000 +0000
++++ cmake/ApiValidation.cmake 2018-07-28 19:02:46.396522565 +0100
+@@ -1,27 +1,42 @@
set(wx_sdl_c_code "
#include <wx/setup.h>
@@ -29,8 +27,7 @@ index e7a4f99a77..f93bc67fcd 100644
+}
")
- set(gcc7_mmx_code "
-@@ -83,19 +88,29 @@ function(WX_vs_SDL)
+ function(WX_vs_SDL)
file(WRITE "${CMAKE_BINARY_DIR}/wx_sdl.c" "${wx_sdl_c_code}")
enable_language(C)
@@ -42,6 +39,11 @@ index e7a4f99a77..f93bc67fcd 100644
- COMPILE_OUTPUT_VARIABLE OUT
- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}"
- )
+-
+- if (${OUT} MATCHES "cmake_WX_SDL" AND SDL2_API)
+- message(FATAL_ERROR "WxWidget is linked to SDL (wxUSE_LIBSDL) and it is likely SDL1.2.
+- Unfortunately you try to build PCSX2 with SDL2 support which is not compatible
+- Please use -DSDL2_API=FALSE")
+ try_compile(
+ wx_linked_to_sdl
+ "${CMAKE_BINARY_DIR}"
@@ -60,15 +62,10 @@ index e7a4f99a77..f93bc67fcd 100644
+ COMMAND grep -c SDL2
+ OUTPUT_VARIABLE sdl2_count
+ )
-
-- if (${OUT} MATCHES "cmake_WX_SDL" AND SDL2_API)
-- message(FATAL_ERROR "WxWidget is linked to SDL (wxUSE_LIBSDL) and it is likely SDL1.2.
-- Unfortunately you try to build PCSX2 with SDL2 support which is not compatible
-- Please use -DSDL2_API=FALSE")
++
+ if (SDL2_API AND sdl2_count STREQUAL "0")
+ message(FATAL_ERROR "wxWidgets is linked to SDL1.2. Please use -DSDL2_API=FALSE.")
+ elseif (NOT SDL2_API AND NOT sdl2_count STREQUAL "0")
+ message(FATAL_ERROR "wxWidgets is linked to SDL2. Please use -DSDL2_API=TRUE")
endif()
endfunction()
-
5 years, 8 months
[kdenlive] Update kdenlive to 18.04.3
by Sérgio M. Basto
commit bf2bfc2a7a58ebe3796257c8f8b6588f158ce557
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jul 27 02:38:09 2018 +0100
Update kdenlive to 18.04.3
.gitignore | 1 +
kdenlive.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 006dffe..eff57bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/kdenlive-17.12.2.tar.xz
/kdenlive-17.12.3.tar.xz
/kdenlive-18.04.1.tar.xz
+/kdenlive-18.04.3.tar.xz
diff --git a/kdenlive.spec b/kdenlive.spec
index 68bc4ee..103c2ba 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,8 +1,8 @@
Name: kdenlive
Summary: Non-linear video editor
-Version: 18.04.1
-Release: 2%{?dist}
+Version: 18.04.3
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -152,6 +152,9 @@ fi
%changelog
+* Fri Jul 27 2018 Sérgio Basto <sergio(a)serjux.com> - 18.04.3-1
+- Update kdenlive to 18.04.3
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 18.04.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 81131ec..d5428c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c936bf68bf07c7c629f9b6233dec3a93 kdenlive-18.04.1.tar.xz
+c21031efe09f70791fcb42b7b3d5cfed kdenlive-18.04.3.tar.xz
5 years, 8 months
[pcsx2] Fix typo: forgot apply the patch2
by Sérgio M. Basto
commit fdf756da46f26be44a76ddcc937b1bd41c4ec071
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 18:17:14 2018 +0100
Fix typo: forgot apply the patch2
pcsx2.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/pcsx2.spec b/pcsx2.spec
index ff9cb39..1fcb9f4 100644
--- a/pcsx2.spec
+++ b/pcsx2.spec
@@ -67,6 +67,7 @@ this emulator anyway.
%prep
%setup -q -n pcsx2-1.4
%patch1 -p1 -b .gcc6
+%patch2 -p1 -b .SDL2
# To remove executable bits from man, doc and icon files
chmod -x pcsx2/Docs/GPL.txt pcsx2/Docs/License.txt pcsx2/Docs/readme-Docs.txt pcsx2/Docs/PCSX2_FAQ.doc pcsx2/Docs/PCSX2_Readme.doc bin/docs/PCSX2.1 linux_various/PCSX2.xpm
5 years, 8 months