Commit 620dc72a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Revert [20137]

 - Revert [20138]
 - Revert [20139]

Special credits to these commits for:
 - breaking the build system,
 - crashing VLC on every single 64-bits platform,
 - breaking bootstrap with any version of automake that is not the same as the one on Jean-Paul's computer.
parent 2a14ed22
......@@ -12,11 +12,7 @@ NULL =
# - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
SUBDIRS = intl po libs/loader
if HAVE_LIBGCRYPT
SUBDIRS += libs/srtp
endif
SUBDIRS += src modules . \
SUBDIRS = intl po libs/loader libs/srtp src modules . \
mozilla bindings activex share doc
DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
......
......@@ -472,22 +472,6 @@ ${autoconf}
${autoheader}
${automake} --add-missing --copy -Wall
# patch for uclibc support on linux (remove when fixed)
patch -s -p0 << 'EOF'
--- autotools/config.sub.orig 2007-05-16 13:16:41.000000000 +0200
+++ autotools/config.sub 2007-05-16 13:17:34.000000000 +0200
@@ -1110,6 +1110,9 @@
-unixware*)
os=-sysv4.2uw
;;
+ -uclibc*)
+ os=-linux
+ ;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
EOF
##
## files which need to be regenerated
##
......
......@@ -481,21 +481,11 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
#else
# if !defined (__PLUGIN__) || defined (HAVE_SHARED_LIBVLC)
# ifdef __cplusplus
# if HAVE_ATTRIBUTE_VISIBILITY
# define VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
# define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
# else
# define VLC_EXPORT( type, name, args ) extern "C" type name args
# define VLC_INTERNAL( type, name, args ) extern "C" type name args
# endif
# else
# if HAVE_ATTRIBUTE_VISIBILITY
# define VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
# define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
# else
# define VLC_EXPORT( type, name, args ) type name args
# define VLC_INTERNAL( type, name, args ) type name args
# endif
# endif
# else
# define VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
......
......@@ -364,7 +364,7 @@ struct stream_t
vlc_bool_t b_little_endian;
};
#include <vlc/libvlc.h>
#include <libvlc.h>
static inline stream_t *vlc_stream_create( vlc_object_t *obj )
{
......
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