[vlc/f26] (5 commits) ...Update vlc snapshot
by Nicolas Chauvet
Summary of changes:
d46f776... Rebuild for ffmpeg update (*)
0a9ad50... Fixup lua_version macro usage (*)
e128264... Update vlc (*)
cbc2f70... Rebuild for new protobuf version (*)
847ed70... Update vlc snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[vlc/f27] (3 commits) ...Update vlc snapshot
by Nicolas Chauvet
Summary of changes:
e128264... Update vlc (*)
cbc2f70... Rebuild for new protobuf version (*)
847ed70... Update vlc snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[vlc] Update vlc snapshot
by Nicolas Chauvet
commit 847ed70973a7c01ab1e1a882e8409f5c458275b2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 22 20:03:30 2017 +0100
Update vlc snapshot
sources | 2 +-
vlc.spec | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index d882724..29cc2f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90ae508248c66715ccd7c167e341feed vlc-3.0.0-20171103-0240-git.tar.xz
+32bec6d7e6202d8c33ce7c372c539ab8 vlc-3.0.0-20171122-0234-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 6e74f32..7711943 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global vlc_date 20171103
-%global vlc_rc -%{?vlc_date}-0240-git
+%global vlc_date 20171122
+%global vlc_rc -%{?vlc_date}-0234-git
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -367,7 +367,10 @@ rm -rf %{buildroot}/%{_datadir}/macosx
%post
-%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null
+if [ $1 == 1 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null
+fi || :
+
%{_bindir}/touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -551,6 +554,9 @@ fi || :
%changelog
+* Wed Nov 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.40.git20171122
+- Update to 20171122 snapshot
+
* Thu Nov 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.40.git20171103
- Rebuild for new protobuf version
7 years
[guvcview] Fix patch for older libavcodec. Force building with gcc/g++ instead of clang.
by Thomas Moschny
commit 845fd77600d3bcebea0f10d6853b08c89e56b8fd
Author: Thomas Moschny <thomas.moschny(a)gmx.de>
Date: Wed Nov 22 19:19:00 2017 +0100
Fix patch for older libavcodec.
Force building with gcc/g++ instead of clang.
.gitignore | 4 +---
guvcview.spec | 12 +++++++++---
...e-to-new-libavcodec-API-with-decoupled-input-ou-fix.patch | 12 ++++++++++++
3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a326cb..29800a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-guvcview-src-2.0.1.tar.gz
-guvcview-src-2.0.4.tar.gz
-/guvcview-src-2.0.5.tar.gz
+/guvcview-src-*.tar.gz
diff --git a/guvcview.spec b/guvcview.spec
index 3ed366b..3e4a745 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,6 +1,6 @@
Name: guvcview
Version: 2.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
@@ -9,12 +9,13 @@ License: GPLv3+
URL: http://guvcview.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
Patch0: update-to-new-libavcodec-API-with-decoupled-input-ou.patch
+Patch1: update-to-new-libavcodec-API-with-decoupled-input-ou-fix.patch
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
BuildRequires: pkgconfig(glib-2.0) >= 2.10.0
BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(libpulse) >= 0.9.15
BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavcodec) >= 57.16
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libudev)
@@ -52,11 +53,12 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
%patch0 -p1
+%patch1 -p1
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
%build
-%configure --disable-debian-menu --disable-silent-rules --disable-static
+%configure CC=gcc CXX=g++ --disable-debian-menu --disable-silent-rules --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make -k %{?_smp_mflags}
@@ -121,6 +123,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Nov 22 2017 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.5-2
+- Fix patch for older libavcodec.
+- Force building with gcc/g++ instead of clang.
+
* Thu Nov 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-1
- Updated to 2.0.5
- Add upstream patch for newer libavcodec
diff --git a/update-to-new-libavcodec-API-with-decoupled-input-ou-fix.patch b/update-to-new-libavcodec-API-with-decoupled-input-ou-fix.patch
new file mode 100644
index 0000000..f660b24
--- /dev/null
+++ b/update-to-new-libavcodec-API-with-decoupled-input-ou-fix.patch
@@ -0,0 +1,12 @@
+diff -up guvcview-src-2.0.5/gview_v4l2core/frame_decoder.c~ guvcview-src-2.0.5/gview_v4l2core/frame_decoder.c
+--- guvcview-src-2.0.5/gview_v4l2core/frame_decoder.c~ 2017-11-22 18:42:19.328936202 +0100
++++ guvcview-src-2.0.5/gview_v4l2core/frame_decoder.c 2017-11-22 18:51:42.366466677 +0100
+@@ -1063,7 +1063,7 @@ int libav_decode(AVCodecContext *avctx,
+
+ #else
+
+- return avcodec_decode_video2(dec_ctx, frame, got_picture, pkt);
++ return avcodec_decode_video2(avctx, frame, got_frame, pkt);
+
+ #endif
+ }
7 years
[vlc/el7] Remove upstream patch
by Nicolas Chauvet
commit da6adeacf38fe4c67960e4aa03a95d5526661368
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 22 18:41:53 2017 +0100
Remove upstream patch
...fix-heap-write-overflow-on-frame-format-c.patch | 158 ---------------------
1 file changed, 158 deletions(-)
7 years
[vlc/el7] Update to vlc 2.2.8
by Nicolas Chauvet
commit add70313130a3e6e5c719a1c7479ac979fc48ac1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 22 18:41:26 2017 +0100
Update to vlc 2.2.8
sources | 2 +-
vlc.spec | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index ef79930..6f639e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-031d1bbef7737d44d18d78d6761ed26e vlc-2.2.6.tar.xz
+b721fddf65aaf64eeee5629aa9bf7c9e vlc-2.2.8.tar.xz
diff --git a/vlc.spec b/vlc.spec
index b2e3736..8b29ff5 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -31,15 +31,13 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.2.6
-Release: 2%{?dist}
+Version: 2.2.8
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-Patch0: 0001-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
-
BuildRequires: desktop-file-utils
%{?_with_bootstrap:
@@ -221,7 +219,6 @@ JACK audio plugin for the VLC media player.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -498,6 +495,9 @@ fi || :
%changelog
+* Wed Nov 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.8-1
+- Update to 2.2.8
+
* Thu Jun 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-2
- Backport fix for flac crash
7 years
