Fix build on f22

el8
Nicolas Chauvet 10 years ago
parent cba47ecdae
commit 40c9b0990b

@ -1,33 +0,0 @@
commit 0dd405cca1425b3496e0659c7b124cb188cf3166
Author: Nicolas Chauvet <kwizart@gmail.com>
Date: Sun Apr 26 23:01:57 2015 +0200
Fix SSE caling convention without SSE/SSE2 enabled
video_chroma/i420_yuy2.c: In function 'I420_YVYU_Filter':
video_chroma/i420_yuy2.c:187:23: error: calling 'I420_YVYU.isra.1'
with SSE caling convention without SSE/SSE2 enabled
VIDEO_FILTER_WRAPPER( I420_YVYU )
^
../include/vlc_filter.h:266:13: note: in definition of macro 'VIDEO_FILTER_WRAPPER'
name( p_filter, p_pic, p_outpic ); \
^
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index aa1a826..b1bb426 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -84,11 +84,11 @@ libi420_rgb_sse2_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_r
libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2
libi420_yuy2_sse2_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h
-libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 \
-DMODULE_NAME_IS_i420_yuy2_sse2
libi422_yuy2_sse2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h
-libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 \
-DMODULE_NAME_IS_i422_yuy2_sse2
if HAVE_SSE2

@ -39,7 +39,6 @@ URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
Patch0: vlc-backport-freerdp.patch Patch0: vlc-backport-freerdp.patch
Patch1: vlc-backport-chroma_dead_CYUV.patch Patch1: vlc-backport-chroma_dead_CYUV.patch
Patch2: vlc-video_chroma-sse2.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -222,7 +221,6 @@ JACK audio plugin for the VLC media player.
%setup -q -n %{name}-%{version}%{?vlc_rc} %setup -q -n %{name}-%{version}%{?vlc_rc}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 -b .sse2
%{?_with_bootstrap: %{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap ./bootstrap
@ -235,6 +233,12 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%configure \ %configure \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-optimizations \
%if 0%{?fedora} >= 22
%ifarch i686
--disable-mmx --disable-sse \
%endif
%endif
--disable-silent-rules \ --disable-silent-rules \
--with-pic \ --with-pic \
--disable-rpath \ --disable-rpath \
@ -478,6 +482,8 @@ fi || :
%changelog %changelog
* Sun Apr 26 2015 Nicolas Chauvet <kwizart@gmail.com> - 2.2.1-3 * Sun Apr 26 2015 Nicolas Chauvet <kwizart@gmail.com> - 2.2.1-3
- Fix build with freerdp for f22 - Fix build with freerdp for f22
- Disable optimizations
- Disable mmx and sse on fedora >= 22
* Thu Apr 16 2015 Nicolas Chauvet <kwizart@gmail.com> - 2.2.1-2 * Thu Apr 16 2015 Nicolas Chauvet <kwizart@gmail.com> - 2.2.1-2
- Rebuilt for x265 - Rebuilt for x265

Loading…
Cancel
Save