[mplayer] Update to latest svn
by Leigh Scott
commit 258d4c202fa22ef2a4d26dae3e64b453472ee07c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 13:12:11 2018 +0000
Update to latest svn
.gitignore | 1 +
mplayer-add-include_vdpau_x11.patch | 23 -----------------------
mplayer-fix-screenshot-crash.patch | 26 --------------------------
mplayer-fix-vo_png.patch | 24 ------------------------
mplayer-snapshot.sh | 2 +-
mplayer.spec | 25 ++++++++-----------------
sources | 2 +-
7 files changed, 11 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53fe950..58f1b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Blue-1.11.tar.bz2
MPlayer-1.3.0.tar.xz
+/mplayer-export-2018-01-19.tar.bz2
diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh
index 7273dbb..f7fc3f8 100755
--- a/mplayer-snapshot.sh
+++ b/mplayer-snapshot.sh
@@ -13,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2015-05-05
+svn=2018-01-19
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
diff --git a/mplayer.spec b/mplayer.spec
index 341e90e..c34dc27 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -1,15 +1,15 @@
%define codecdir %{_libdir}/codecs
-#define pre 20150505svn
-#define svn 1
-#define svnbuild 2015-05-05
+%define pre 20180119svn
+%define svn 1
+%define svnbuild 2018-01-19
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 45.%{?pre}%{?dist}
+Release: 46.%{?pre}%{?dist}
%else
-Release: 15%{?dist}
+Release: 16%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -33,15 +33,6 @@ Patch0: %{name}-config.patch
Patch1: %{name}-manlinks.patch
# use system FFmpeg libraries
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
-# Fix vo_png with recent ffmpeg
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4470
-# Patch is from an upstream svn commit
-Patch5: %{name}-fix-vo_png.patch
-Patch6: %{name}-add-include_vdpau_x11.patch
ExcludeArch: %{ix86}
@@ -237,9 +228,6 @@ rm -rf ffmpeg
%patch0 -p1 -b .config
%patch1 -p1 -b .manlinks
%patch3 -p1 -b .ffmpeg
-%patch4 -p1 -b .screenshot
-%patch5 -p1 -b .vo_png
-%patch6 -p1 -b .vdpau_x11
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -395,6 +383,9 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
+* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-46.20180119svn
+- Update to latest svn
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-15
- Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources
index 2e566ea..535cb24 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2
-e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz
+72d9ed506f0273a8943d5d02d5e79a82 mplayer-export-2018-01-19.tar.bz2
6 years, 5 months
[lives] Add tirpc BR package
by Antonio
commit 96ec404c510850f3c9e986c5356a28a6117d93e8
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jan 19 13:00:51 2018 +0100
Add tirpc BR package
lives.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index dea20e8..6d7d16b 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,7 +13,7 @@
Name: lives
Version: 2.8.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -32,6 +32,7 @@ BuildRequires: pkgconfig(libv4lconvert)
BuildRequires: pkgconfig(libfreenect)
BuildRequires: pkgconfig(frei0r)
BuildRequires: pkgconfig(liboil-0.3)
+BuildRequires: pkgconfig(libtirpc)
BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(schroedinger-1.0)
@@ -102,7 +103,7 @@ done
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
--enable-doxygen --disable-libvisual --disable-projectM
-%make_build
+%make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS=-ltirpc
%install
%make_install
@@ -183,6 +184,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Thu Jan 18 2018 Antonio Trande <sagitterATfedoraproject.org> - 2.8.7-6
+- Add tirpc BR package
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-5
- Rebuilt for ffmpeg-3.5 git
6 years, 5 months
[pianobar] fix build with ffmpeg-3.5
by Leigh Scott
commit f4fe18042c3140eaa05296194bd0ab6b3dad8c37
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 11:21:49 2018 +0000
fix build with ffmpeg-3.5
ffmpeg35_buildfix.patch | 22 ++++++++++++++++++++++
pianobar.spec | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..76bdf3b
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,22 @@
+--- a/src/player.h
++++ b/src/player.h
+@@ -34,7 +34,6 @@
+ #include <ao/ao.h>
+ #include <libavformat/avformat.h>
+ #include <libavfilter/avfilter.h>
+-#include <libavfilter/avfiltergraph.h>
+ #include <piano.h>
+
+ #include "settings.h"
+
+--- a/src/player.c
++++ b/src/player.c
+@@ -36,7 +36,6 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/avutil.h>
+ #include <libavfilter/avfilter.h>
+-#include <libavfilter/avfiltergraph.h>
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #ifdef HAVE_LIBAVFILTER_AVCODEC_H
+
diff --git a/pianobar.spec b/pianobar.spec
index 31d093f..f3755a8 100644
--- a/pianobar.spec
+++ b/pianobar.spec
@@ -6,6 +6,7 @@ Summary: Console-based client for Pandora
License: MIT
URL: https://6xq.net/pianobar/
Source0: %url/%{name}-%{version}.tar.bz2
+Patch0: ffmpeg35_buildfix.patch
BuildRequires: gnutls-devel
BuildRequires: libao-devel
@@ -32,7 +33,7 @@ Features
%prep
-%autosetup
+%autosetup -p1
touch configure
chmod a+x configure
6 years, 5 months
[moc] fix build with ffmpeg-3.5
by Leigh Scott
commit 5c6b3605e8c8d400d35b8def2606047248d8c790
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 10:49:27 2018 +0000
fix build with ffmpeg-3.5
ffmpeg35_buildfix.patch | 32 ++++++++++++++++++++++++++++++++
moc.spec | 2 ++
2 files changed, 34 insertions(+)
---
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..2a632ef
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,32 @@
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -697,7 +697,7 @@
+ * FFmpeg/LibAV in use. For some versions this will be caught in
+ * *_find_stream_info() above and misreported as an unfound codec
+ * parameters error. */
+- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+ decoder_error (&data->error, ERROR_FATAL, 0,
+ "The codec is experimental and may damage MOC: %s",
+ data->codec->name);
+@@ -705,8 +705,8 @@
+ }
+
+ set_downmixing (data);
+- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+- data->enc->flags |= CODEC_FLAG_TRUNCATED;
++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ {
+@@ -725,7 +725,7 @@
+
+ data->sample_width = sfmt_Bps (data->fmt);
+
+- if (data->codec->capabilities & CODEC_CAP_DELAY)
++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+ data->delay = true;
+ data->seek_broken = is_seek_broken (data);
+ data->timing_broken = is_timing_broken (data->ic);
+
diff --git a/moc.spec b/moc.spec
index c9244a3..2aa2790 100644
--- a/moc.spec
+++ b/moc.spec
@@ -20,6 +20,7 @@ URL: http://moc.daper.net
## tar -cvzf moc-git%%{checkout}.tar.gz trunk
#Source0: moc-git%%{checkout}.tar.gz
Source0: http://ftp.daper.net/pub/soft/moc/unstable/moc-%{version}-alpha3.tar.xz
+Patch0: ffmpeg35_buildfix.patch
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
@@ -58,6 +59,7 @@ files in this directory beginning from the chosen file.
%prep
%setup -q -n moc-%{version}-alpha3
+%patch0 -p1
%build
autoreconf -ivf
6 years, 5 months
[qtav] Update to newer snapshot to fix ffmpeg build issue
by Leigh Scott
commit cba523bd3709088afd803f541d763f64bcef08c9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 10:23:32 2018 +0000
Update to newer snapshot to fix ffmpeg build issue
.gitignore | 1 +
qtav.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70d4b7d..8b7881b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/QtAV-bc46ae4.tar.gz
/QtAV-cf78e27.tar.gz
/QtAV-cbab79e.tar.gz
+/QtAV-bbf3c64.tar.gz
diff --git a/qtav.spec b/qtav.spec
index 2dacaa0..35f0d3f 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -1,5 +1,5 @@
# https://github.com/wang-bin/QtAV/commit/cbab79e3485f064d756b912c2e690d434...
-%global commit0 cbab79e3485f064d756b912c2e690d434275de8f
+%global commit0 bbf3c6404d01251a42093e515788d6f222986d1f
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global project QtAV
@@ -7,7 +7,7 @@
Name: qtav
Version: 1.12.0
-Release: 4.git%{shortcommit0}%{?dist}
+Release: 5.git%{shortcommit0}%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
Group: Development/Libraries
@@ -224,6 +224,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
+* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.0-5.gitbbf3c64
+- Update to newer snapshot to fix ffmpeg build issue
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.0-4.gitcbab79e
- Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources
index 563a9af..2526652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd2e490388ce1ec77a2203cbf43b4a9a QtAV-cbab79e.tar.gz
+1092419e213fe9d70eb65d7d9abf8df3 QtAV-bbf3c64.tar.gz
6 years, 5 months
[gstreamer1-libav] Use bundled libav for F28
by Leigh Scott
commit d075c636c635a05e8a952e854288705d58de384f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 09:29:43 2018 +0000
Use bundled libav for F28
gstreamer1-libav.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index efddd7f..3ed73f4 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,6 @@
Name: gstreamer1-libav
Version: 1.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
@@ -12,7 +12,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: orc-devel
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
+%if 0%{?fedora} <= 27
BuildRequires: ffmpeg-devel
+%endif
%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
@@ -52,7 +54,10 @@ export CFLAGS="%{optflags} -Wno-deprecated-declarations"
--disable-static \
--with-package-name="gst-libav 1.0 rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
+%if 0%{?fedora} <= 27
--with-system-libav
+%endif
+
%make_build V=1
@@ -72,6 +77,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.4-3
+- Use bundled libav for F28
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.4-2
- Rebuilt for ffmpeg-3.5 git
6 years, 5 months
[lightspark] Fix llvm-5 build issue
by Leigh Scott
commit 519df3df2478b01167f6563c586e17f07a423949
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 09:13:45 2018 +0000
Fix llvm-5 build issue
lightspark.spec | 4 ++-
llvm5.patch | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+), 1 deletion(-)
---
diff --git a/lightspark.spec b/lightspark.spec
index 9051499..ebfdab7 100644
--- a/lightspark.spec
+++ b/lightspark.spec
@@ -34,6 +34,8 @@ Source0: https://github.com/lightspark/lightspark/archive/%{name}-%{versi
%endif
Patch0: lightspark-0.7.2-fix_ffmpeg_include_dir.patch
+# Patch based on https://github.com/lightspark/lightspark/commit/1f6a694b17db9631e13caa32b...
+Patch1: llvm5.patch
# Build fails on ppc64 and ppc64le, temporarily disable them
# https://github.com/lightspark/lightspark/issues/283
@@ -99,7 +101,7 @@ This is the Chromium compatible plugin for %{name}.
%setup -q -n %{name}-%{name}-%{version}
%endif
%patch0 -p1 -b .ffmpeg-include-dir
-
+%patch1 -p1 -b .llvm5
%build
%cmake -DPLUGIN_DIRECTORY="%{_libdir}/mozilla/plugins" \
diff --git a/llvm5.patch b/llvm5.patch
new file mode 100644
index 0000000..964b21c
--- /dev/null
+++ b/llvm5.patch
@@ -0,0 +1,94 @@
+From 1f6a694b17db9631e13caa32b58778d1812dd27b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle(a)onlinehome.de>
+Date: Sun, 17 Sep 2017 11:18:55 +0200
+Subject: [PATCH] fix compilation with llvm 5.0 fixes
+ https://github.com/lightspark/lightspark/issues/308
+
+---
+ CMakeLists.txt | 3 +++
+ conf/FindLLVM.cmake | 47 ++++--------------------------------------
+ src/scripting/abc_codesynt.cpp | 6 +++++-
+ 3 files changed, 12 insertions(+), 44 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa0305196..dab5e8aac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,6 +248,9 @@ ENDIF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.7)
+ IF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.8)
+ ADD_DEFINITIONS(-DLLVM_38)
+ ENDIF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.8)
++IF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 5.0)
++ ADD_DEFINITIONS(-DLLVM_50)
++ENDIF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 5.0)
+ INCLUDE(FindZLIB REQUIRED)
+ INCLUDE(FindFreetype REQUIRED)
+ IF(NOT(ENABLE_GLES2))
+diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake
+index 4af70a070..ad08c2f27 100644
+--- a/conf/FindLLVM.cmake
++++ b/conf/FindLLVM.cmake
+@@ -41,24 +41,14 @@
+ if (LLVM_INCLUDE_DIR)
+ set(LLVM_FOUND TRUE)
+ else (LLVM_INCLUDE_DIR)
+-
++ file(GLOB LLVM_SEARCHPATHS /usr/lib/llvm*/bin)
+ find_program(LLVM_CONFIG_EXECUTABLE
+ NAMES llvm-config
+ PATHS
+ /opt/local/bin
+ /opt/llvm/2.7/bin
+ /opt/llvm/bin
+- /usr/lib/llvm-2.7/bin
+- /usr/lib/llvm-2.8/bin
+- /usr/lib/llvm-2.9/bin
+- /usr/lib/llvm-3.0/bin
+- /usr/lib/llvm-3.1/bin
+- /usr/lib/llvm-3.2/bin
+- /usr/lib/llvm-3.3/bin
+- /usr/lib/llvm-3.4/bin
+- /usr/lib/llvm-3.5/bin
+- /usr/lib/llvm-3.6/bin
+- /usr/lib/llvm-3.7/bin
++ ${LLVM_SEARCHPATHS}
+ )
+
+ find_program(LLVM_GCC_EXECUTABLE
+@@ -68,7 +58,7 @@
+ /opt/llvm/2.7/bin
+ /opt/llvm/bin
+ /Developer/usr/bin
+- /usr/lib/llvm-2.7/bin
++ ${LLVM_SEARCHPATHS}
+ )
+
+ find_program(LLVM_GXX_EXECUTABLE
+@@ -78,8 +68,7 @@
+ /opt/llvm/2.7/bin
+ /opt/llvm/bin
+ /Developer/usr/bin
+- /usr/lib/llvm/llvm/gcc-4.2/bin
+- /usr/lib/llvm-2.7/bin
++ ${LLVM_SEARCHPATHS}
+ )
+
+ if(LLVM_GCC_EXECUTABLE)
+
+diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp
+index a613da56f..7e52c1dd5 100644
+--- a/src/scripting/abc_codesynt.cpp
++++ b/src/scripting/abc_codesynt.cpp
+@@ -1901,7 +1901,11 @@ SyntheticFunction::synt_function method_info::synt_method(SystemState* sys)
+ constant = llvm::ConstantInt::get(ptr_type, (uintptr_t)this);
+ llvm::Value* th = llvm::ConstantExpr::getIntToPtr(constant, voidptr_type);
+
+- llvm::Function::ArgumentListType::iterator it=llvmf->getArgumentList().begin();
++#ifdef LLVM_50
++ auto it=llvmf->arg_begin();
++#else
++ auto it=llvmf->getArgumentList().begin();
++#endif
+ //The first and only argument to this function is the call_context*
+ #ifdef LLVM_38
+ llvm::Value* context=&(*it);
6 years, 5 months
[vdr-xineliboutput] Update to 2.1.0-1.20180118gitcdd6595
by Martin Gansser
commit a29353df62a126117d30f4cbacd4e3bbae23f424
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Jan 19 09:57:07 2018 +0100
Update to 2.1.0-1.20180118gitcdd6595
vdr-xineliboutput.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 2579358..a9c5deb 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -149,9 +149,12 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
#%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git
%changelog
-* Thu Jan 18 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-1.20180118gitcdd6595
+* Fri Jan 19 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-1.20180118gitcdd6595
- Update to 2.1.0-1.20180118gitcdd6595
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.0-2.20171207gitf397e7e
+- Rebuilt for ffmpeg-3.5 git
+
* 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