[mplayer] Fix screenshot crash (rfbz#4391)
by Leigh Scott
commit 40f04b0ce3f125b5310ed81f23d0f9919413cb85
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 6 10:39:35 2017 +0000
Fix screenshot crash (rfbz#4391)
mplayer-fix-screenshot-crash.patch | 26 ++++++++++++++++++++++++++
mplayer.spec | 14 +++++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/mplayer-fix-screenshot-crash.patch b/mplayer-fix-screenshot-crash.patch
new file mode 100644
index 0000000..9f17461
--- /dev/null
+++ b/mplayer-fix-screenshot-crash.patch
@@ -0,0 +1,26 @@
+From bbaf524d691d6bfecfd65175259fd61abc6e5f69 Mon Sep 17 00:00:00 2001
+From: rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Sun, 3 Jul 2016 20:06:11 +0000
+Subject: [PATCH] Fix crash with screenshot filter.
+
+avcodec_open2() now requires timebase to be always set, even for png images.
+The patch sets it to 1/1, since pictures do not have a framerate.
+
+Patch by Thomas Kirsten (Tho_Ki gmx de)
+---
+ libmpcodecs/vf_screenshot.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
+index 4692d20..992ea6d 100644
+--- a/libmpcodecs/vf_screenshot.c
++++ b/libmpcodecs/vf_screenshot.c
+@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf,
+ vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24;
+ vf->priv->avctx->width = d_width;
+ vf->priv->avctx->height = d_height;
++ vf->priv->avctx->time_base.num = 1;
++ vf->priv->avctx->time_base.den = 1;
+ vf->priv->avctx->compression_level = 0;
+ if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) {
+ mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n");
diff --git a/mplayer.spec b/mplayer.spec
index 3713015..2d15014 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 36.%{?pre}%{?dist}
+Release: 37.%{?pre}%{?dist}
%else
-Release: 5%{?dist}
+Release: 6%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -32,7 +32,11 @@ Patch0: %{name}-config.patch
# use roff include statements instead of symlinks
Patch1: %{name}-manlinks.patch
# use system FFmpeg libraries
-Patch3: %{name}-ffmpeg.patch
+Patch3: %{name}-ffmpeg.patch
+# Fix screenshot crash
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4391
+# Patch is from an upstream svn commit
+Patch4: %{name}-fix-screenshot-crash.patch
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -226,6 +230,7 @@ rm -rf ffmpeg
%patch0 -p1 -b .config
%patch1 -p1 -b .manlinks
%patch3 -p1 -b .ffmpeg
+%patch4 -p1 -b .screenshot
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -381,6 +386,9 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
+* Mon Feb 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-6
+- Fix screenshot crash (rfbz#4391)
+
* Thu Nov 17 2016 Adrian Reber <adrian(a)lisas.de> - 1.3.0-5
- Rebuilt for libcdio-0.94
7 years, 2 months
[qmmp-plugins-freeworld] version bump to 1.1.7
by Karel Volný
commit b2b4ea6ab886e90a1fc14c243e9c24fe809dbd2f
Author: Karel Volny <kvolny(a)redhat.com>
Date: Mon Feb 6 10:51:41 2017 +0100
version bump to 1.1.7
.gitignore | 1 +
qmmp-plugins-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 012efd2..50d09f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ qmmp-0.9.6.tar.bz2
/qmmp-1.1.2.tar.bz2
/qmmp-1.1.4.tar.bz2
/qmmp-1.1.6.tar.bz2
+/qmmp-1.1.7.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index 0ac14b1..6318fb3 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 1.1.6
+Version: 1.1.7
Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
@@ -171,6 +171,9 @@ fi
%changelog
+* Mon Feb 06 2017 Karel Volný <kvolny(a)redhat.com> 1.1.7-1
+- version bump to 1.1.7
+
* Tue Jan 17 2017 Karel Volný <kvolny(a)redhat.com> 1.1.6-1
- version bump to 1.1.6
- dropped MAD plugin, now in Fedora (rhbz#1400109)
diff --git a/sources b/sources
index 4a0accf..9ecb98b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc21287bfbca82173cf6389730e82770 qmmp-1.1.6.tar.bz2
+bf31726a9039bc22853ad4cc9d32b152 qmmp-1.1.7.tar.bz2
7 years, 2 months
[miam-player] Add patch to install libmiam-acoustid.so
by Leigh Scott
commit 3d7f5cd009878da8c6d306c2cd1ed17f34492b5a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 5 17:39:00 2017 +0000
Add patch to install libmiam-acoustid.so
install_acoustid.patch | 22 ++++++++++++++++++++++
miam-player.spec | 7 ++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/install_acoustid.patch b/install_acoustid.patch
new file mode 100644
index 0000000..d3236de
--- /dev/null
+++ b/install_acoustid.patch
@@ -0,0 +1,22 @@
+From 6775053ab1aae581b212f40cbf3926c3e64d8ab0 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux(a)googlemail.com>
+Date: Sun, 5 Feb 2017 12:47:20 +0000
+Subject: [PATCH] fix missing libmiam-acoustid.so on linux
+
+---
+ src/acoustid/acoustid.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/acoustid/acoustid.pro b/src/acoustid/acoustid.pro
+index b3c972d..c63041a 100644
+--- a/src/acoustid/acoustid.pro
++++ b/src/acoustid/acoustid.pro
+@@ -49,6 +49,8 @@ TARGET = miam-acoustid
+
+ !macx {
+ LIBS += -L$$OUT_PWD/../core/ -lmiam-core -ltag -lchromaprint
++ target.path = /usr/lib$$LIB_SUFFIX/
++ INSTALLS += target
+ }
+ macx {
+ QMAKE_SONAME_PREFIX = @executable_path/../Frameworks
diff --git a/miam-player.spec b/miam-player.spec
index 6f65668..d7901bc 100644
--- a/miam-player.spec
+++ b/miam-player.spec
@@ -5,13 +5,14 @@
%define _name Miam-Player
Name: miam-player
Version: 0.8.1
-Release: 0.8git%{shortcommit0}%{?dist}
+Release: 0.9git%{shortcommit0}%{?dist}
Summary: A nice music player
License: GPLv3+ and "BSD (3 clause)"
Url: http://miam-player.org/
Source0: https://github.com/MBach/Miam-Player/archive/%{commit0}/%{name}-%{commit0...
Source1: %{name}.desktop
Patch0: remotecontrol.patch
+Patch1: install_acoustid.patch
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
@@ -62,6 +63,7 @@ that use %{name}.
%prep
%setup -qn %{_name}-%{commit0}
%patch0 -p0
+%patch1 -p1
# remove 3dparty libs an debian, osx and windows part
rm -rf src/Core/3rdparty/{taglib,QtAV}
@@ -136,6 +138,9 @@ fi
%doc doc/html
%changelog
+* Sun Feb 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8.1-0.9gita057928
+- Add patch to install libmiam-acoustid.so
+
* Sat Feb 04 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 0.8.1-0.8gita057928
- Update to 0.8.1-0.8gita057928
- Add BR libchromaprint-devel
7 years, 2 months
[snes9x] Updated to 1.54.1 Made separate gtk package Dropped obsolete Group, Buildroot, %clean and %defattr D
by Andrea Musuruane
commit 1b03ea9412dbf45921a01d38b5159619f4e30e7d
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Feb 4 19:15:47 2017 +0100
Updated to 1.54.1
Made separate gtk package
Dropped obsolete Group, Buildroot, %clean and %defattr
Dropped cleaning at the beginning of %install
.gitignore | 1 +
snes9x-1.54.1-unix_flags.patch | 66 +++++++++++++++++++++++++
snes9x.spec | 106 ++++++++++++++++++++++++++++-------------
sources | 2 +-
4 files changed, 142 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbc1f53..faba16d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
snes9x-1.53-src.tar.bz2
+/snes9x-1.54.1.tar.gz
diff --git a/snes9x-1.54.1-unix_flags.patch b/snes9x-1.54.1-unix_flags.patch
new file mode 100644
index 0000000..4547791
--- /dev/null
+++ b/snes9x-1.54.1-unix_flags.patch
@@ -0,0 +1,66 @@
+diff -durN snes9x-1.54.1.orig/unix/configure.ac snes9x-1.54.1/unix/configure.ac
+--- snes9x-1.54.1.orig/unix/configure.ac 2016-10-15 02:20:34.000000000 +0200
++++ snes9x-1.54.1/unix/configure.ac 2017-02-04 18:52:33.297396407 +0100
+@@ -55,50 +55,6 @@
+ # *****************************
+ # *** Execution begins here ***
+ # *****************************
+-
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+- [AS_HELP_STRING([--enable-debug],
+- [leave debug information in the final binary (default: no)])],
+- [], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+- AC_S9X_COMPILER_FLAG([-g], [g])
+- AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+- AC_S9X_COMPILER_FLAG([-O3], [o3], [
+- AC_S9X_COMPILER_FLAG([-O2], [o2], [
+- AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+- [AS_HELP_STRING([--enable-mtune],
+- [use the specified value for the -mtune/-mcpu flag (default: no)])],
+- [], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+- [
+- AC_MSG_WARN([-mtune failed, trying -mcpu...])
+- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+- ])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
+diff -durN snes9x-1.54.1.orig/unix/Makefile.in snes9x-1.54.1/unix/Makefile.in
+--- snes9x-1.54.1.orig/unix/Makefile.in 2016-10-15 02:20:34.000000000 +0200
++++ snes9x-1.54.1/unix/Makefile.in 2017-02-04 18:52:02.039108126 +0100
+@@ -47,7 +47,7 @@
+ exit 1
+
+ snes9x: $(OBJECTS)
+- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
++ $(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
+
+ ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
+ $(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
diff --git a/snes9x.spec b/snes9x.spec
index 87a1c37..267bfb3 100644
--- a/snes9x.spec
+++ b/snes9x.spec
@@ -1,87 +1,129 @@
Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.53
-Release: 5%{?dist}
+Version: 1.54.1
+Release: 1%{?dist}
License: Other
-Group: Applications/Emulators
-URL: http://code.google.com/p/snes9x-gtk/
-Source: http://snes9x-gtk.googlecode.com/files/snes9x-%{version}-src.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+URL: http://www.snes9x.com/
+Source: https://github.com/snes9xgit/snes9x/archive/%{version}.tar.gz#/%{name}-%{...
+# Fix CFLAGS and LDFLAGS usage in CLI version
+Patch0: %{name}-1.54.1-unix_flags.patch
BuildRequires: gcc-c++
-BuildRequires: zlib-devel, libpng-devel
-BuildRequires: libXv-devel, libXrandr-devel
+BuildRequires: autoconf
+BuildRequires: zlib-devel
+BuildRequires: libpng-devel
+BuildRequires: libXv-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libGL-devel
BuildRequires: nasm
BuildRequires: intltool
-BuildRequires: gtk2-devel, libglade2-devel
+BuildRequires: gtk2-devel
+BuildRequires: libglade2-devel
BuildRequires: SDL-devel
+BuildRequires: libxml2-devel
BuildRequires: portaudio-devel
BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
+BuildRequires: desktop-file-utils
%description
Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
emulator. It basically allows you to play most games designed for the SNES
and Super Famicom Nintendo game systems on your computer.
+%package gtk
+Summary: Super Nintendo Entertainment System emulator - GTK version
+Requires: hicolor-icon-theme
+
+%description gtk
+Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
+emulator. It basically allows you to play most games designed for the SNES
+and Super Famicom Nintendo game systems on your computer.
+
+This package contains a graphical user interface using GTK+.
+
%prep
-%setup -q -n %{name}-%{version}-src
+%setup -q
+%patch0 -p1
%build
-# First, build the GTK version
-cd gtk
+# Build GTK version
+pushd gtk
+./autogen.sh
%configure \
+ --disable-silent-rules \
--without-oss \
--with-netplay
-%{__make} %{?_smp_mflags}
-cd ..
-# Second, build the CLI version
-cd unix
+%make_build
+popd
+
+# Build CLI version
+pushd unix
+autoreconf
%configure \
--enable-netplay
-%{__make} %{?_smp_mflags}
-cd ..
+%make_build
+popd
%install
-%{__rm} -rf %{buildroot}
-cd gtk
-%{__make} install DESTDIR=%{buildroot}
-cd ..
-%find_lang snes9x-gtk
-%{__install} -p -m 0755 unix/snes9x %{buildroot}%{_bindir}/snes9x
+# Install GTK version
+%make_install -C gtk
+# Install CLI version
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 0755 unix/snes9x %{buildroot}%{_bindir}
-%clean
-%{__rm} -rf %{buildroot}
+# Validate desktop file
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%find_lang snes9x-gtk
-%post
+%post gtk
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
-%postun
+
+%postun gtk
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
-%posttrans
+
+%posttrans gtk
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -f snes9x-gtk.lang
-%defattr(-,root,root,-)
-%doc gtk/doc/* unix/docs/readme_unix.html
+%files
+%license docs/snes9x-license.txt
+%doc docs/changes.txt
+%doc unix/docs/readme_unix.html
%{_bindir}/snes9x
+
+
+%files gtk -f snes9x-gtk.lang
+%license docs/snes9x-license.txt
+%license gtk/doc/LICENSE
+%license gtk/doc/lgpl.txt
+%doc docs/changes.txt
+%doc gtk/doc/README
%{_bindir}/snes9x-gtk
%{_datadir}/applications/snes9x.desktop
%{_datadir}/icons/hicolor/*/apps/snes9x.*
%changelog
+* Sat Jan 28 2017 Andrea Musuruane <musuruan(a)gmail.com> - 1.54.1-1
+- Updated to 1.54.1
+- Made separate gtk package
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Dropped cleaning at the beginning of %%install
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.53-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 8faa4fb..9441f8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69ec1743a1da7de7b5d55a43b0e2ed10 snes9x-1.53-src.tar.bz2
+ea8e97bbde690345b4d3b1af9facc1f0 snes9x-1.54.1.tar.gz
7 years, 3 months
