Commit 2219b6ed authored by Christophe Mutricy's avatar Christophe Mutricy

Backports:

[15538]  build fix
[15546]  shoutcast alias
[15531]  remove debug
[15522]  libtool fix
[15524]  linking fix
[15519]  configure fix
parent dd6c7323
...@@ -104,7 +104,7 @@ Ondrej Kuda aka Albert <kuda at natur dot cuni dot cz> - HTTP interface tips and ...@@ -104,7 +104,7 @@ Ondrej Kuda aka Albert <kuda at natur dot cuni dot cz> - HTTP interface tips and
Øyvind Kolbu <oyvindk at world-online.no> - FreeBSD patches Øyvind Kolbu <oyvindk at world-online.no> - FreeBSD patches
Patrick Horn <patrickd0thorn at mindspring d0t com> - DirectShow patch Patrick Horn <patrickd0thorn at mindspring d0t com> - DirectShow patch
Paul Mackerras <paulus at linuxcare.com.au> - AltiVec IDCT and motion Paul Mackerras <paulus at linuxcare.com.au> - AltiVec IDCT and motion
Pavlov Konstantin “thresh” - several Linux configure.ac fixes Pavlov Konstantin “thresh” - several Linux build system fixes
Philippe Van Hecke <philippe at belnet dot be> - SAP header hash patch Philippe Van Hecke <philippe at belnet dot be> - SAP header hash patch
Pierre Marc Dumuid <pierre.dumuid at adelaide dot edu dot au> - Playlist patches Pierre Marc Dumuid <pierre.dumuid at adelaide dot edu dot au> - Playlist patches
Régis Duchesne <regis at via.ecp.fr> - original VLC code Régis Duchesne <regis at via.ecp.fr> - original VLC code
......
...@@ -560,6 +560,9 @@ AC_CHECK_LIB(m,pow,[ ...@@ -560,6 +560,9 @@ AC_CHECK_LIB(m,pow,[
AC_CHECK_LIB(m,sqrt,[ AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm]) VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
]) ])
AC_CHECK_LIB(m,ceil,[
VLC_ADD_LDFLAGS([mosaic],[-lm])
])
AC_CHECK_LIB(mx,sqrtf,[ AC_CHECK_LIB(mx,sqrtf,[
VLC_ADD_LDFLAGS([x264],[-lmx]) VLC_ADD_LDFLAGS([x264],[-lmx])
]) ])
...@@ -5073,7 +5076,7 @@ then ...@@ -5073,7 +5076,7 @@ then
if test "${mozilla}" != "false" if test "${mozilla}" != "false"
then then
build_pic=yes build_pic=yes
AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path} /usr/lib/mozilla) AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla)
if test "${XPIDL}" = "no"; then if test "${XPIDL}" = "no"; then
AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
fi fi
......
...@@ -27,6 +27,12 @@ ...@@ -27,6 +27,12 @@
#include <stdlib.h> /* malloc( ), free( ) */ #include <stdlib.h> /* malloc( ), free( ) */
#include <string.h> #include <string.h>
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include "vlc_osd.h"
#include "vlc_block.h"
#include "vlc_filter.h"
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
# include <sys/types.h> # include <sys/types.h>
#endif #endif
...@@ -38,12 +44,6 @@ ...@@ -38,12 +44,6 @@
# include <io.h> # include <io.h>
#endif #endif
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include "vlc_osd.h"
#include "vlc_block.h"
#include "vlc_filter.h"
#include <glib-object.h> /* g_object_unref( ) */ #include <glib-object.h> /* g_object_unref( ) */
#include <librsvg-2/librsvg/rsvg.h> #include <librsvg-2/librsvg/rsvg.h>
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
vlc_module_begin(); vlc_module_begin();
set_shortname( "Shoutcast"); set_shortname( "Shoutcast");
set_description( _("Shoutcast radio listings") ); set_description( _("Shoutcast radio listings") );
add_shortcut( "shoutcast" );
set_category( CAT_PLAYLIST ); set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD ); set_subcategory( SUBCAT_PLAYLIST_SD );
......
...@@ -157,7 +157,7 @@ endif ...@@ -157,7 +157,7 @@ endif
libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -shrext $(LIBEXT) libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version -shrext $(LIBEXT)
libvlcplugin_la_LIBADD = ../src/libvlc.la libvlcplugin_la_LIBADD = ../src/libvlc.la
libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment