7:57 p.m.
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