[libquicktime/el7] (26 commits) ...Rebuild for ffmpeg-3.* on el7
by Antonio
Summary of changes:
7a9bda5... Rebuilt for x264 (*)
d8129cb... * Sat Mar 22 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.4 (*)
98fa446... * Tue Mar 25 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.4 (*)
5fb431c... Rebuilt for ffmpeg-2.3 (*)
745ab6d... * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2 (*)
b442813... Rebuilt for FFmpeg 2.4.3 (*)
3577a57... Bump for x264 (*)
c748846... Add patch for libav 10. (*)
92210f0... Add patch for ffmpeg 3.0. (*)
b8458e2... Bump release. (*)
19cdf60... Rebuilt for ffmpeg-3.1.1 (*)
3d8f475... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
76c5a73... Rebuild for ffmpeg update (*)
f799a07... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
ff58bf9... Mass rebuild for x264 and x265 (*)
63eab93... Rebuilt for ffmpeg-3.5 git (*)
8c09fe0... Update to 1.2.4-93-g4d45177 Upstream have the official patc (*)
cc6ad03... Update to official git URL. (*)
ad491f2... Update to 1.2.4-98-g859a717 from branch master (*)
0d44cbf... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
9334ae4... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
57af332... Mass rebuild for x264 and/or x265 (*)
fb01f58... Update to 1.2.4.112.20180804gitfff99cd from branch master (*)
459c21e... Update branches in update script (*)
138209a... Rebuild for x264 in F29 Expand tabs to spaces (*)
bfd4804... Rebuild for ffmpeg-3.* on el7 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months
[libquicktime] Rebuild for ffmpeg-3.* on el7
by Antonio
commit bfd48049a3a558f7cbb0d66df49e52b8cc008d39
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 15:43:48 2018 +0100
Rebuild for ffmpeg-3.* on el7
libquicktime.spec | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/libquicktime.spec b/libquicktime.spec
index 871d1b6..49dcde9 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -7,12 +7,13 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
-Release: 34%{?rel_string}%{?dist}
+Release: 35%{?rel_string}%{?dist}
License: LGPLv2+
-Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libq...
+BuildRequires: gcc
+%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: libdv-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
@@ -40,11 +41,9 @@ BuildRequires: autoconf automake libtool
%package utils
Summary: Utilities for working with Quicktime files
-Group: Applications/Multimedia
%package devel
Summary: Development files for libquicktime
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: zlib-devel
@@ -74,7 +73,7 @@ enhancements. This package contains development files for %{name}.
# --------------------------------------------------------------------
%prep
-%setup -q -n %{name}-git-%{githash}
+%autosetup -n %{name}-git-%{githash}
# --------------------------------------------------------------------
@@ -108,15 +107,13 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files -f %{name}.lang
%license COPYING
%doc README TODO
%{_libdir}/%{name}*.so.*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/lqt_*.so
+%{_libdir}/%{name}/
%files utils
%{_bindir}/libquicktime_config
@@ -140,6 +137,11 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
%changelog
+* Mon Nov 12 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 1.2.4-35.112.20180804gitfff99cd
+- Rebuild for ffmpeg-3.* on el7
+- Set ld scriptlets
+- Remove obsolete Group tags
+
* Thu Oct 11 2018 Sérgio Basto <sergio(a)serjux.com> - 1.2.4-34.112.20180804gitfff99cd
- Rebuild for x264 in F29
- Expand tabs to spaces
5 years, 5 months
[vlc/el7] Fixup merge
by Nicolas Chauvet
commit 8c44e188cf3b4422d7afc3647de95a3992110af6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 6 15:40:54 2018 +0100
Fixup merge
vlc.spec | 12 ------------
1 file changed, 12 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 8cac927..5fe0056 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -38,9 +38,6 @@
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
-%ifarch x86_64 i686
-%global _with_crystalhd 1
-%endif
Summary: The cross-platform open-source multimedia framework, player and server
@@ -300,7 +297,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
}
-
%build
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
@@ -458,7 +454,6 @@ fi || :
%{?_with_gnomevfs:
%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
-%{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{?_with_wayland:
@@ -519,13 +514,6 @@ fi || :
%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
-%exclude %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so
%{!?_without_xcb:
%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%exclude %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
5 years, 5 months
[vlc/el7] squashed merge of master into el7
by Nicolas Chauvet
commit 2556a8877ade9f022621cf3f78f94d7fe003e568
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 6 15:39:54 2018 +0100
squashed merge of master into el7
.gitignore | 1 +
sources | 2 +-
vlc-2.2x-fix-upnp.patch | 33 ---
vlc.spec | 572 ++++++++++++++++++++++++++++++++++++++----------
4 files changed, 461 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d32910..08ea01d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vlc-*.tar.xz
+/asm.S
diff --git a/sources b/sources
index 6f639e1..98a4d37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b721fddf65aaf64eeee5629aa9bf7c9e vlc-2.2.8.tar.xz
+a205c0b4a810dd864f8e065856dc8ba4 vlc-3.0.5-20181129-0232.tar.xz
diff --git a/vlc.spec b/vlc.spec
index cc1f7c8..8cac927 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,11 @@
-#global vlc_rc -20170212-0224
+%global vlc_date 20181129
+#global vlc_rc -rc9
+%global vlc_tag -%{?vlc_date}-0232
+%if 0%{?vlc_tag:1}
+%global vlc_url https://nightlies.videolan.org/build/source/
+%else
+%global vlc_url https://download.videolan.org/pub/videolan/vlc/
+%endif
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
@@ -17,12 +24,19 @@
%global _with_vaapi 1
%endif
%global _with_bluray 1
+%if 0%{?fedora} && 0%{?fedora} < 28
%global _with_opencv 1
+%endif
%global _with_fluidsynth 1
%if 0%{?fedora}
+%global _with_aom 1
%global _with_freerdp 1
%global _with_projectm 1
%global _with_schroedinger 1
+%global _with_wayland 1
+%endif
+%ifarch x86_64 i686
+%global _with_crystalhd 1
%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -31,24 +45,26 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.2.8
-Release: 3%{?dist}
+Version: 3.0.5
+Release: 7%{?dist}
License: GPLv2+
-Group: Applications/Multimedia
-URL: http://www.videolan.org
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-# Adapt patch with this addition fix
-# https://github.com/mrjimenez/pupnp/issues/63
-Patch0: vlc-2.2x-fix-upnp.patch
+URL: https://www.videolan.org
+Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+BuildRequires: fontpackages-devel
%{?_with_bootstrap:
+BuildRequires: bison
+BuildRequires: flex
BuildRequires: gettext-devel
BuildRequires: libtool
}
+BuildRequires: gcc-c++
%{?_with_a52dec:BuildRequires: a52dec-devel}
+%{?_with_aom:BuildRequires: libaom-devel}
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel
@@ -58,14 +74,17 @@ BuildRequires: pkgconfig(dbus-1)
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
%{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
-%{?_with_freerdp:BuildRequires: freerdp-devel}
BuildRequires: fribidi-devel
-%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel}
BuildRequires: gnutls-devel >= 1.0.17
BuildRequires: gsm-devel
+BuildRequires: hostname
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: kde-filesystem
BuildRequires: game-music-emu-devel
+%ifarch %{arm} aarch64
+BuildRequires: pkgconfig(gstreamer-app-1.0)
+BuildRequires: pkgconfig(gstreamer-video-1.0)
+%endif
BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7
%{?_with_bluray:BuildRequires: libbluray-devel >= 0.2.1}
@@ -74,6 +93,8 @@ BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
BuildRequires: pkgconfig(libchromaprint)
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
+BuildRequires: pkgconfig(daaladec)
+BuildRequires: pkgconfig(daalaenc)
BuildRequires: libdc1394-devel >= 2.1.0
%{?_with_libdca:BuildRequires: libdca-devel}
BuildRequires: libdv-devel
@@ -85,11 +106,15 @@ BuildRequires: libid3tag-devel
BuildRequires: libkate-devel
%{?_with_libmad:BuildRequires: libmad-devel}
BuildRequires: libmatroska-devel >= 0.7.6
+%ifarch x86_64 i686
+BuildRequires: libmfx-devel
+%endif
BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libmpg123-devel
BuildRequires: libmtp-devel >= 1.0.0
-%{?_with_projectm:BuildRequires: libprojectM-qt-devel}
+%{?_with_projectm:BuildRequires: libprojectM-devel}
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
BuildRequires: libssh2-devel
@@ -100,6 +125,14 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
+%if 0%{?fedora}
+BuildRequires: phonon-qt5-devel
+%else
+BuildRequires: phonon-devel
+%endif
+BuildRequires: pkgconfig(libidn)
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -107,30 +140,41 @@ BuildRequires: libv4l-devel
%{?_with_vaapi:BuildRequires: libva-devel}
BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: lirc-devel
%{?_with_live555:BuildRequires: live555-devel >= 0-0.33}
BuildRequires: kernel-headers
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
-%if 0%{?fedora} < 24
-BuildRequires: libmusicbrainz-devel
-%endif
BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
BuildRequires: lua-devel
BuildRequires: minizip-devel
-%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
+%{?_with_libmpeg2:BuildRequires: libmpeg2-devel >= 0.3.2}
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: pkgconfig(opencv)}
BuildRequires: openslp-devel
Buildrequires: opus-devel
BuildRequires: pcre-devel
+BuildRequires: pkgconfig(libarchive) >= 3.1.0
BuildRequires: pkgconfig(libpulse) >= 0.9.8
-BuildRequires: qt4-devel >= 4.5.2
+BuildRequires: pkgconfig(libsecret-1) >= 0.18
+BuildRequires: pkgconfig(microdns)
+BuildRequires: pkgconfig(protobuf-lite) >= 2.5
+BuildRequires: pkgconfig(Qt5Core) >= 5.5
+BuildRequires: pkgconfig(Qt5Gui) >= 5.5
+BuildRequires: pkgconfig(Qt5Svg) >= 5.5
+BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5
+BuildRequires: pkgconfig(soxr)
+BuildRequires: pkgconfig(speexdsp) >= 1.0.5
+%{?_with_wayland:
+BuildRequires: pkgconfig(wayland-client) >= 1.5.91
+BuildRequires: pkgconfig(wayland-egl)
+BuildRequires: pkgconfig(wayland-protocols)
+}
%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
BuildRequires: sqlite-devel
-BuildRequires: SDL_image-devel
%{?_with_sidplay:BuildRequires: pkgconfig(libsidplay2)}
BuildRequires: speex-devel >= 1.1.5
BuildRequires: taglib-devel
@@ -148,6 +192,7 @@ BuildRequires: libXv-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
+BuildRequires: libXinerama-devel
BuildRequires: libXpm-devel
%{!?_without_xcb:
BuildRequires: libxcb-devel
@@ -156,8 +201,32 @@ BuildRequires: pkgconfig(xcb-keysyms)
}
BuildRequires: xorg-x11-proto-devel
+%ifarch armv7hl
+%{?_with_rpi:
+BuildRequires: raspberrypi-vc-devel
+}
+%endif
+
+%if 0%{?rhel} == 7
+BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
+%endif
+
+
+%{?_with_workaround_circle_deps:
+%if 0%{?fedora}
+BuildRequires: phonon-qt5-backend-gstreamer
+%else
+BuildRequires: phonon-backend-gstreamer
+%endif
+}
-%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
+%{?_with_wayland:
+# Fedora 25 Workstation default to wayland but not all
+# Boolean deps will handle this better when allowed
+%if 0%{?fedora} >= 25
+Recommends: qt5-qtwayland%{_isa}
+%endif
+}
Provides: %{name}-xorg%{_isa} = %{version}-%{release}
@@ -167,11 +236,18 @@ Requires: kde-filesystem
Requires: dejavu-sans-fonts
Requires: dejavu-sans-mono-fonts
Requires: dejavu-serif-fonts
-Requires: qt4%{?_isa} >= %{_qt4_version}
#For xdg-sreensaver
Requires: xdg-utils
+Requires: hicolor-icon-theme
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+#Merge back jack plugin into main
+Obsoletes: vlc-plugin-jack < %{version}-%{release}
+Provides: vlc-plugin-jack = %{version}-%{release}
%description
@@ -184,7 +260,6 @@ multi-cast in IPv4 or IPv6 on networks.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}-core%{_isa} = %{version}-%{release}
%description devel
@@ -194,35 +269,31 @@ developing applications that use %{name}.
%package core
Summary: VLC media player core
-Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
+%{?lua_version:Requires: lua(abi) = %{lua_version}}
%description core
VLC media player core components
%package extras
Summary: VLC media player with extras modules
-Group: Applications/Multimedia
Requires: vlc-core%{_isa} = %{version}-%{release}
-
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
%description extras
VLC media player extras modules.
-%package plugin-jack
-Summary: JACK audio plugin for VLC
-Group: Applications/Multimedia
-Requires: vlc-core%{_isa} = %{version}-%{release}
-%description plugin-jack
-JACK audio plugin for the VLC media player.
+%prep
+%autosetup -p1 -n %{name}-%{version}%{?vlc_rc}
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-7/enable
+%endif
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -231,17 +302,18 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%build
-
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-7/enable
+%endif
%configure \
--disable-dependency-tracking \
--disable-optimizations \
-%if 0%{?fedora} >= 22
-%ifarch i686
- --disable-mmx --disable-sse \
-%endif
-%endif
--disable-silent-rules \
+ --with-default-font=%{_fontbasedir}/dejavu/DejaVuSans.ttf \
+ --with-default-font-family=DejaVuSans \
+ --with-default-monospace-font=%{_fontbasedir}/dejavu/DejaVuSansMono.ttf \
+ --with-default-monospace-font-family=DejaVuSansMono \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -250,15 +322,14 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%{?_with_live555:--enable-live555} \
%{?_with_opencv:--enable-opencv} \
--enable-sftp \
-%{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \
--enable-omxil \
--enable-omxil-vout \
%{?_with_rpi:
--enable-rpi-omxil \
- --enable-mmal-codec \
- --enable-mmal-vout \
+ --enable-mmal \
} \
+%{?_with_aom:--enable-aom} \
%{!?_with_a52dec:--disable-a52} \
%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
--disable-swscale --disable-postproc} \
@@ -272,6 +343,7 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-theora \
--enable-libass \
--enable-shout \
+%{?_with_wayland: --enable-wayland} \
%{!?_without_xcb:--enable-xcb --enable-xvideo} \
%{?_without_xcb:--disable-xcb --disable-xvideo} \
--enable-svg \
@@ -289,85 +361,79 @@ sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' li
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%endif
-%if 0
+%if 1
# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%endif
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+%make_install INSTALL="install -p" CPPROG="cp -p"
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --delete-original \
- --mode 644 \
- $RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/vlc.desktop
# Remove installed fonts for skins2
-rm -f $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/*.ttf
-ln -sf ../../../fonts/dejavu/DejaVuSans.ttf \
- $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSans.ttf
-ln -sf ../../../fonts/dejavu/DejaVuSans-Bold.ttf \
- $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSansBold.ttf
+rm -rf %{buildroot}%{_datadir}/vlc/skins2/fonts
#Fix unowned directories
-rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+rm -rf %{buildroot}%{_docdir}/vlc
#Ghost the plugins cache
-touch $RPM_BUILD_ROOT%{_libdir}/vlc/plugins.dat
+touch %{buildroot}%{_libdir}/vlc/plugins/plugins.dat
+
+#Appdata
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/metainfo/*.appdata.xml || :
+
+#Fixup
+rm -rf %{buildroot}/%{_datadir}/macosx
%find_lang %{name}
+%ldconfig_scriptlets core
+
%post
-%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null
-touch --no-create %{_datadir}/icons/hicolor
+%{?ldconfig}
+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
fi
%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
-%post core -p /sbin/ldconfig
-
%postun
-%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null
+%{?ldconfig}
+%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null
%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null
-touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi || :
-%postun core -p /sbin/ldconfig
-
%posttrans core
-%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
+%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
%post extras
+%{?ldconfig}
if [ $1 == 1 ] ; then
- %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
-fi
-
-%post plugin-jack
-if [ $1 == 1 ] ; then
- %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
+ %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
%postun extras
+%{?ldconfig}
if [ $1 == 0 ] ; then
- %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
-fi
-
-%postun plugin-jack
-if [ $1 == 0 ] ; then
- %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
+ %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
%preun core
@@ -377,7 +443,9 @@ fi || :
%files
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
+%doc AUTHORS ChangeLog NEWS README THANKS
+%license COPYING
+%{_datadir}/metainfo/vlc.appdata.xml
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png
@@ -385,31 +453,45 @@ fi || :
%{_datadir}/vlc/skins2/
%{_bindir}/qvlc
%{_bindir}/svlc
-%{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%{_libdir}/vlc/*.so*
+%{_libdir}/vlc/plugins/gui/libqt_plugin.so
%{?_with_gnomevfs:
%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
%{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%{?_with_wayland:
+%{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
+%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
+%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
+
+}
%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libgl_plugin.so
%{_libdir}/vlc/plugins/video_output/libglx_plugin.so
-%{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so
%{!?_without_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
-%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
-%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
+%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
+%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
}
%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_projectm:
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
}
+#jack in main
+%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
+%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+#pulseaudio in main
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
+%{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
+%{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so
+%{?_with_fluidsynth:
+%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
%files core -f %{name}.lang
%{_bindir}/vlc
@@ -419,8 +501,9 @@ fi || :
%{_bindir}/vlc-wrapper
%exclude %{_datadir}/vlc/skins2
%{_datadir}/vlc/
+%{_libdir}/vlc/lua/
%{_libdir}/*.so.*
-%exclude %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%exclude %{_libdir}/vlc/plugins/gui/libqt_plugin.so
%{?_with_gnomevfs:
%exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
@@ -449,11 +532,18 @@ fi || :
%exclude %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
}
+%{?_with_wayland:
+%exclude %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
+}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
@@ -464,16 +554,18 @@ fi || :
}
%exclude %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
-%ghost %{_libdir}/vlc/plugins.dat
-%{_libdir}/vlc/
+%exclude %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
+%exclude %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so
+%exclude %{_libdir}/vlc/plugins/vdpau
+%ghost %{_libdir}/vlc/plugins/plugins.dat
+%dir %{_libdir}/vlc/
+%dir %{_libdir}/vlc/plugins
+%dir %{_libdir}/vlc/plugins/vdpau
+%{_libdir}/vlc/plugins/vdpau/libvdpau_*_plugin.so
+%{_libdir}/vlc/vlc-cache-gen
+%{_libdir}/vlc/plugins
%{_mandir}/man1/vlc*.1*
-%files plugin-jack
-%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
-%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
-%{?_with_fluidsynth:
-%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
-}
%files extras
%{?_with_opencv:
@@ -499,30 +591,284 @@ fi || :
%changelog
-* Mon Oct 22 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.8-3
-- Rebuilt for live555 CVE-2018-4013
-- Fix build with libupnp
+* Thu Nov 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.5-7
+- Update to 20181129
+
+* Sun Nov 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.5-6
+- Rebuild for new x265
+
+* Sun Nov 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.5-5
+- Update to 20181111
+
+* Sat Oct 20 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.5-4
+- Update to 20181020
+
+* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 3.0.5-3
+- Mass rebuild for x264 and/or x265
+- Fix build with x264 >= 0.153
+
+* Wed Oct 03 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.5-2
+- Update to 20181003 snapshot
+
+* Fri Sep 21 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.5-1
+- Update to 3.0.5 snapshot from today
+- Enable aom support
+- Workaound a bug with vlc-cache-gen on armhfp
+
+* Tue Sep 18 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.4-3
+- Expunge qt-devel from buildroot
+
+* Wed Sep 12 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-2
+- Fix unexpanded ldconfig macro (rfbz#5018)
+
+* Fri Aug 31 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-1
+- Update to 3.0.4
+
+* Sat Aug 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-7
+- Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
+
+* Tue Jul 24 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-6
+- Rebuilt for libplacebo
+
+* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-5
+- Revert last commit
+
+* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-4
+- Rebuild for new libass version
+- Make libplacebo x86 only due to vulkan changes
+
+* Sat Jun 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-3
+- Fix build against Qt 5.11
+
+* Fri Jun 01 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-2
+- Add missing libjpeg
+
+* Mon May 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-1
+- Update to 3.0.3
+
+* Mon May 14 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.2-3
+- Rebuilt
+
+* Mon Apr 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.2-2
+- Readd lost patch
+
+* Mon Apr 23 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.2-1
+- Update to 3.0.2
+
+* Tue Apr 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-6
+- Rebuilt for libupnp
+
+* Fri Mar 23 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-5
+- Rework version tag
+- Add soxr
+- Add ldconfig_scriptlets
+
+* Sat Mar 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-4
+- Rebuilt for live555
+
+* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3.0.1-3
+- Rebuilt for new ffmpeg snapshot
+- Patch for fribidi version 1.0
+
+* Wed Feb 28 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-2
+- Rebuilt for x265
+
+* Tue Feb 27 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
+* Mon Feb 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-3
+- Add libplacebo support
+
+* Sun Feb 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-2
+- Enable microdns (rfbz#4793)
+
+* Fri Feb 09 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-1
+- Update to 3.0.0 release
+
+* Sun Feb 04 2018 Sérgio Basto <sergio(a)serjux.com> - 3.0.0-0.53.git20180202.rc9
+- Rebuild (live555-2018.01.29)
+
+* Fri Feb 02 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.52.git20180202.rc9
+- Update to rc9
+
+* Sat Jan 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.51.git20180127.rc8
+- Update to 20180127 -rc8
+- Rebuild for new libcdio and libvpx
+
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.50.git20180109.rc5
+- Rebuilt for ffmpeg-3.5 git
+
+* Mon Jan 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.49.git20180109.rc5
+- Rebuilt for VA-API 1.0.0
+
+* Tue Jan 09 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.48.git20180109.rc5
+- Update to 20180109 -rc5
+
+* Sun Dec 31 2017 Sérgio Basto <sergio(a)serjux.com> - 3.0.0-0.47.git20171221.rc2
+- Mass rebuild for x264 and x265
+
+* Thu Dec 21 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.46.git20171221.rc2
+- Update to 20171221
+- Drop pre-version
+- Set defaults fonts
+- Enable gstreamer on %%{arm} and aarch64
+- Drop wayland patch
+
+* Sat Dec 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0~rc2-0.45.git20171215
+- Improve pre-version
+- Re-enable i686 mmx/sse (autodetected)
+
+* Fri Dec 15 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.44.git20171215
+- Update to 20171215
+
+* Fri Dec 08 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.43.git20171208
+- Update to 20171208
+
+* Fri Dec 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.42.git20171122
+- Rebuild for new protobuf version
+- Rebuild against new libmfx (rhbz#1471768)
+
+* Sun Nov 26 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.41.git20171122
+- Rebuilt for live555
+
+* 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
+
+* Fri Nov 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.39.git20171103
+- Update to 20171103 snapshoot
+
+* Mon Oct 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.38.git20171009
+- Rebuild for ffmpeg update
+
+* Mon Oct 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.37.git20171009
+- Update snapshot
+- Fix libvlc vdpau issue (rfbz #4678)
+
+* Mon Sep 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.36.git20170922
+- Rebuilt for live555
+
+* Fri Sep 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.35.git20170922
+- Update to VDD2017 edition
+- https://www.videolan.org/videolan/events/vdd17/
+
+* Wed Aug 23 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.34.git20170823
+- Update snapshot
+
+* Mon Jul 31 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.33.git20170717
+- Fix lua directory search path
+
+* Tue Jul 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.32.git20170717
+- Rebuilt for live555
+
+* Mon Jul 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.31.git20170717
+- Update snapshot
+
+* Tue Jul 04 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.30.git20170704
+- Update snapshot
+- Use https for downloads - rhbz#4584
+
+* Sat Jun 24 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.29.git20170622
+- Restore wayland with a patch - rhbz#4552
+
+* Thu Jun 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.28.git20170622
+- Update snapshoot
+- Disable wayland support for now
+- Update release field
+
+* Thu Jun 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.2620170601git
+- Update to 20170601 snapshot
+
+* Thu May 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.25
+- Rebuilt for live555
+
+* Tue May 23 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.24
+- Update to 20170523 snapshot
+
+* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.23
+- Rebuild for ffmpeg update
+
+* Thu Apr 27 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.22
+- Update ot 20170427 snapshot
+
+* Wed Apr 05 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.21
+- Update to 20170405 snapshoot
+- Rework main -core library split
+
+* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.0.0-0.20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Mar 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.19
+- Update to 20170318 snapshoot
+- Drop hidpi revert rfbz#4272
+- Recommends qt5-qtwayland
+
+* Thu Feb 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.18
+- Rebuild for libvncserver .so version bump
+
+* Mon Feb 20 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.17
+- Update to 20170220 snapshot
+- Clean merged patch, unrevert wayland runtime detection
+- Switch source url on purpose
+
+* Tue Jan 31 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.16
+- Add daala support
+
+* Tue Jan 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.15
+- Fix lirc activation - rhbz#4420
+- Revert upstream commit 785b0f18d7 for wayland detection - rfbz#4380
+
+* Mon Jan 09 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.14
+- Update to 20170109
+- Disable wayland for now - rhbz#4380
+- Move libvlc pulse,vdpau,xcb from -core to main
+
+* Tue Jan 03 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.0.0-0.13
+- rebuild for x265
+
+* Mon Dec 12 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.12
+- Update to 20161212 snapshot
+- Add BR: vpx, mpg123 and mfx
+
+* Tue Nov 22 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.0.0-0.11
+- add patch to disable HIDPI scaling - rfbz#4272
+
+* Tue Nov 08 2016 Sérgio Basto <sergio(a)serjux.com> - 3.0.0-0.10
+- Rebuild for x265-2.1
+
+* Fri Oct 28 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.9
+- Updateto 3.0.0 20161026-0238-git
+- Merge vlc-plugin-jack into main
+- Add support for appdata
+
+* Thu Sep 08 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.8
+- Re-enable bootstrap
-* Tue Jan 30 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.8-2
-- rebuilt
+* Fri Sep 02 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.7
+- Bump to 20160901 nightly
+- Fix plugins.dat path - rfbz#4184
-* Wed Nov 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.8-1
-- Update to 2.2.8
+* Thu Aug 18 2016 Sérgio Basto <sergio(a)serjux.com> - 3.0.0-0.6
+- Clean spec, Vascom patches series, rfbz #4196, add license tag
-* Thu Jun 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-2
-- Backport fix for flac crash
+* Thu Aug 04 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-0.5
+- Remove -f from vlc-cache-gen scriptlets rfbz#4167
-* Wed May 24 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-1
-- Update to 2.2.6
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.0-0.4
+- Rebuilt for ffmpeg-3.1.1
-* Wed Apr 19 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.5.1-2
-- Improve main/core library split
+* Fri Jul 29 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.3
+- Update to today snapshoot
-* Thu Mar 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.5.1-1
-- Update to 2.2.5.1
+* Fri Jul 01 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.2
+- Update to today snapshot
-* Sun Feb 12 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.5-1
-- Update to 2.2.5
+* Tue Jun 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.1
+- Update to 3.0.0 - snapshot 20160614
+- Switch to qt5
+- Update Build Dependencies
* Mon Jun 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.4-1
- Update to 2.2.4
5 years, 5 months
[x264/el7] Disable bootstrap
by Antonio
commit f24943886448ecc7add092302a77934aa4360403
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 15:21:27 2018 +0100
Disable bootstrap
x264.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index c7b1bab..dc40d48 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
5 years, 5 months
[gpac/el7] (28 commits) ...Update changelog
by Antonio
Summary of changes:
4f7a2c8... Rebuilt for ffmpeg-3.1.1 (*)
8c1d513... Fix build with openssl-1.1.0 (*)
3d069e5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
4ba89c1... Update to 0.7.1 (*)
7f7eb7e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
55f6c57... Rebuilt for ffmpeg-3.5 git (*)
28d72d7... add ffmpeg build fix (*)
66ad3a8... Try again with ffmpeg build fix (*)
5666093... Try again with ffmpeg build fix as the upstream fix looks b (*)
4e3aec8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
46b2e0c... - Rebuilt for new ffmpeg snapshot (*)
ca0ecea... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
6dd2cd9... Remove Group tag (*)
e5954c7... Add missing isa on Requires (*)
d21773a... Use one BuildRequires per line (*)
6f64c99... Drop mozilla support (*)
1afd4f6... Drop osmo support (*)
c56c824... Drop f26 conditional (*)
8f4fc77... Use make macros (*)
53059f5... Use modern buildroot macro (*)
cd899a7... Use new ldconfig scriptlet (*)
7681788... make buildroot macro consistent (*)
431812f... Use modern optflags macro (*)
884f723... Clean up (*)
da4fa08... Update changelog (*)
943f0aa... Fix BuildRequires (*)
92830d2... Rename static sub-package (*)
9bd10a8... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months
[ffmpeg/el7] Release ffmpeg-3.4.5 on el7
by Antonio
commit 1e60b8e4c00d649e4e1689afa6b326a48a1c0ade
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 14:47:39 2018 +0100
Release ffmpeg-3.4.5 on el7
...BUS-on-ARM-when-compiled-with-binutils-2..patch | 108 +++++
ffmpeg-snapshot-oldabi.sh | 21 -
ffmpeg-snapshot.sh | 21 -
ffmpeg.spec | 460 +++++++++++++++++----
sources | 2 +-
5 files changed, 482 insertions(+), 130 deletions(-)
---
diff --git a/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch b/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
new file mode 100644
index 0000000..4440cb2
--- /dev/null
+++ b/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
@@ -0,0 +1,108 @@
+From 9dde6ab06c48f9447cd16f39bee33569cddb7be4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st>
+Date: Thu, 31 Aug 2017 12:06:44 +0300
+Subject: [PATCH] arm: Fix SIGBUS on ARM when compiled with binutils 2.29
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In binutils 2.29, the behavior of the ADR instruction changed so that 1 is
+added to the address of a Thumb function (previously nothing was added). This
+allows the loaded address to be passed to a BLX instruction and the correct
+mode change will occur.
+
+See: https://sourceware.org/bugzilla/show_bug.cgi?id=21458
+
+By using adr with a label that isn't annotated as a thumb function,
+we avoid the new behaviour in binutils 2.29 and get the same behaviour
+as in prior releases, and as in other assemblers (ms armasm.exe,
+clang's built in assembler) - an idea that Janne Grunau came up with.
+
+Signed-off-by: Martin Storsjö <martin(a)martin.st>
+---
+ libavcodec/arm/h264idct_neon.S | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
+index f588f3e744..b078cf25f9 100644
+--- a/libavcodec/arm/h264idct_neon.S
++++ b/libavcodec/arm/h264idct_neon.S
+@@ -21,6 +21,7 @@
+ #include "libavutil/arm/asm.S"
+
+ function ff_h264_idct_add_neon, export=1
++h264_idct_add_neon_nothumb:
+ vld1.64 {d0-d3}, [r1,:128]
+ vmov.i16 q15, #0
+
+@@ -73,6 +74,7 @@ function ff_h264_idct_add_neon, export=1
+ endfunc
+
+ function ff_h264_idct_dc_add_neon, export=1
++h264_idct_dc_add_neon_nothumb:
+ mov r3, #0
+ vld1.16 {d2[],d3[]}, [r1,:16]
+ strh r3, [r1]
+@@ -113,8 +115,8 @@ function ff_h264_idct_add16_neon, export=1
+ movne lr, #0
+ cmp lr, #0
+ ite ne
+- adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
+ blx lr
+ 2: subs ip, ip, #1
+ add r1, r1, #32
+@@ -138,8 +140,8 @@ function ff_h264_idct_add16intra_neon, export=1
+ cmp r8, #0
+ ldrsh r8, [r1]
+ iteet ne
+- adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+ cmpeq r8, #0
+ blxne lr
+ subs ip, ip, #1
+@@ -166,8 +168,8 @@ function ff_h264_idct_add8_neon, export=1
+ cmp r8, #0
+ ldrsh r8, [r1]
+ iteet ne
+- adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+ cmpeq r8, #0
+ blxne lr
+ add r12, r12, #1
+@@ -267,6 +269,7 @@ endfunc
+ .endm
+
+ function ff_h264_idct8_add_neon, export=1
++h264_idct8_add_neon_nothumb:
+ vmov.i16 q3, #0
+ vld1.16 {q8-q9}, [r1,:128]
+ vst1.16 {q3}, [r1,:128]!
+@@ -328,6 +331,7 @@ function ff_h264_idct8_add_neon, export=1
+ endfunc
+
+ function ff_h264_idct8_dc_add_neon, export=1
++h264_idct8_dc_add_neon_nothumb:
+ mov r3, #0
+ vld1.16 {d30[],d31[]},[r1,:16]
+ strh r3, [r1]
+@@ -388,8 +392,8 @@ function ff_h264_idct8_add4_neon, export=1
+ movne lr, #0
+ cmp lr, #0
+ ite ne
+- adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct8_dc_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct8_add_neon_nothumb + CONFIG_THUMB
+ blx lr
+ 2: subs r12, r12, #4
+ add r1, r1, #128
+--
+2.13.6
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a60b34f..866d057 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -4,78 +4,169 @@
#global date 20110612
#global rel rc1
+# Cuda and others are only available on some arches
+%global cuda_arches x86_64 i686
+
+%if 0%{?fedora} >= 25
+# OpenCV 3.X has an overlinking issue - unsuitable for core libraries
+# Reported as https://github.com/opencv/opencv/issues/7001
+%global _without_opencv 1
+%endif
+
%if 0%{?rhel}
%global _without_frei0r 1
%global _without_opencv 1
%global _without_vpx 1
+%global _without_nvenc 1
+%global _with_opus 1
%endif
-Summary: Digital VCR and streaming server
-Name: ffmpeg
-Version: 2.8.15
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
-%if 0%{?!_without_amr:1}
-License: GPLv3+
+# flavor nonfree
+%if 0%{?_with_nonfree:1}
+%global flavor -nonfree
+%global progs_suffix -nonfree
+#global build_suffix -lgpl
+%ifarch %{cuda_arches}
+%global _with_cuda 1
+%global _with_cuvid 1
+%global _with_libnpp 1
+%endif
+%global _with_fdk_aac 1
+%global _without_cdio 1
+%global _without_frei0r 1
+%global _without_gpl 1
+%global _without_x264 1
+%global _without_x265 1
+%global _without_xvid 1
+%endif
+
+# Disable nvenc when not relevant
+%ifnarch %{cuda_arches}
+%global _without_nvenc 1
+%endif
+
+# extras flags
+%if 0%{!?_without_nvenc:1}
+%global nvenc_cflags -I%{_includedir}/nvenc
+%endif
+%if 0%{!?_cuda_version:1}
+%global _cuda_version 9.1
+%endif
+%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
+%if 0%{?_with_cuda:1}
+%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version})
+%global cuda_ldflags -L%{_libdir}/nvidia
+%endif
+
+%if 0%{?_with_libnpp:1}
+%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version})
+%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
+%endif
+
+%if 0%{?_without_gpl}
+%global lesser L
+%endif
+
+%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb}
+%global ffmpeg_license %{?lesser}GPLv3+
%else
-License: GPLv2+
+%global ffmpeg_license %{?lesser}GPLv2+
%endif
+
+Summary: Digital VCR and streaming server
+Name: ffmpeg%{?flavor}
+Version: 3.4.5
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
-Source0: %{name}-%{?branch}%{date}.tar.bz2
+Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
+#Backport patch for arm neon
+Patch0: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
BuildRequires: bzip2-devel
-%{?_with_celt:BuildRequires: celt-devel}
-%{?_with_dirac:BuildRequires: dirac-devel}
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
+%{?_with_flite:BuildRequires: flite-devel}
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
%{!?_without_frei0r:BuildRequires: frei0r-devel}
+%{?_with_gme:BuildRequires: game-music-emu-devel}
BuildRequires: gnutls-devel
BuildRequires: gsm-devel
+%{?_with_ilbc:BuildRequires: ilbc-devel}
BuildRequires: lame-devel >= 3.98.3
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
%{!?_without_ladspa:BuildRequires: ladspa-devel}
BuildRequires: libass-devel
+BuildRequires: libbluray-devel
+%{?_with_bs2b:BuildRequires: libbs2b-devel}
+%{?_with_caca:BuildRequires: libcaca-devel}
%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel}
+%{?_with_chromaprint:BuildRequires: libchromaprint-devel}
#libcrystalhd is currently broken
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
+%if 0%{?_with_ieee1394}
+BuildRequires: libavc1394-devel
BuildRequires: libdc1394-devel
+BuildRequires: libiec61883-devel
+%endif
+BuildRequires: libdrm-devel
+BuildRequires: libgcrypt-devel
+BuildRequires: libGL-devel
Buildrequires: libmodplug-devel
+BuildRequires: librsvg2-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
+%{?_with_smb:BuildRequires: libsmbclient-devel}
+%{?_with_ssh:BuildRequires: libssh-devel}
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
+%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
+%{!?_without_mfx:BuildRequires: libmfx-devel >= 1.21-1}
BuildRequires: libXvMC-devel
-%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
+BuildRequires: nasm
%endif
+%{?_with_webp:BuildRequires: libwebp-devel}
+%{?_with_netcdf:BuildRequires: netcdf-devel}
+%{!?_without_nvenc:BuildRequires: nvenc-devel}
%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
-%{?_with_opencl:BuildRequires: opencl-headers ocl-icd-devel}
+%if 0%{!?_without_opencl:1}
+BuildRequires: opencl-headers ocl-icd-devel
+%{?fedora:Recommends: opencl-icd}
+%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
-BuildRequires: openjpeg-devel
-BuildRequires: opus-devel
+BuildRequires: openjpeg2-devel
+%{?_without_opus:BuildRequires: opus-devel}
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
-BuildRequires: schroedinger-devel
-BuildRequires: SDL-devel
+%{?_with_rubberband:BuildRequires: rubberband-devel}
+%{!?_without_tools:BuildRequires: SDL2-devel}
+%{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel
BuildRequires: speex-devel
BuildRequires: subversion
+%{?_with_tesseract:BuildRequires: tesseract-devel}
#BuildRequires: texi2html
BuildRequires: texinfo
+%{?_with_twolame:BuildRequires: twolame-devel}
+%{?_with_wavpack:BuildRequires: wavpack-devel}
+%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
-BuildRequires: xvidcore-devel
+%{!?_without_xvid:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
+%{?_with_zmq:BuildRequires: zeromq-devel}
+%{?_with_zvbi:BuildRequires: zvbi-devel}
%description
FFmpeg is a complete and free Internet live audio and video
@@ -85,6 +176,7 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
+%{?el7:BuildRequires: epel-rpm-macros}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -93,10 +185,10 @@ VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains the libraries for %{name}
-%package -n libavdevice
+%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-%description -n libavdevice
+%description -n libavdevice%{?flavor}
Libavdevice is a complementary library to libavf "libavformat". It provides
various "special" platform-specific muxers and demuxers, e.g. for grabbing
devices, audio capture and playback etc.
@@ -104,7 +196,7 @@ devices, audio capture and playback etc.
%package devel
Summary: Development package for %{name}
Requires: %{name}-libs%{_isa} = %{version}-%{release}
-Requires: libavdevice%{_isa} = %{version}-%{release}
+Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -120,103 +212,148 @@ This package contains development files for %{name}
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
--datadir=%{_datadir}/%{name} \\\
+ --docdir=%{_docdir}/%{name} \\\
--incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
- --optflags="$RPM_OPT_FLAGS" \\\
- --extra-ldflags="$RPM_LD_FLAGS" \\\
+ --optflags="%{optflags}" \\\
+ --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags} %{?libnpp_ldlags}" \\\
+ --extra-cflags="%{?nvenc_cflags} %{?cuda_cflags} %{?libnpp_cflags}" \\\
+ %{?flavor:--disable-manpages} \\\
+ %{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\
+ %{?build_suffix:--build-suffix=%{build_suffix}} \\\
%{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
+ %{?_with_chromaprint:--enable-chromaprint} \\\
%{!?_with_crystalhd:--disable-crystalhd} \\\
+ --enable-fontconfig \\\
%{!?_without_frei0r:--enable-frei0r} \\\
+ --enable-gcrypt \\\
+ %{?_with_gmp:--enable-gmp --enable-version3} \\\
--enable-gnutls \\\
%{!?_without_ladspa:--enable-ladspa} \\\
--enable-libass \\\
+ --enable-libbluray \\\
+ %{?_with_bs2b:--enable-libbs2b} \\\
+ %{?_with_caca:--enable-libcaca} \\\
+ %{?_with_cuda:--enable-cuda --enable-nonfree} \\\
+ %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\
%{!?_without_cdio:--enable-libcdio} \\\
- %{?_with_celt:--enable-libcelt} \\\
- --enable-libdc1394 \\\
- %{?_with_dirac:--enable-libdirac} \\\
+ %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
+ --enable-libdrm \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\
- %{!?_with_jack:--disable-indev=jack} \\\
+ %{?_with_flite:--enable-libflite} \\\
+ %{!?_without_jack:--enable-indev=jack} \\\
--enable-libfreetype \\\
+ --enable-libfribidi \\\
+ %{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
+ %{?_with_ilbc:--enable-libilbc} \\\
+ %{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\
--enable-libmp3lame \\\
- %{?_with_nvenc:--enable-nvenc --enable-nonfree} \\\
+ %{?_with_netcdf:--enable-netcdf} \\\
+ %{!?_without_nvenc:--enable-nvenc} \\\
%{!?_without_openal:--enable-openal} \\\
- %{?_with_opencl:--enable-opencl} \\\
+ %{!?_without_opencl:--enable-opencl} \\\
%{!?_without_opencv:--enable-libopencv} \\\
+ %{!?_without_opengl:--enable-opengl} \\\
--enable-libopenjpeg \\\
- --enable-libopus \\\
+ %{?_without_opus:--enable-libopus} \\\
%{!?_without_pulse:--enable-libpulse} \\\
+ --enable-librsvg \\\
%{?_with_rtmp:--enable-librtmp} \\\
- --enable-libschroedinger \\\
+ %{?_with_rubberband:--enable-librubberband} \\\
+ %{?_with_smb:--enable-libsmbclient} \\\
+ %{?_with_snappy:--enable-libsnappy} \\\
--enable-libsoxr \\\
--enable-libspeex \\\
+ %{?_with_ssh:--enable-libssh} \\\
+ %{?_with_tesseract:--enable-libtesseract} \\\
--enable-libtheora \\\
+ %{?_with_twolame:--enable-libtwolame} \\\
--enable-libvorbis \\\
--enable-libv4l2 \\\
+ %{!?_without_vidstab:--enable-libvidstab} \\\
%{!?_without_vpx:--enable-libvpx} \\\
+ %{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
%{!?_without_x265:--enable-libx265} \\\
- --enable-libxvid \\\
- --enable-x11grab \\\
+ %{!?_without_xvid:--enable-libxvid} \\\
+ %{?_with_zmq:--enable-libzmq} \\\
+ %{?_with_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\
--enable-avresample \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
--enable-shared \\\
- --enable-gpl \\\
+ %{!?_without_gpl:--enable-gpl} \\\
--disable-debug \\\
--disable-stripping
%prep
%if 0%{?date}
-%setup -q -n %{name}-%{?branch}%{date}
+%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q
+%setup -q -n ffmpeg-%{version}
%endif
+# backport patch for arm neon
+%patch0 -p1
# fix -O3 -g in host_cflags
-sed -i "s|check_host_cflags -O3|check_host_cflags $RPM_OPT_FLAGS|" configure
+sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
+mkdir -p _doc/examples
+cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
%{ff_configure}\
--shlibdir=%{_libdir} \
-%if 0%{?ffmpegsuffix:1}
- --build-suffix=%{ffmpegsuffix} \
+%if 0%{?_without_tools:1}
--disable-doc \
--disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver \
-%else
+%endif
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
-%ifarch %{ix86} x86_64 ppc ppc64
- --enable-runtime-cpudetect \
+%ifarch %{ix86} x86_64
+ %{!?_without_qsv:--enable-libmfx} \
%endif
-%ifarch ppc
- --cpu=g3 \
- --enable-pic \
+%ifarch %{ix86} x86_64 %{power64}
+ --enable-runtime-cpudetect \
%endif
+%ifarch %{power64}
%ifarch ppc64
--cpu=g5 \
+%endif
+%ifarch ppc64p7
+ --cpu=power7 \
+%endif
+%ifarch ppc64le
+ --cpu=power8 \
+%endif
--enable-pic \
%endif
%ifarch %{arm}
--disable-runtime-cpudetect --arch=arm \
%ifarch armv6hl
--cpu=armv6 \
-%else
+%endif
+%ifarch armv7hl armv7hnl
+ --cpu=armv7-a \
+ --enable-vfpv3 \
--enable-thumb \
%endif
+%ifarch armv7hl
+ --disable-neon \
+%endif
%ifarch armv7hnl
--enable-neon \
%endif
%endif
-%endif
+ || cat ffbuild/config.log
%make_build V=1
make documentation V=1
@@ -224,74 +361,223 @@ make alltools V=1
%install
%make_install V=1
-%if 0%{!?ffmpegsuffix:1}
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
+%if 0%{!?flavor:1}
+rm -r %{buildroot}%{_datadir}/%{name}/examples
+%endif
+%if 0%{!?progs_suffix:1}
+install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets -n libavdevice%{?flavor}
-%if 0%{!?ffmpegsuffix:1}
+%if 0%{!?_without_tools:1}
%files
%doc COPYING.* CREDITS README.md doc/ffserver.conf
-%{_bindir}/ffmpeg
-%{_bindir}/ffplay
-%{_bindir}/ffprobe
-%{_bindir}/ffserver
-%{_bindir}/qt-faststart
+%{_bindir}/ffmpeg%{?progs_suffix}
+%{_bindir}/ffplay%{?progs_suffix}
+%{_bindir}/ffprobe%{?progs_suffix}
+%{_bindir}/ffserver%{?progs_suffix}
+%{!?progs_suffix:%{_bindir}/qt-faststart}
+%{!?flavor:
%{_mandir}/man1/ffmpeg*.1*
%{_mandir}/man1/ffplay*.1*
%{_mandir}/man1/ffprobe*.1*
%{_mandir}/man1/ffserver*.1*
+}
%{_datadir}/%{name}
%endif
%files libs
%{_libdir}/lib*.so.*
-%exclude %{_libdir}/libavdevice.so.*
-%{_mandir}/man3/lib*.3.gz
+%exclude %{_libdir}/libavdevice%{?build_suffix}.so.*
+%{!?flavor:%{_mandir}/man3/lib*.3.*
+%exclude %{_mandir}/man3/libavdevice.3*
+}
-%files -n libavdevice
-%{_libdir}/libavdevice.so.*
+%files -n libavdevice%{?flavor}
+%{_libdir}/libavdevice%{?build_suffix}.so.*
+%{!?flavor:%{_mandir}/man3/libavdevice.3*}
%files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt
-%doc %{_docdir}/%{name}/*.html
+%doc _doc/examples
+%{!?flavor:%doc %{_docdir}/%{name}/*.html}
%{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
%changelog
-* Wed Jul 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.15-1
-- Update to 2.8.15
+* Thu Nov 22 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.4.5-1
+- Release 3.4.5
-* Thu Feb 22 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8.14-1
-- Update to 2.8.14
+* Thu Nov 22 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.4.1-5
+- Rebuild for el7
+- Rebuild for x265-2.9 on el7
+- Use ldconfig_scriptlets
+- Disable system's opus detection
-* Tue Jan 30 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8.13-2
-- rebuilt
+* Sat Dec 30 2017 Sérgio Basto <sergio(a)serjux.com> - 3.4.1-4
+- Mass rebuild for x264 and x265
+
+* Sun Dec 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.4.1-3
+- Add _cuda_version rpm macro
+
+* Mon Dec 11 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.4.1-2
+- Backport patch for arm neon rfbz#4727
+
+* Mon Dec 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.1-1
+- Updated to 3.4.1
+
+* Tue Nov 28 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-6
+- enable support for vid.stab (rfbz#4713)
+- rebuild against new libmfx (rhbz#1471768)
+
+* Wed Oct 25 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-5
+- drop support for building on ppc (32bit)
+- explicitly support ppc64p7 and ppc64le
+- set correct CPU options on armv7hl
+- show config.log in case of configure failure
+- enable VAAPI support on all arches, it's not x86-specific anymore
+
+* Wed Oct 25 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4-4
+- Switch from yasm to nasm
+
+* Wed Oct 25 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4-3
+- Add SVG rasterization and KMS screengrabber support
+
+* Mon Oct 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4-2
+- rebuild for x265
+
+* Sun Oct 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4-1
+- Updated to 3.4
+- Remove build requires schroedinger-devel (wrapper was removed)
+
+* Thu Oct 12 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.3.4-2
+- add support for OpenJPEG v2.3
+
+* Tue Sep 12 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.4-1
+- Updated to 3.3.4
+
+* Thu Aug 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.3-4
+- Add support for LibOpenJPEG v2.2
+
+* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Jul 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.3-1
+- Updated to 3.3.3
+
+* Wed Jun 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.2-1
+- Updated to 3.3.2
+
+* Mon May 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.1-1
+- Updated to 3.3.1
-* Sat Sep 02 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8.13-1
-- Update to 2.8.13 (security issues)
+* Wed Apr 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3-1
+- Updated to 3.3
+- Make nvenc x86 only
+- Remove obsolete x11grab configure option
-* Wed Jun 07 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8.12-1
-- Update to 2.8.12
+* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-* Mon Feb 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.8.11-1
-- Update to 2.8.11
-- enable AMR codecs by default - rfbz#4367
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.4-1
+- Updated to 3.2.4
-* Tue Dec 06 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.8.10-1
-- Updated to 2.8.10
-- Backported some .spec cleanups from rawhide
+* Mon Feb 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.3-1
+- Updated to 3.2.3
-* Sun Dec 04 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.8.9-1
-- Updated to 2.8.9
+* Tue Jan 03 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.2.2-3
+- rebuild for x265
+
+* Mon Jan 02 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.2.2-2
+- enable optional nonfree build with cuda, cuvid, npp and fdk-aac
+ (most credit for this goes to Nicolas Chauvet)
+- allow disabling x11grab (conflicts with nonfree builds)
+- use Recommends only on Fedora (patch by Nicolas Chauvet)
+- enable AMR codecs by default (rfbz#4367, patch by Nicolas Chauvet)
+
+* Tue Dec 06 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2.2-1
+- Updated to 3.2.2
+
+* Sat Nov 26 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2.1-1
+- Updated to 3.2.1
+
+* Wed Nov 16 2016 Adrian Reber <adrian(a)lisas.de> - 3.2-3
+- Rebuild for libcdio-0.94
+
+* Tue Nov 08 2016 Sérgio Basto <sergio(a)serjux.com> - 3.2-2
+- Rebuild for x265-2.1
+
+* Sat Oct 29 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2-1
+- Updated to 3.2
+- Dropped openjpeg2 patch
+- Updated BuildRequires to SDL2-devel
+- Incorporated some cleanups from RF #4243
+
+* Tue Oct 25 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.5-1
+- Updated to 3.1.5
+
+* Sat Oct 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.1.4-2
+- Fix missing libxvid (rfbz#4274)
+
+* Sat Oct 01 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.4-1
+- Updated to 3.1.4
+
+* Thu Sep 08 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.1.3-3
+- Disable OpenCV for Fedora >= 25
+
+* Sat Sep 03 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.1.3-2
+- enable QSV support by default, since libmfx is in Fedora now
+- QSV is x86 only
+- put x86-specific BRs in one place
+
+* Sat Aug 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.3-1
+- Updated to 3.1.3
+
+* Thu Aug 25 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.1.2-2
+- enable support for nvenc
+
+* Wed Aug 10 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.2-1
+- Updated to 3.1.2
+
+* Wed Jul 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.1-1
+- Updated to 3.1.1
+- Dropped included patch
+- Added $RPM_LD_FLAGS to %%configure
+- Switched to openjpeg2
+- Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani)
+
+* Sat Jul 23 2016 Igor Gnatenko <ignatenko(a)redhat.com> - 3.0.2-5
+- Rebuild for libvpx soname bump
+
+* Sun Jul 10 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.0.2-4
+- enable jack by default (rfbz#2156)
+- re-enable opencl by default (rfbz#3640 was fixed)
+- add conditional support for QSV via libmfx (rfbz#4043)
+- drop libcelt support (celt 0.11 no longer available in Fedora)
+- drop libdirac support (unsupported by FFmpeg)
+- make xvidcore support optional
+- add missing ldconfig calls for libavdevice package
+- move libavdevice manpage to its subpackage
+- move examples from main package to -devel as docs
+- add support for libiec61883 and make DV (IEEE 1394) support optional
+- enable optional support for many external libraries (rfbz#4109)
+
+* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
+- Fixed build failure on rawhide due to newer opencv using a patch from upstream
+ git
+
+* Sun Jun 12 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.2-2
+- rebuilt
-* Wed Sep 21 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.8.8-1
-- Updated to 2.8.8
+* Sat May 14 2016 Michael Kuhn <suraia(a)ikkoku.de> - 3.0.2-1
+- Update to 3.0.2.
* Mon May 02 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.8.7-1
- Updated to 2.8.7
diff --git a/sources b/sources
index f23b648..13558d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c5f5d9a3aeaa6ff1f2514cc509d3f07 ffmpeg-2.8.15.tar.xz
+b91ca21ff8ff6912226516fede49b0cb ffmpeg-3.4.5.tar.xz
5 years, 5 months
[x265/el7: 23/23] Rebuild for ffmpeg-3.* on el7
by Antonio
commit d9c20fe39750c89c872a2c5f49c2ae1c536e9661
Merge: f22231a bb04821
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 14:24:56 2018 +0100
Rebuild for ffmpeg-3.* on el7
.gitignore | 8 +
...-detect512-is-needed-on-all-architectures.patch | 35 +++
sources | 2 +-
x265-2.8-asm-primitives.patch | 347 +++++++++++++++++++++
x265-arm-cflags.patch | 60 ++++
x265-detect_cpu_armhfp.patch | 60 +++-
x265-pic.patch | 24 +-
x265-pkgconfig_path_fix.patch | 11 +
x265-test-shared.patch | 12 -
x265.spec | 99 ++++--
10 files changed, 597 insertions(+), 61 deletions(-)
---
5 years, 5 months
[x265/el7] (23 commits) ...Rebuild for ffmpeg-3.* on el7
by Antonio
Summary of changes:
69bfd3b... Update to 2.1 (*)
ecd74d5... update to 2.2 (*)
2dc33f7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
9bb47ce... Enable 10/12 bit libraries on 64 bit architectures (*)
d0b06b8... update to 2.4 (*)
ab0b4f8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
d87b513... update to 2.5 (*)
3d93608... Update x265 to 2.6 (*)
cb9f82d... update name of unpack directory (*)
02291ab... U+date so_versio to 146 (*)
fd9b4d2... quick fix for arm builds (*)
2ff9ef8... Update to 2.7 (*)
388ff93... disable arm asm build till someone else can fix it properly (*)
ecc0e1c... Revert "disable arm asm build till someone else can fix it (*)
00c7d18... Fix build on arm (*)
c2760ca... Fix pkgconfig file (rfbz #4853) (*)
65c1d0a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
aed7053... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*)
cd2972a... Update to 2.8 (*)
3ddac98... Update to 2.9 (*)
3610989... add Debian patch to fix build (*)
bb04821... Rebuild for ffmpeg-3.* on el7 (*)
d9c20fe... Rebuild for ffmpeg-3.* on el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months