commit a0045ca9c57eb78a194d63d6a0d135df04aee6d7 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Mon Mar 18 20:59:04 2024 +0000 Drop GUI mplayer-mga-fix-using-gettext-0.22.5.patch | 13 ------- mplayer.spec | 61 ++++-------------------------- sources | 1 - 3 files changed, 8 insertions(+), 67 deletions(-) --- diff --git a/mplayer.spec b/mplayer.spec index ebcfe6a..3300f8f 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -9,9 +9,9 @@ Name: mplayer Version: 1.5.1 %if 0%{?svn} -Release: 0.11%{?pre:.%{pre}}%{?dist} +Release: 0.12%{?pre:.%{pre}}%{?dist} %else -Release: 11%{?dist} +Release: 12%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -27,7 +27,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 @@ -35,14 +34,12 @@ Patch0: %{name}-config.patch Patch1: %{name}-manlinks.patch # use system FFmpeg libraries Patch2: %{name}-ffmpeg.patch -Patch3: mplayer-mga-fix-using-gettext-0.22.5.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel BuildRequires: aalib-devel BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel -BuildRequires: desktop-file-utils BuildRequires: enca-devel BuildRequires: ffmpeg-devel BuildRequires: fontconfig-devel @@ -51,7 +48,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 +100,9 @@ BuildRequires: libxslt %endif Requires: mplayer-common = %{version}-%{release} Provides: mplayer-backend +%if 0%{?fedora} >= 39 || 0%{?rhel} +Obsoletes: mplayer-gui +%endif %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} @@ -228,22 +219,10 @@ rm -rf ffmpeg %patch -P 0 -p1 -b .config %patch -P 1 -p1 -b .manlinks %patch -P 2 -p1 -b .ffmpeg -%patch -P 3 -p1 -b .gui_fix - -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++ -%{mp_configure}--enable-gui --disable-mencoder - -%make_build V=1 -popd - export CC=gcc export CXX=g++ %{mp_configure} @@ -287,27 +266,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 @@ -329,12 +287,6 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir} %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* @@ -365,6 +317,9 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir} %{_datadir}/mplayer/*.fp %changelog +* Mon Mar 18 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.5.1-0.12.20240317svn +- Drop GUI + * Sun Mar 17 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.5.1-0.11.20240317svn - Update snapshot - Readd GUI diff --git a/sources b/sources index ac41cb7..b907e6f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267 SHA512 (mplayer-export-2024-03-17.tar.xz) = f04a54b7d22a0e4849b70a3933dd82de9b1e9b03d9933b2c699911775c7693e1f66986798cbdaa0dc565793d70aa6d712be30a7e8ffd4abcd6c03dd942ed60ae