[mplayer] Drop old gtk2 gui to fix build issue
by Leigh Scott
commit 2e9b94c46e4cb9919cdddd059abd78b217340aa3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 11 10:26:35 2023 +0100
Drop old gtk2 gui to fix build issue
.gitignore | 1 +
mplayer.spec | 74 ++++++++----------------------------------------------------
sources | 3 +--
3 files changed, 11 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77d381c..23995e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ MPlayer-1.3.0.tar.xz
/mplayer-export-2022-07-26.tar.xz
/mplayer-export-2023-02-28.tar.xz
/mplayer-export-2023-05-30.tar.xz
+/mplayer-export-2023-08-11.tar.xz
diff --git a/mplayer.spec b/mplayer.spec
index 8e9c5ac..b1d4a17 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -3,16 +3,16 @@
%endif
%global codecdir %{_libdir}/codecs
-%global pre 20230530svn
+%global pre 20230811svn
%global svn 1
-%global svnbuild 2023-05-30
+%global svnbuild 2023-08-11
Name: mplayer
Version: 1.5.1
%if 0%{?svn}
-Release: 0.7%{?pre:.%{pre}}%{?dist}
+Release: 0.8%{?pre:.%{pre}}%{?dist}
%else
-Release: 7%{?dist}
+Release: 8%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -28,7 +28,6 @@ Source0: mplayer-export-%{svnbuild}.tar.xz
%else
Source0: https://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
%endif
-Source1: https://www.mplayerhq.hu/MPlayer/skins/Blue-1.11.tar.bz2
Source10: mplayer-snapshot.sh
# set defaults for Fedora
Patch0: %{name}-config.patch
@@ -51,7 +50,6 @@ BuildRequires: fribidi-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gsm-devel
-BuildRequires: gtk2-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: lame-devel
@@ -104,6 +102,7 @@ BuildRequires: libxslt
%endif
Requires: mplayer-common = %{version}-%{release}
Provides: mplayer-backend
+Obsoletes: mplayer-gui
%description
MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM,
@@ -137,14 +136,6 @@ Summary: MPlayer common files
%description common
This package contains common files for MPlayer packages.
-%package gui
-Summary: GUI for MPlayer
-Requires: mplayer-common = %{version}-%{release}
-Requires: hicolor-icon-theme
-
-%description gui
-This package contains a GUI for MPlayer and a default skin for it.
-
%package -n mencoder
Summary: MPlayer movie encoder
Requires: mplayer-common = %{version}-%{release}
@@ -229,21 +220,11 @@ rm -rf ffmpeg
%patch -P 1 -p1 -b .manlinks
%patch -P 2 -p1 -b .ffmpeg
-mkdir GUI
-cp -a `ls -1|grep -v GUI` GUI/
sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' TOOLS/{mphelp_check,vobshift}.py
%build
-pushd GUI
-export CC=gcc
-export CXX=g++
export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
-%{mp_configure}--enable-gui --disable-mencoder
-
-%make_build V=1
-popd
-
export CC=gcc
export CXX=g++
%{mp_configure}
@@ -287,27 +268,6 @@ install -Dpm 644 etc/example.conf \
install -pm 644 etc/{input,menu}.conf $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/
-# GUI mplayer
-install -pm 755 GUI/%{name} $RPM_BUILD_ROOT%{_bindir}/gmplayer
-
-# Default skin
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins
-tar xjC $RPM_BUILD_ROOT%{_datadir}/mplayer/skins --exclude=.svn -f %{SOURCE1}
-ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default
-
-# Icons
-for iconsize in 16x16 22x22 24x24 32x32 48x48 256x256
-do
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps
-install -pm 644 etc/mplayer$iconsize.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps/mplayer.png
-done
-
-# Desktop file
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- etc/%{name}.desktop
-
# Codec dir
install -dm 755 $RPM_BUILD_ROOT%{codecdir}
sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}/vobshift
@@ -315,20 +275,6 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}
%find_lang %{name} --with-man
%find_lang mencoder --with-man
-%if (0%{?rhel} && 0%{?rhel} <= 7)
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
%files
%{_bindir}/mplayer
@@ -343,12 +289,6 @@ fi
%dir %{_datadir}/mplayer/
%{_mandir}/man1/mplayer.1*
-%files gui
-%{_bindir}/gmplayer
-%{_datadir}/applications/*mplayer.desktop
-%{_datadir}/icons/hicolor/*/apps/mplayer.png
-%{_datadir}/mplayer/skins/
-
%files -n mencoder -f mencoder.lang
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
@@ -379,6 +319,10 @@ fi
%{_datadir}/mplayer/*.fp
%changelog
+* Fri Aug 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.5.1-0.8.20230811svn
+- Update snapshot
+- Drop GUI
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.5.1-0.7.20230530svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 258c4a5..82d3bb5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (mplayer-export-2023-05-30.tar.xz) = 25b7932975365484fb1e7a3c50f52d0adf7da5572f8a6dcdde4f27f2fa961e6a0310b696fc92a24ae65a5508193b7cf3cda46b46cc4d4968314c6dcf08e9238f
-SHA512 (Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267
+SHA512 (mplayer-export-2023-08-11.tar.xz) = dc3e4535f553402c1d1d04508a12e4766073d285f4eee52e39e888eeb9cc74c8e60ba5c63713f6b95866d4b9b4c92d7237da01dda2ccd10be1ecf0832f88d3ae
1 year, 3 months
[kodi] Rebuild for new libplist
by Leigh Scott
commit 6417b46779b24d516ee8a888f6c29c2f507fdec4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 11 19:25:21 2023 +0100
Rebuild for new libplist
kodi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 36737b6..1199e95 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -39,7 +39,7 @@
Name: kodi
Version: 20.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -436,6 +436,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Fri Aug 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 20.2-4
+- Rebuild for new libplist
+
* Wed Aug 02 2023 Sérgio Basto <sergio(a)serjux.com> - 20.2-3
- Rebuild for spdlog soname bump
1 year, 3 months
[mesa-freeworld] Update to 23.2.0-rc2
by Thorsten Leemhuis
commit 4cd3a5cca673253c4049145cff002fd6a7708989
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Fri Aug 11 06:49:11 2023 +0200
Update to 23.2.0-rc2
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 709fc10..2cc9b15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/mesa-23.1.3.tar.xz
/mesa-23.1.4.tar.xz
/mesa-23.1.5.tar.xz
+/mesa-23.2.0-rc2.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 33088d2..2356102 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -64,7 +64,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 23.1.5
+%global ver 23.2.0-rc2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT
@@ -316,6 +316,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
+* Fri Aug 11 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.2.0~rc1.1
+- Update to 23.2.0-rc2
+
* Thu Aug 3 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.1.5-1
- Update to 23.1.5
diff --git a/sources b/sources
index 32fe2ce..1ea495c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-23.1.5.tar.xz) = c5eac5a497561374eaf931214aebc9001820c5ab49f9b8c5634b62af081b03b2f21c169c936524b2953c8815eb27dfb5c8c12276b9b1c119722cd6fea0b22d85
+SHA512 (mesa-23.2.0-rc2.tar.xz) = fc27d23f286aeaf14befa4a48f778ac9e924df12527254cc7e518980c6de0c0ade0547ef3b11e60eaf5cc5491ea6148e0cac4288ed25da7e0bff6b7e5e398873
1 year, 3 months
[snes9x] Updated to 1.62.3
by Andrea Musuruane
commit 80d4c8ce33cbe378aff52b77c149fa9320d137d9
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 12 16:12:46 2023 +0200
Updated to 1.62.3
.gitignore | 4 +++
snes9x-1.60-gcc11.patch | 47 ------------------------------------
snes9x-1.60-soundsync.patch | 22 -----------------
snes9x-1.62.1-gcc13.patch | 20 +++++++++++++++
snes9x.spec | 59 +++++++++++++++++++++++++++------------------
sources | 5 +++-
6 files changed, 63 insertions(+), 94 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7f2421..1fae7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@ snes9x-1.53-src.tar.bz2
/snes9x-1.58.tar.gz
/snes9x-1.59.2.tar.gz
/snes9x-1.60.tar.gz
+/snes9x-1.62.3.tar.gz
+/glslang-12.1.0.tar.gz
+/SPIRV-Cross-1.3.243.0.tar.gz
+/Vulkan-Headers-1.3.242.tar.gz
diff --git a/snes9x-1.62.1-gcc13.patch b/snes9x-1.62.1-gcc13.patch
new file mode 100644
index 0000000..28945fd
--- /dev/null
+++ b/snes9x-1.62.1-gcc13.patch
@@ -0,0 +1,20 @@
+Partly a backport from
+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c8
+--- a/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h
++++ b/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h
+@@ -2615,4 +2615,8 @@
+ #endif
+
++#if VMA_STATS_STRING_ENABLED
++ #include <cstdio> // For snprintf
++#endif
++
+ /*******************************************************************************
+ CONFIGURATION SECTION
+--- a/vulkan/slang_shader.hpp
++++ b/vulkan/slang_shader.hpp
+@@ -1,3 +1,4 @@
+ #pragma once
++#include <cstdint>
+ #include <string>
+ #include <vector>
diff --git a/snes9x.spec b/snes9x.spec
index 9015654..314b957 100644
--- a/snes9x.spec
+++ b/snes9x.spec
@@ -1,24 +1,24 @@
Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.60
-Release: 11%{?dist}
+Version: 1.62.3
+Release: 1%{?dist}
License: Other
URL: http://www.snes9x.com/
Source0: https://github.com/snes9xgit/snes9x/archive/%{version}.tar.gz#/%{name}-%{...
+# AppData file
Source1: %{name}-gtk.appdata.xml
+# Bundled Libraries
+Source10: https://github.com/KhronosGroup/glslang/archive/12.1.0/glslang-12.1.0.tar.gz
+Source11: https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.243...
+Source12: https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.242/Vulkan-He...
# Fix CFLAGS usage in CLI version
Patch0: %{name}-1.56.1-unix_flags.patch
-# Don't set soundsync on with no way to disable
-# https://github.com/snes9xgit/snes9x/issues/530
-# https://github.com/snes9xgit/snes9x/commit/54a961d8ca57c5d81a5f2d4e274333...
-Patch1: %{name}-1.60-soundsync.patch
-# Fix building with GCC 11
-# https://github.com/snes9xgit/snes9x/issues/698
-# https://github.com/snes9xgit/snes9x/commit/7f6d9d6432d912cd90763c64f7c922...
-Patch2: %{name}-1.60-gcc11.patch
+# Fix building with GCC 13
+# https://gitweb.gentoo.org/repo/gentoo.git/tree/games-emulation/snes9x/fil...
+Patch1: %{name}-1.62.1-gcc13.patch
BuildRequires: gcc-c++
-BuildRequires: meson
+BuildRequires: cmake
BuildRequires: autoconf
BuildRequires: zlib-devel
BuildRequires: libpng-devel
@@ -27,15 +27,11 @@ BuildRequires: libXrandr-devel
BuildRequires: libGL-devel
BuildRequires: nasm
BuildRequires: intltool
-BuildRequires: gtk3-devel
+BuildRequires: gtkmm30-devel
BuildRequires: libglade2-devel
BuildRequires: SDL2-devel
BuildRequires: libxml2-devel
-%if 0%{?fedora} >= 30
-BuildRequires: minizip-compat-devel
-%else
-BuildRequires: minizip-devel
-%endif
+BuildRequires: minizip-compat-devel
BuildRequires: portaudio-devel
BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
@@ -43,6 +39,9 @@ BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
+Provides: bundled(glslang) = 12.1.0
+Provides: bundled(spirv-cross) = 1.3.243.0
+
%description
Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
emulator. It basically allows you to play most games designed for the SNES
@@ -62,6 +61,13 @@ This package contains a graphical user interface using GTK+.
%prep
%autosetup -p1
+%setup -q -T -D -a 10
+%setup -q -T -D -a 11
+%setup -q -T -D -a 12
+
+mv -Tf glslang-12.1.0 external/glslang
+mv -Tf SPIRV-Cross-sdk-1.3.243.0 external/SPIRV-Cross
+mv -Tf Vulkan-Headers-1.3.242 external/vulkan-headers
# Remove bundled libs
rm -rf unzip
@@ -70,8 +76,10 @@ rm -rf unzip
%build
# Build GTK version
pushd gtk
-%meson
-%meson_build
+%cmake \
+ -DCMAKE_INSTALL_LOCALEDIR:PATH=share/locale \
+ -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake_build
popd
# Build CLI version
@@ -87,7 +95,7 @@ popd
%install
# Install GTK version
pushd gtk
-%meson_install
+%cmake_install
popd
# Install CLI version
@@ -99,9 +107,9 @@ desktop-file-validate \
%{buildroot}%{_datadir}/applications/%{name}-gtk.desktop
# Install AppData file
-install -d %{buildroot}%{_datadir}/metainfo
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+install -d %{buildroot}%{_metainfodir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%find_lang %{name}-gtk
@@ -119,12 +127,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%doc gtk/AUTHORS
%{_bindir}/%{name}-gtk
%{_datadir}/%{name}
-%{_datadir}/metainfo/%{name}-gtk.appdata.xml
%{_datadir}/applications/%{name}-gtk.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_metainfodir}/%{name}-gtk.appdata.xml
%changelog
+* Sat Aug 12 2023 Andrea Musuruane <musuruan(a)gmail.com> - 1.62.3-1
+- Updated to 1.62.3
+
* Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.60-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 397a32d..cc04c9e 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-1e0d5d5209b8018080bca0aa5da02dff snes9x-1.60.tar.gz
+SHA512 (snes9x-1.62.3.tar.gz) = 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
+SHA512 (glslang-12.1.0.tar.gz) = 1d40518d09579eb925b1e4375c9a581736cdb79aaf60d1ca6117e394386a8d2dc1dafd9a4a30d9381f063c1ea1f65fc0d5d9fcbbefa87a85423f87fd925747b0
+SHA512 (SPIRV-Cross-1.3.243.0.tar.gz) = 82b0d28ba8c5e9c7bf9e4fabfe07bbf00b4f058ddeea87c1af8dfa52affd55bd0130f5c430b264ec2c4682eef460fbbd1fe5b1db14e61786887634bb4e45ad8b
+SHA512 (Vulkan-Headers-1.3.242.tar.gz) = 63ec56544f64f5bba575db64210b64e13f2180d16cacb63e72621e420f7cb54d60d4e987e64afb2d39d2fc181c7d49e1ca4874249298eef36d8dd311c89b260a
1 year, 3 months
[telegram-desktop] Rebuild for new Qt
by Leigh Scott
commit 7ce23d185ae7f1c687c2fdb94527c323e02b73e6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 11 23:12:01 2023 +0100
Rebuild for new Qt
telegram-desktop.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 64fd6b4..c931f98 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -6,7 +6,7 @@
Name: telegram-desktop
Version: 4.8.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPL-3.0-or-later with OpenSSL exception -- main tarball;
@@ -162,6 +162,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Fri Aug 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 4.8.4-4
+- Rebuild for new Qt
+
* Fri Jul 28 2023 Vasiliy Glazov <vascom2(a)gmail.com> - 4.8.4-3
- Rebuild for new Qt 6
1 year, 3 months
[gstreamer1-plugins-ugly] remove workarround
by Leigh Scott
commit cb62798bd945bdd44cae97e1afccdad4561a00f5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 12 12:39:15 2023 +0100
remove workarround
gstreamer1-plugins-ugly.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index b794a2a..1d66db1 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -1,7 +1,3 @@
-# gstreamer1.prov is broken and hangs, workarround it
-#global __gstreamer1_provides %{nil}
-
-
%global src_name gst-plugins-ugly
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
1 year, 3 months