[vdr-xineliboutput] Update to 2.1.0-1.20180118gitcdd6595
by Martin Gansser
commit 61f3b8fd463f116118deccaaaf1129a9964a42a9
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Jan 19 09:45:48 2018 +0100
Update to 2.1.0-1.20180118gitcdd6595
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 36 ++++++++++++++++++------------------
3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04e7f45..160adaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-1.1.0-71eefbe.tar.gz
/vdr-xineliboutput-1.1.0-46f0f1d.tar.gz
/vdr-xineliboutput-2.0.0-f397e7e.tar.gz
+/vdr-xineliboutput-2.1.0-cdd6595.tar.gz
diff --git a/sources b/sources
index 5e3e2dc..97e4154 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eeca05191e00fe79359215f497cf49b2 vdr-xineliboutput-2.0.0-f397e7e.tar.gz
+399001fc883d1d7d62213413853bd2ca vdr-xineliboutput-2.1.0-cdd6595.tar.gz
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 3f604b3..2579358 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -1,16 +1,16 @@
-%global xinever %(xine-config --version 2>/dev/null || echo ERROR)
-%global xineplugindir %(xine-config --plugindir 2>/dev/null || echo ERROR)
-%global xinepluginver 2.0.1
+%global xinever %(pkg-config --modversion libxine 2>/dev/null || echo ERROR)
+%global xineplugindir %(pkg-config --variable=plugindir libxine 2>/dev/null || echo ERROR)
+%global xinepluginver 2.1.0
%global pname xineliboutput
-%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR)
-%global gitrev f397e7e
-%global gitdate 20171207
+%global vdrver %(pkg-config --modversion vdr 2>/dev/null || echo ERROR)
+%global gitrev cdd6595
+%global gitdate 20180118
# build bluray support (disabled for now)
%global have_bluray 1
Name: vdr-%{pname}
-Version: 2.0.0
-Release: 2.%{gitdate}git%{gitrev}%{?dist}
+Version: 2.1.0
+Release: 1.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
Group: Applications/Multimedia
License: GPLv2+
@@ -19,8 +19,8 @@ URL: http://sourceforge.net/projects/xineliboutput
# git clone git://git.code.sf.net/p/xineliboutput/git vdr-xineliboutput
# cd vdr-xineliboutput
# git rev-parse --short HEAD
-# git archive --format=tar.gz --prefix=vdr-xineliboutput/ %{gitrev} \
-# -o vdr-xineliboutput-%{version}-%{gitrev}.tar.gz
+# git archive --format=tar.gz --prefix=vdr-xineliboutput/ %%{gitrev} \
+# -o vdr-xineliboutput-%%{version}-%%{gitrev}.tar.gz
Source0: %{name}-%{version}-%{gitrev}.tar.gz
Source1: %{name}.conf
Source2: allowed_hosts.conf
@@ -109,10 +109,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/
%make_install
install -pm 755 mpg2c %{buildroot}%{_bindir}/mpg2c
-ln -s %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git \
- %{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
-ln -s %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git \
- %{buildroot}%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
+#ln -s %%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}-git \
+# %%{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}
+#ln -s %%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git \
+# %%{buildroot}%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}
install -pm 644 black_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
install -pm 644 nosignal_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
install -pm 644 vdrlogo_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
@@ -144,13 +144,13 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
-%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git
+#%%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}-git
%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
-%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git
+#%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git
%changelog
-* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.0-2.20171207gitf397e7e
-- Rebuilt for ffmpeg-3.5 git
+* Thu Jan 18 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-1.20180118gitcdd6595
+- Update to 2.1.0-1.20180118gitcdd6595
* Thu Dec 28 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 2.0.0-1.20171207gitf397e7e
- Update to 2.0.0-1.20171207gitf397e7e
6 years, 5 months
[VirtualBox-kmod] Fixes for kernel 4.15
by Sérgio M. Basto
commit 9e509eaddb14831da29e8ce519e262e82a9cce45
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jan 18 19:16:54 2018 +0000
Fixes for kernel 4.15
VirtualBox-kmod.spec | 9 ++++-
fixes_for_4.15.v2.patch | 103 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 3f1288b..158ab6f 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -29,7 +29,7 @@
Name: VirtualBox-kmod
Version: 5.2.6
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -37,6 +37,7 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-kmod-excludekernel-filter.txt
+Patch1: fixes_for_4.15.v2.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -59,6 +60,9 @@ Kernel module for VirtualBox
%prep
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
+pushd %{name}-%{version}
+%patch1 -p2 -b .kernel_4.15
+popd
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -107,6 +111,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Thu Jan 18 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.6-2
+- Fixes for kernel 4.15
+
* Wed Jan 17 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.6-1
- Update VBox to 5.2.6
diff --git a/fixes_for_4.15.v2.patch b/fixes_for_4.15.v2.patch
new file mode 100644
index 0000000..33b8cba
--- /dev/null
+++ b/fixes_for_4.15.v2.patch
@@ -0,0 +1,103 @@
+diff -rupwBb VirtualBox-kmodsrc-5.2.6-1.fc28.x86_64/VirtualBox-kmod-5.2.6/vboxguest/VBoxGuest-linux.c VBoxGuestAdditions_5.2.7-120349/src/vboxguest-5.2.7/vboxguest/VBoxGuest-linux.c
+--- VirtualBox-kmodsrc-5.2.6-1.fc28.x86_64/VirtualBox-kmod-5.2.6/vboxguest/VBoxGuest-linux.c 2018-01-15 14:49:51.000000000 +0000
++++ VBoxGuestAdditions_5.2.7-120349/src/vboxguest-5.2.7/vboxguest/VBoxGuest-linux.c 2018-01-18 11:31:11.000000000 +0000
+@@ -39,6 +39,12 @@
+ # define VBOXGUEST_WITH_INPUT_DRIVER
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++# define CONST_4_15 const
++#else
++# define CONST_4_15
++#endif
++
+ #include "VBoxGuestInternal.h"
+ #ifdef VBOXGUEST_WITH_INPUT_DRIVER
+ # include <linux/input.h>
+@@ -1058,7 +1064,7 @@ void VGDrvNativeISRMousePollEvent(PVBOXG
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1073,7 +1079,7 @@ static int vgdrvLinuxParamLogGrpSet(cons
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1084,7 +1090,7 @@ static int vgdrvLinuxParamLogGrpGet(char
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1098,7 +1104,7 @@ static int vgdrvLinuxParamLogFlagsSet(co
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1109,7 +1115,7 @@ static int vgdrvLinuxParamLogFlagsGet(ch
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1123,7 +1129,7 @@ static int vgdrvLinuxParamLogDstSet(cons
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1134,7 +1140,7 @@ static int vgdrvLinuxParamLogDstGet(char
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
+ {
+ if ( pszValue == NULL
+ || *pszValue == '\0'
+@@ -1152,7 +1158,7 @@ static int vgdrvLinuxParamR3LogToHostSet
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
+ {
+ strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+ return strlen(pszBuf);
+diff -rupwBb VirtualBox-kmodsrc-5.2.6-1.fc28.x86_64/VirtualBox-kmod-5.2.6/vboxvideo/vbox_mode.c VBoxGuestAdditions_5.2.7-120349/src/vboxguest-5.2.7/vboxvideo/vbox_mode.c
+--- VirtualBox-kmodsrc-5.2.6-1.fc28.x86_64/VirtualBox-kmod-5.2.6/vboxvideo/vbox_mode.c 2018-01-17 02:48:28.000000000 +0000
++++ VBoxGuestAdditions_5.2.7-120349/src/vboxguest-5.2.7/vboxvideo/vbox_mode.c 2018-01-18 11:31:11.000000000 +0000
+@@ -396,7 +397,11 @@ static struct drm_encoder *vbox_best_sin
+
+ /* pick the encoder ids */
+ if (enc_id)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++ return drm_encoder_find(connector->dev, NULL, enc_id);
++#else
+ return drm_encoder_find(connector->dev, enc_id);
++#endif
+
+ return NULL;
+ }
6 years, 5 months
[freshplayerplugin] Update to 0.3.9
by Leigh Scott
commit 1e5cee61f4fcd61c97c9eb8ef616b2e5c47f3d6a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 14:51:52 2018 +0000
Update to 0.3.9
.gitignore | 1 +
ffmpeg35_buildfix.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
freshplayerplugin.spec | 20 +++++++------
sources | 2 +-
4 files changed, 88 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4991cc9..6fd706c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/freshplayerplugin-0.3.5.tar.gz
/freshplayerplugin-0.3.6.tar.gz
/freshplayerplugin-0.3.7.tar.gz
+/freshplayerplugin-0.3.9.tar.gz
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..15d713b
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,74 @@
+From 934aa9c24d34f8203744b56e4ac6e8599446ca02 Mon Sep 17 00:00:00 2001
+From: Rinat Ibragimov <ibragimovrinat(a)mail.ru>
+Date: Tue, 26 Dec 2017 16:16:39 +0300
+Subject: [PATCH] ppb_video_decoder: use AV_ prefixed macros
+
+Looks like newer FFmpeg versions have droped old definitions.
+---
+ cmake/ffmpeg-compat/CMakeLists.txt | 1 +
+ cmake/ffmpeg-compat/cfg_avcodecflags.c | 4 ++++
+ cmake/ffmpeg-compat/ffmpeg_compat.h.in | 1 +
+ src/ppb_video_decoder.c | 11 ++++++++---
+ 4 files changed, 14 insertions(+), 3 deletions(-)
+ create mode 100644 cmake/ffmpeg-compat/cfg_avcodecflags.c
+
+diff --git a/cmake/ffmpeg-compat/CMakeLists.txt b/cmake/ffmpeg-compat/CMakeLists.txt
+index 732a71ee..8f67c581 100644
+--- a/cmake/ffmpeg-compat/CMakeLists.txt
++++ b/cmake/ffmpeg-compat/CMakeLists.txt
+@@ -29,6 +29,7 @@ MACRO_C_SOURCE_CHECK(cfg_av_pix_fmt_vdpau.c HAVE_AV_PIX_FMT_VDPAU)
+ MACRO_C_SOURCE_CHECK(cfg_avcodecid.c HAVE_AVCodecID)
+ MACRO_C_SOURCE_CHECK(cfg_avcodeccontext_get_buffer2.c HAVE_AVCodecContext_get_buffer2)
+ MACRO_C_SOURCE_CHECK(cfg_AVVDPAUContext.c HAVE_AVVDPAUContext)
++MACRO_C_SOURCE_CHECK(cfg_avcodecflags.c HAVE_AV_CODEC_FLAGS)
+
+ MACRO_SYMBOL_CHECK(av_frame_alloc "libavcodec/avcodec.h" HAVE_av_frame_alloc)
+ MACRO_SYMBOL_CHECK(av_frame_free "libavcodec/avcodec.h" HAVE_av_frame_free)
+diff --git a/cmake/ffmpeg-compat/cfg_avcodecflags.c b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+new file mode 100644
+index 00000000..d04de55b
+--- /dev/null
++++ b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+@@ -0,0 +1,4 @@
++#include <libavcodec/avcodec.h>
++int main(void) {
++ return AV_CODEC_FLAG_TRUNCATED + AV_CODEC_CAP_TRUNCATED;
++}
+diff --git a/cmake/ffmpeg-compat/ffmpeg_compat.h.in b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+index dd40922c..da7834b1 100644
+--- a/cmake/ffmpeg-compat/ffmpeg_compat.h.in
++++ b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+@@ -6,3 +6,4 @@
+ #define HAVE_av_frame_free (@HAVE_av_frame_free@)
+ #define HAVE_avcodec_free_context (@HAVE_avcodec_free_context@)
+ #define HAVE_AVVDPAUContext (@HAVE_AVVDPAUContext@)
++#define HAVE_AV_CODEC_FLAGS (@HAVE_AV_CODEC_FLAGS@)
+diff --git a/src/ppb_video_decoder.c b/src/ppb_video_decoder.c
+index eb150725..23647cdd 100644
+--- a/src/ppb_video_decoder.c
++++ b/src/ppb_video_decoder.c
+@@ -70,6 +70,11 @@
+ #define AV_CODEC_ID_H264 CODEC_ID_H264
+ #endif // !HAVE_AVCodecID
+
++#if !HAVE_AV_CODEC_FLAGS
++#define AV_CODEC_CAP_TRUNCATED CODEC_CAP_TRUNCATED
++#define AV_CODEC_FLAG_TRUNCATED CODEC_FLAG_TRUNCATED
++#endif // !HAVE_AV_CODEC_FLAGS
++
+ enum hwdec_api_e {
+ HWDEC_NONE = 0,
+ HWDEC_VAAPI,
+@@ -620,9 +625,9 @@ initialize_decoder(struct pp_video_decoder_s *vd)
+ goto err;
+ }
+
+- if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
+- trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
+- vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
++ if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
++ trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
++ vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
+ }
+
+ vd->avctx->opaque = vd;
diff --git a/freshplayerplugin.spec b/freshplayerplugin.spec
index f05a98f..8751070 100644
--- a/freshplayerplugin.spec
+++ b/freshplayerplugin.spec
@@ -1,14 +1,15 @@
Name: freshplayerplugin
-Version: 0.3.7
-Release: 5%{?dist}
+Version: 0.3.9
+Release: 1%{?dist}
Summary: PPAPI-host NPAPI-plugin adapter
Group: Applications/Internet
License: MIT
-URL: https://github.com/i-rinat/freshplayerplugin
-Source0: https://github.com/i-rinat/%{name}/archive/v%{version}/%{name}-%{version}...
+URL: https://github.com/i-rinat/%{name}
+Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: %url/commit/934aa9c24d34f8203744b56e4ac6e8599446ca02.patch#/ffmpeg35_buildfix.patch
BuildRequires: gcc-c++
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: make
BuildRequires: ragel
BuildRequires: glib2-devel
@@ -66,7 +67,7 @@ Second way will be used for the project. It will benefit other browsers too,
not only Firefox.
%prep
-%autosetup
+%autosetup -p1
# Disable 3D (because some intel graphics i915 and others display slow videos)
#sed -i 's|enable_3d = 1|enable_3d = 0|g' data/freshwrapper.conf.example
#sed -i 's|enable_3d = 1,|enable_3d = 0,|g' src/config.c
@@ -74,12 +75,12 @@ not only Firefox.
%build
mkdir build
cd build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_SKIP_RPATH=true ..
+%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_SKIP_RPATH=true ..
%make_build
%install
pushd build
- %make_install
+%make_install
popd
install -Dm 0644 data/freshwrapper.conf.example %{buildroot}/etc/freshwrapper.conf
@@ -90,6 +91,9 @@ install -Dm 0644 data/freshwrapper.conf.example %{buildroot}/etc/freshwrapper.co
%config(noreplace) %{_sysconfdir}/freshwrapper.conf
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.3.9-1
+- Update to 0.3.9
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.3.7-5
- Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources
index cba0a6d..8b72dba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9076ce1e61c9ec12234306b62afff9ce freshplayerplugin-0.3.7.tar.gz
+a6ccf674b64e250b334ffcb748dd2317 freshplayerplugin-0.3.9.tar.gz
6 years, 5 months
[cmus] fix build with ffmpeg-3.5
by Leigh Scott
commit 553701589098925a2bbb0943ec0d184f78c3b0cd
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 14:14:54 2018 +0000
fix build with ffmpeg-3.5
cmus.spec | 2 +-
ffmpeg35_buildfix.patch | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/cmus.spec b/cmus.spec
index 835bd88..98bfcb0 100644
--- a/cmus.spec
+++ b/cmus.spec
@@ -6,7 +6,7 @@ Group: Applications/Multimedia
License: GPLv2+
URL: https://cmus.github.io/
Source0: https://github.com/cmus/%{name}/archive/v%{version}-rc0/%{name}-%{version...
-
+Patch0: ffmpeg35_buildfix.patch
BuildRequires: alsa-lib-devel
BuildRequires: faad2-devel
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..b21f272
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,14 @@
+--- a/ip/ffmpeg.c
++++ b/ip/ffmpeg.c
+@@ -252,8 +252,8 @@
+ break;
+ }
+
+- if (codec->capabilities & CODEC_CAP_TRUNCATED)
+- cc->flags |= CODEC_FLAG_TRUNCATED;
++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ cc->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ #if (LIBAVCODEC_VERSION_INT < ((53<<16)+(8<<8)+0))
+ if (avcodec_open(cc, codec) < 0) {
+
6 years, 5 months
[xpra-codecs-freeworld] Update to 2.2.3
by Antonio
commit d22a51dc66992250eaf3086d8fff8b1a40e644a1
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Jan 18 14:26:09 2018 +0100
Update to 2.2.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bbde969..79150a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ xpra-0.16.3.tar.xz
/xpra-2.2.tar.xz
/xpra-2.2.1.tar.xz
/xpra-2.2.2.tar.xz
+/xpra-2.2.3.tar.xz
diff --git a/sources b/sources
index 83dc11c..89e8804 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9e555cb851a16b7dc1f197f2d392546 xpra-2.2.2.tar.xz
+c983399558c92627ba1c3b5e120341ee xpra-2.2.3.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index c0ce615..2554539 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -18,8 +18,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.2.2
-Release: 2%{?dist}
+Version: 2.2.3
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -102,6 +102,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Thu Jan 18 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.3-1
+- Update to 2.2.3
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-2
- Rebuilt for ffmpeg-3.5 git
6 years, 5 months
[xpra-codecs-freeworld] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit 8a535324ab23443fe2f09af3f7e15a7450a06dd3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 11:38:12 2018 +0000
Rebuilt for ffmpeg-3.5 git
xpra-codecs-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 13481a4..c0ce615 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -19,7 +19,7 @@
Name: xpra-codecs-freeworld
Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -102,6 +102,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-2
+- Rebuilt for ffmpeg-3.5 git
+
* Wed Jan 17 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.2-1
- Update to 2.2.2
6 years, 5 months