[vlc-commits] Contribs: update live555

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jun 25 13:56:35 2015 +0200| [64825926f82f9dee691738c56e0e1b36f8ff9856] | committer: Jean-Baptiste Kempf

Contribs: update live555

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64825926f82f9dee691738c56e0e1b36f8ff9856
---

 contrib/src/live555/SHA512SUMS   |    2 +-
 contrib/src/live555/rules.mak    |    6 +++---
 modules/video_chroma/Makefile.am |    8 +++++---
 modules/video_filter/Makefile.am |    1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/contrib/src/live555/SHA512SUMS b/contrib/src/live555/SHA512SUMS
index 7ae2a1b..1c529da 100644
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@ -1 +1 @@
-8446dfe07793bf2ef2db231bca0ef2aa49890703fd3efa857c24d5f0774216b52a981c8683bdaf796983af89286ef579da1b4e828ed1bd62a2e2b3ab7d3f93ac  live.2015.06.21.tar.gz
+6de220196f8e503d8d0fc5191c241ffd082cde903bef8f504cb789904518ee7f1e790e265bc7b30bdb4ec61e74b94fc2aa7aa969dc52b1b402d54b362b970189  live.2015.06.24.tar.gz
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 15fcb0b..7830c41 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,8 +1,8 @@
 # live555
 
-LIVE555_FILE := live.2015.06.21.tar.gz
-LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
-#LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
+LIVE555_FILE := live.2015.06.24.tar.gz
+#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
+LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK
 PKGS += live555
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index ae8af04..8405eb0 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -81,15 +81,15 @@ endif
 # SSE2
 libi420_rgb_sse2_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_rgb.h \
 	video_chroma/i420_rgb16_x86.c video_chroma/i420_rgb_sse2.h
-libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2
+libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 -msse
 
 libi420_yuy2_sse2_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h
 libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DMODULE_NAME_IS_i420_yuy2_sse2
+	-DMODULE_NAME_IS_i420_yuy2_sse2 -msse
 
 libi422_yuy2_sse2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h
 libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DMODULE_NAME_IS_i422_yuy2_sse2
+	-DMODULE_NAME_IS_i422_yuy2_sse2 -msse
 
 if HAVE_SSE2
 chroma_LTLIBRARIES += \
@@ -101,6 +101,7 @@ endif
 # DXVA2
 libdxa9_plugin_la_SOURCES = video_chroma/dxa9.c \
 	video_chroma/copy.c video_chroma/copy.h
+libdxa9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 -msse
 
 if HAVE_AVCODEC_DXVA2
 chroma_LTLIBRARIES += \
@@ -110,6 +111,7 @@ endif
 # D3D11VA
 libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c \
 	video_chroma/copy.c video_chroma/copy.h
+libd3d11_surface_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 -msse
 
 if HAVE_AVCODEC_D3D11VA
 chroma_LTLIBRARIES += \
diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
index dc2b5b4..59b5cd3 100644
--- a/modules/video_filter/Makefile.am
+++ b/modules/video_filter/Makefile.am
@@ -59,6 +59,7 @@ libscale_plugin_la_SOURCES = video_filter/scale.c
 libscene_plugin_la_SOURCES = video_filter/scene.c
 libscene_plugin_la_LIBADD = $(LIBM)
 libsepia_plugin_la_SOURCES = video_filter/sepia.c
+libsepia_plugin_la_CFLAGS = $(AM_CFLAGS) -msse
 libsharpen_plugin_la_SOURCES = video_filter/sharpen.c
 libtransform_plugin_la_SOURCES = video_filter/transform.c
 libvhs_plugin_la_SOURCES = video_filter/vhs.c