[kaffeine] update to 2.0.9 release
by Leigh Scott
commit 95b412235ff08f0413f9e244be282d3eb4586de0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Apr 22 10:23:51 2017 +0100
update to 2.0.9 release
.gitignore | 1 +
kaffeine.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c7c2f3..19c8e3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
kaffeine-1.2.2.tar.gz
/kaffeine-2.0.4.tar.xz
/kaffeine-2.0.5.tar.xz
+/kaffeine-2.0.9.tar.xz
diff --git a/kaffeine.spec b/kaffeine.spec
index 5446da8..0be2430 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
-Version: 2.0.5
-Release: 4%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -97,6 +97,9 @@ fi
%{_kf5_mandir}/man1/kaffeine.1.*
%changelog
+* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
+- update to 2.0.9 release
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index 36685fd..24bddf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e034c0da0837f3fbdf3e831a1f3e6fb kaffeine-2.0.5.tar.xz
+8a5114cf18fcaf3bd2656dcadfd23995 kaffeine-2.0.9.tar.xz
7 years
[pithos] Bump version to 1.3.1
by Patrick Griffis
commit c854a589b5d614a4428841a23bd0091ea0192ff8
Author: Patrick Griffis <tingping(a)tingping.se>
Date: Fri Apr 21 20:47:34 2017 -0400
Bump version to 1.3.1
.gitignore | 1 +
pithos.spec | 7 ++++---
sources | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b3384b..5f8f7a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pithos-1.1.2.tar.gz
/pithos-1.2.0.tar.xz
/pithos-1.2.1.tar.xz
/pithos-1.3.0.tar.xz
+/pithos-1.3.1.tar.xz
diff --git a/pithos.spec b/pithos.spec
index c4b4c5d..0e7884d 100644
--- a/pithos.spec
+++ b/pithos.spec
@@ -1,7 +1,7 @@
%global appid io.github.Pithos
Name: pithos
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: A Pandora client for the GNOME Desktop
@@ -9,8 +9,6 @@ Group: Applications/Multimedia
License: GPLv3
URL: https://pithos.github.io/
Source0: https://github.com/pithos/pithos/releases/download/%{version}/pithos-%{ve...
-Patch0: https://github.com/pithos/pithos/commit/be9e8cb35692ef0b7d835dc26b28996cf...
-Patch1: https://github.com/pithos/pithos/commit/8656c60e9663148166c8bd2cfd910a442...
BuildArch: noarch
@@ -76,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_mandir}/man1/*.gz
%changelog
+* Fri Apr 21 2017 Patrick Griffis <tingping(a)tingping.se> - 1.3.1-1
+- Bump version to 1.3.1
+
* Thu Apr 13 2017 Patrick Griffis <tingping(a)tingping.se> - 1.3.0-1
- Bump version to 1.3.0
- Fix directory ownership
diff --git a/sources b/sources
index cb8ec7f..4f804ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f53ea35b3a60db90727957f99cabfa83 pithos-1.3.0.tar.xz
+0b4212d360a32649577c319cd058c3a0 pithos-1.3.1.tar.xz
7 years
[xpra-codecs-freeworld] Fix macro
by Antonio
commit 88719e7402953b20af381ef009c4a491cf2f5816
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Apr 21 22:38:47 2017 +0200
Fix macro
xpra-codecs-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 6e74590..fc3c203 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -48,7 +48,7 @@ BuildRequires: libwebp-devel
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
-%if %{with dec_avcodec2} || %{without csc_swscale}
+%if %{with dec_avcodec2} || %{with csc_swscale}
BuildRequires: ffmpeg-devel
%endif
7 years
[xpra-codecs-freeworld] Update to 1.0.2
by Antonio
commit 6f18974c08a6acd230c72c7a5a96cc491bfd3533
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Apr 21 22:32:38 2017 +0200
Update to 1.0.2
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld-xvid.patch | 20 ++++++++
xpra-codecs-freeworld.spec | 106 ++++++++++++++++++++++++++++++---------
4 files changed, 105 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc62ef4..168345a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xpra-0.15.10.tar.xz
xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
/xpra-0.17.5.tar.xz
+/xpra-1.0.2.tar.xz
diff --git a/sources b/sources
index e38f504..2e46376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ec20dae64cee8dbc70e6d5dbae0ab4a xpra-0.17.5.tar.xz
+b9c8fe1c7d9f665adf029fec8c16cb28 xpra-1.0.2.tar.xz
diff --git a/xpra-codecs-freeworld-xvid.patch b/xpra-codecs-freeworld-xvid.patch
new file mode 100644
index 0000000..14dc998
--- /dev/null
+++ b/xpra-codecs-freeworld-xvid.patch
@@ -0,0 +1,20 @@
+--- setup.orig.py 2017-02-01 06:52:14.000000000 +0100
++++ setup.py 2017-04-21 21:36:02.901697592 +0200
+@@ -184,7 +184,7 @@
+ enc_proxy_ENABLED = DEFAULT
+ enc_x264_ENABLED = DEFAULT and pkg_config_ok("--exists", "x264", fallback=WIN32)
+ enc_x265_ENABLED = DEFAULT and pkg_config_ok("--exists", "x265")
+-enc_xvid_ENABLED = DEFAULT and pkg_config_ok("--exists", "xvid")
++enc_xvid_ENABLED = DEFAULT and os.path.exists("/usr/include/xvid.h")
+ pillow_ENABLED = DEFAULT
+ webp_ENABLED = False
+ vpx_ENABLED = DEFAULT and pkg_config_version("1.3", "vpx", fallback=WIN32)
+@@ -2353,7 +2353,7 @@
+
+ toggle_packages(enc_xvid_ENABLED, "xpra.codecs.enc_xvid")
+ if enc_xvid_ENABLED:
+- xvid_pkgconfig = pkgconfig("xvid")
++ xvid_pkgconfig = pkgconfig()
+ cython_add(Extension("xpra.codecs.enc_xvid.encoder",
+ ["xpra/codecs/enc_xvid/encoder.pyx", buffers_c],
+ **xvid_pkgconfig))
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index b22e8ab..6e74590 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,23 +1,59 @@
+%bcond_without enc_x264
+%bcond_without dec_avcodec2
+%bcond_without csc_swscale
+%bcond_without webp
+
+# These are nececessary as the _with_foo is *not* defined if the
+# --with flag isn't specifed, and we need to have the --without
+# specified option in that case.
+%if %{without enc_x264}
+%define _with_enc_x264 --without-enc_x264
+%endif
+
+%if %{without dec_avcodec2}
+%define _with_dec_avcodec2 --without-dec_avcodec2
+%endif
+
+%if %{without csc_swscale}
+%define _with_csc_swscale --without-csc_swscale
+%endif
+
+%if %{with webp}
+%define _with_webp --with-webp
+%endif
+
Name: xpra-codecs-freeworld
-Version: 0.17.5
-Release: 2%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
Source0: http://xpra.org/src/xpra-%{version}.tar.xz
+## Set directory path of xvid's header file
+Patch0: %{name}-xvid.patch
+
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
-BuildRequires: libxkbfile-devel
+BuildRequires: libxkbfile-devel, libvpx-devel
+BuildRequires: xvidcore-devel, x265-devel
BuildRequires: Cython
-BuildRequires: desktop-file-utils
BuildRequires: libwebp-devel
+
+%if %{with webp}
+BuildRequires: libwebp-devel
+%endif
+
+%if %{with enc_x264}
BuildRequires: x264-devel
+%endif
+%if %{with dec_avcodec2} || %{without csc_swscale}
BuildRequires: ffmpeg-devel
+%endif
-Requires: xpra = %{version}
-Requires: gstreamer1-plugins-ugly
+Requires: xpra%{?isa} = %{version}
+Requires: gstreamer1-plugins-ugly%{?isa}
%description
Provides support for H.264 encoding and swscale support in xpra using
@@ -25,39 +61,63 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
-
+%patch0 -p0
%build
-CFLAGS="%{optflags}" %{__python} setup.py build \
- --with-enc_x264 \
- --with-dec_avcodec2 \
- --with-csc_swscale \
- --with-Xdummy \
- --with-Xdummy_wrapper
+CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
+ --with-enc_xvid \
+ %{?_with_webp} \
+ %{?_with_enc_x264} \
+ %{?_with_dec_avcodec2} \
+ %{?_with_csc_swscale} \
+ --with-Xdummy \
+ --with-Xdummy_wrapper \
+ --without-html5 \
+ --without-tests \
+ --with-verbose
%install
-mkdir destdir
-%{__python} setup.py install --skip-build --root destdir
-
-mkdir -p %{buildroot}%{python_sitearch}/xpra/codecs/
-pushd destdir%{python_sitearch}/xpra/codecs/
-cp -pr csc_swscale dec_avcodec2 enc_x264 libav_common \
- %{buildroot}%{python_sitearch}/xpra/codecs/
+%{__python2} setup.py install -O1 --skip-build --root destdir
+
+## We are interested to additional codecs only
+mkdir -p %{buildroot}%{python2_sitearch}/xpra/codecs/
+pushd destdir%{python2_sitearch}/xpra/codecs/
+cp -pr \
+%if %{with csc_swscale}
+ csc_swscale \
+%endif
+%if %{with dec_avcodec2}
+ dec_avcodec2 \
+%endif
+%if %{with enc_x264}
+ enc_x264 \
+%endif
+%if %{with webp}
+ webp \
+%endif
+ libav_common enc_ffmpeg enc_xvid enc_x265 %{buildroot}%{python2_sitearch}/xpra/codecs/
popd
#drop shebangs from python_sitearch
-find %{buildroot}%{python_sitearch}/xpra -name '*.py' \
+find %{buildroot}%{python2_sitearch}/xpra -name '*.py' \
-exec sed -i '1{\@^#!/usr/bin/env python@d}' {} \;
#fix permissions on shared objects
-find %{buildroot}%{python_sitearch}/xpra -name '*.so' \
+find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
-exec chmod 0755 {} \;
%files
-%{python_sitearch}/xpra/codecs/*
+%dir %{python2_sitearch}/xpra
+%dir %{python2_sitearch}/xpra/codecs
+%{python2_sitearch}/xpra/codecs/*
+%doc README NEWS
%license COPYING
%changelog
+* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 1.0.2-1
+- Update to 1.0.2
+- Include x265 and xvid encoders
+
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.17.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years
[stella] Exclude arch ppc64 ppc64le.
by Sérgio M. Basto
commit edc62bb3a6b7bcf2ba4d1df73d6e4045f04fdfbd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Apr 21 00:31:34 2017 +0100
Exclude arch ppc64 ppc64le.
38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch | 129 -------------------------
stella.spec | 6 +-
2 files changed, 3 insertions(+), 132 deletions(-)
---
diff --git a/stella.spec b/stella.spec
index 0936b92..7f8f931 100644
--- a/stella.spec
+++ b/stella.spec
@@ -8,7 +8,8 @@ URL: https://stella-emu.github.io/
Source0: https://github.com/stella-emu/%{name}/releases/download/release-%{version...
Patch0: %{name}-4.7.3-gcc7.patch
Patch1: 1dd8c04f6813779e509fa7427b06bbc47d408329.patch
-Patch2: 38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch
+
+ExcludeArch: ppc64 ppc64le
BuildRequires: libpng-devel zlib-devel bison SDL2-devel
BuildRequires: desktop-file-utils
@@ -34,7 +35,6 @@ by considering a contribution.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p2
rm -rf src/zlib src/libpng
sed -i "s/-c -s -m/-m/" Makefile
@@ -87,7 +87,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Updated URL and Source0
- Add upstream patch (https://github.com/stella-emu/stella/issues/117) try fix
aarch64 detection.
-- Add another upstream patch, potential fix for compile failure on ppc64le / SDL2.
+- Exclude arch ppc64 ppc64le.
* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 4.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years
[stella] fix typo
by Sérgio M. Basto
commit 6b4599194b58b1397261beeb260085e98e828cbe
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 20 19:25:53 2017 +0100
fix typo
stella.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/stella.spec b/stella.spec
index 550f217..0936b92 100644
--- a/stella.spec
+++ b/stella.spec
@@ -34,7 +34,7 @@ by considering a contribution.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch1 -p2
+%patch2 -p2
rm -rf src/zlib src/libpng
sed -i "s/-c -s -m/-m/" Makefile
7 years
[stella] Add another upstream patch, potential fix for compile failure on ppc64le / SDL2.
by Sérgio M. Basto
commit 7cca506e2c800927ee67a0803085b696430996b0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 20 19:04:46 2017 +0100
Add another upstream patch, potential fix for compile failure on ppc64le / SDL2.
38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch | 129 +++++++++++++++++++++++++
stella.spec | 3 +
2 files changed, 132 insertions(+)
---
diff --git a/38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch b/38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch
new file mode 100644
index 0000000..0b11409
--- /dev/null
+++ b/38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch
@@ -0,0 +1,129 @@
+From 38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884 Mon Sep 17 00:00:00 2001
+From: Stephen Anthony <sa666666(a)gmail.com>
+Date: Thu, 20 Apr 2017 15:21:55 -0230
+Subject: [PATCH] Potential fix for compile failure on ppc64le / SDL2.
+
+---
+ src/common/EventHandlerSDL2.hxx | 2 +-
+ src/common/FrameBufferSDL2.cxx | 2 +-
+ src/common/FrameBufferSDL2.hxx | 2 +-
+ src/common/SDL_lib.hxx | 24 ++++++++++++++++++++++++
+ src/common/SoundSDL2.cxx | 2 +-
+ src/common/SoundSDL2.hxx | 2 +-
+ src/common/StellaKeys.hxx | 2 +-
+ 7 files changed, 30 insertions(+), 6 deletions(-)
+ create mode 100644 src/common/SDL_lib.hxx
+
+diff --git a/src/common/EventHandlerSDL2.hxx b/src/common/EventHandlerSDL2.hxx
+index 8ecc6f9..591d878 100644
+--- a/src/common/EventHandlerSDL2.hxx
++++ b/src/common/EventHandlerSDL2.hxx
+@@ -18,7 +18,7 @@
+ #ifndef EVENTHANDLER_SDL2_HXX
+ #define EVENTHANDLER_SDL2_HXX
+
+-#include <SDL.h>
++#include "SDL_lib.hxx"
+ #include "EventHandler.hxx"
+
+ /**
+diff --git a/src/common/FrameBufferSDL2.cxx b/src/common/FrameBufferSDL2.cxx
+index ce50172..4880d67 100644
+--- a/src/common/FrameBufferSDL2.cxx
++++ b/src/common/FrameBufferSDL2.cxx
+@@ -15,11 +15,11 @@
+ // this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ //============================================================================
+
+-#include <SDL.h>
+ #include <sstream>
+ #include <time.h>
+ #include <fstream>
+
++#include "SDL_lib.hxx"
+ #include "bspf.hxx"
+
+ #include "Console.hxx"
+diff --git a/src/common/FrameBufferSDL2.hxx b/src/common/FrameBufferSDL2.hxx
+index 7bed5bc..d06cb24 100644
+--- a/src/common/FrameBufferSDL2.hxx
++++ b/src/common/FrameBufferSDL2.hxx
+@@ -18,7 +18,7 @@
+ #ifndef FRAMEBUFFER_SDL2_HXX
+ #define FRAMEBUFFER_SDL2_HXX
+
+-#include <SDL.h>
++#include "SDL_lib.hxx"
+
+ class OSystem;
+ class FBSurfaceSDL2;
+diff --git a/src/common/SDL_lib.hxx b/src/common/SDL_lib.hxx
+new file mode 100644
+index 0000000..2981dfb
+--- /dev/null
++++ b/src/common/SDL_lib.hxx
+@@ -0,0 +1,24 @@
++//============================================================================
++//
++// SSSS tt lll lll
++// SS SS tt ll ll
++// SS tttttt eeee ll ll aaaa
++// SSSS tt ee ee ll ll aa
++// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
++// SS SS tt ee ll ll aa aa
++// SSSS ttt eeeee llll llll aaaaa
++//
++// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
++// and the Stella Team
++//
++// See the file "License.txt" for information on usage and redistribution of
++// this file, and for a DISCLAIMER OF ALL WARRANTIES.
++//============================================================================
++
++#ifndef SDL_LIB_HXX
++#define SDL_LIB_HXX
++
++#include <SDL.h>
++#undef bool // Seems to be needed for ppc64le, doesn't hurt other archs
++
++#endif
+diff --git a/src/common/SoundSDL2.cxx b/src/common/SoundSDL2.cxx
+index 7658d81..439f73b 100644
+--- a/src/common/SoundSDL2.cxx
++++ b/src/common/SoundSDL2.cxx
+@@ -20,8 +20,8 @@
+ #include <sstream>
+ #include <cassert>
+ #include <cmath>
+-#include <SDL.h>
+
++#include "SDL_lib.hxx"
+ #include "TIASnd.hxx"
+ #include "TIATypes.hxx"
+ #include "FrameBuffer.hxx"
+diff --git a/src/common/SoundSDL2.hxx b/src/common/SoundSDL2.hxx
+index 6d62785..5d186a5 100644
+--- a/src/common/SoundSDL2.hxx
++++ b/src/common/SoundSDL2.hxx
+@@ -22,7 +22,7 @@
+
+ class OSystem;
+
+-#include <SDL.h>
++#include "SDL_lib.hxx"
+
+ #include "bspf.hxx"
+ #include "TIASnd.hxx"
+diff --git a/src/common/StellaKeys.hxx b/src/common/StellaKeys.hxx
+index efe2349..b9e6dc9 100644
+--- a/src/common/StellaKeys.hxx
++++ b/src/common/StellaKeys.hxx
+@@ -18,7 +18,7 @@
+ #ifndef STELLA_KEYS_HXX
+ #define STELLA_KEYS_HXX
+
+-#include <SDL.h>
++#include "SDL_lib.hxx"
+
+ /**
+ This class implements a thin wrapper around the SDL keysym enumerations,
diff --git a/stella.spec b/stella.spec
index cb3e9a2..550f217 100644
--- a/stella.spec
+++ b/stella.spec
@@ -8,6 +8,7 @@ URL: https://stella-emu.github.io/
Source0: https://github.com/stella-emu/%{name}/releases/download/release-%{version...
Patch0: %{name}-4.7.3-gcc7.patch
Patch1: 1dd8c04f6813779e509fa7427b06bbc47d408329.patch
+Patch2: 38deb5b1cfdce8b86a49c71cd7ce34a8fafd3884.patch
BuildRequires: libpng-devel zlib-devel bison SDL2-devel
BuildRequires: desktop-file-utils
@@ -33,6 +34,7 @@ by considering a contribution.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch1 -p2
rm -rf src/zlib src/libpng
sed -i "s/-c -s -m/-m/" Makefile
@@ -85,6 +87,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Updated URL and Source0
- Add upstream patch (https://github.com/stella-emu/stella/issues/117) try fix
aarch64 detection.
+- Add another upstream patch, potential fix for compile failure on ppc64le / SDL2.
* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 4.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years