[cvs-annodex] commit (/annodex):
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
andre
nobody at lists.annodex.net
Sat Feb 5 01:43:35 EST 2005
Update of /annodex (new revision 831)
Modified files:
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
Log Message:
AnnodexFirefoxExtension:
* Updated VLC diff
Modified: AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
===================================================================
--- AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-04 14:42:49 UTC (rev 830)
+++ AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-04 14:43:32 UTC (rev 831)
@@ -1,6 +1,6 @@
Index: vlc.win32.nsi
===================================================================
---- vlc.win32.nsi (revision 9801)
+--- vlc.win32.nsi (revision 9880)
+++ vlc.win32.nsi (working copy)
@@ -1,349 +1,349 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -703,7 +703,7 @@
+SectionEnd
Index: configure.ac
===================================================================
---- configure.ac (revision 9801)
+--- configure.ac (revision 9880)
+++ configure.ac (working copy)
@@ -1,7 +1,7 @@
dnl Autoconf settings for vlc
@@ -723,7 +723,7 @@
AM_CONFIG_HEADER(config.h)
dnl
-@@ -447,7 +447,7 @@
+@@ -450,7 +450,7 @@
VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom],[-lm])
])
AC_CHECK_LIB(m,pow,[
@@ -732,7 +732,7 @@
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
-@@ -954,12 +954,12 @@
+@@ -957,12 +957,12 @@
VLC_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
VLC_ADD_PLUGINS([aout_file equalizer])
VLC_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
@@ -746,16 +746,7 @@
dnl
dnl Switch to enable a version of VLC where most modules will be builtin
-@@ -977,8 +977,6 @@
- if test "${SYS}" != "mingw32"; then
- VLC_ADD_PLUGINS([screensaver])
- else
-- VLC_ADD_PLUGINS([ntservice])
-- VLC_ADD_PLUGINS([dmo])
- VLC_ADD_LDFLAGS([dmo],[-lole32])
- fi
-
-@@ -1339,7 +1337,6 @@
+@@ -1341,7 +1341,6 @@
then
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
@@ -763,7 +754,7 @@
VLC_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}])
VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
else
-@@ -1426,7 +1423,7 @@
+@@ -1442,7 +1441,7 @@
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ VLC_ADD_PLUGINS([mux_ts ts])
@@ -772,7 +763,7 @@
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H )
# include <stdint.h>
-@@ -1450,9 +1447,8 @@
+@@ -1466,9 +1465,8 @@
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
@@ -784,7 +775,7 @@
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
-@@ -1476,8 +1472,8 @@
+@@ -1492,8 +1490,8 @@
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
AC_CHECK_HEADERS([dvbpsi/dr.h],[
VLC_ADD_PLUGINS([mux_ts ts])
@@ -795,7 +786,7 @@
],[
if test -n "${enable_dvbpsi}"
-@@ -1662,20 +1658,16 @@
+@@ -1688,20 +1686,16 @@
if test "${enable_screen}" != "no"; then
if test "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
@@ -816,7 +807,7 @@
VLC_ADD_LDFLAGS([screen],[-L${x_libraries} -lX11 -lXext])
VLC_ADD_CPPFLAGS([screen],[-I${x_includes}])
])
-@@ -1704,8 +1696,7 @@
+@@ -1730,8 +1724,7 @@
if test "${SYS}" = "mingw32"
then
AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h)
@@ -826,7 +817,7 @@
fi
dnl
-@@ -1717,7 +1708,7 @@
+@@ -1743,7 +1736,7 @@
then
AC_CHECK_HEADERS(ogg/ogg.h, [
AC_CHECK_LIB( ogg, oggpack_read, [
@@ -835,7 +826,7 @@
VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
],[])
fi
-@@ -1740,7 +1731,6 @@
+@@ -1766,7 +1759,6 @@
], [
AC_CHECK_LIB(ebml, main, [
# We only have libebml, make mkv.a a builtin
@@ -843,7 +834,7 @@
VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
])
])
-@@ -1818,7 +1808,6 @@
+@@ -1844,7 +1836,6 @@
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
@@ -851,7 +842,7 @@
VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad])],
[ AC_MSG_ERROR([Cannot find libmad library...]) ])
CPPFLAGS="${CPPFLAGS_save}"
-@@ -1832,7 +1821,7 @@
+@@ -1858,7 +1849,7 @@
AC_CHECK_HEADERS(id3tag.h, [
AC_CHECK_HEADERS(zlib.h, [
VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
@@ -860,7 +851,7 @@
dnl
dnl ffmpeg decoder/demuxer plugin
-@@ -1889,7 +1878,6 @@
+@@ -1915,7 +1906,6 @@
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
AC_CHECK_LIB(avcodec, avcodec_init, [
@@ -868,7 +859,7 @@
VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])],
[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
AC_CHECK_LIB(avformat, av_open_input_stream, [
-@@ -1954,7 +1942,6 @@
+@@ -1980,7 +1970,6 @@
VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore])
fi
@@ -876,7 +867,7 @@
VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec])
-@@ -1994,7 +1981,6 @@
+@@ -2020,7 +2009,6 @@
fi
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a)
@@ -884,7 +875,7 @@
VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec])
VLC_ADD_CPPFLAGS([ffmpeg],[-DNO_ALTIVEC_IN_FFMPEG])
VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
-@@ -2044,10 +2030,8 @@
+@@ -2070,10 +2058,8 @@
AC_CHECK_HEADERS(faad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
AC_CHECK_LIB(faad, faacDecOpen, [
@@ -895,7 +886,7 @@
VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
[ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
LDFLAGS="${LDFLAGS_save}"
-@@ -2078,7 +2062,6 @@
+@@ -2104,7 +2090,6 @@
then
dnl Use a custom toolame
AC_MSG_RESULT(${real_toolame_tree}/libtoolame/libtoolame.a)
@@ -903,7 +894,7 @@
VLC_ADD_LDFLAGS([toolame],[${real_faad_tree}/libtoolame/libtoolame.a])
VLC_ADD_CPPFLAGS([toolame],[-I${real_toolame_tree}/libtoolame])
else
-@@ -2109,7 +2092,7 @@
+@@ -2135,7 +2120,7 @@
(test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
then
if test "${SYS}" = "mingw32"; then
@@ -912,7 +903,7 @@
else
AC_CHECK_HEADERS(QuickTime/QuickTime.h,
[ VLC_ADD_BUILTINS([quicktime])
-@@ -2167,7 +2150,6 @@
+@@ -2193,7 +2178,6 @@
VLC_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}"
AC_CHECK_LIB(a52, a52_free, [
@@ -920,7 +911,7 @@
VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
VLC_ADD_LDFLAGS([a52tofloat32],[-la52])
],[
-@@ -2238,7 +2220,6 @@
+@@ -2264,7 +2248,6 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
],[
AC_CHECK_LIB(dts, dts_free, [
@@ -928,7 +919,7 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
],[
if test -f ${real_dts_tree}/libdts/libdts.a
-@@ -2262,7 +2243,6 @@
+@@ -2288,7 +2271,6 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
],[
AC_CHECK_LIB(dts, dts_free, [
@@ -936,7 +927,7 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
],[
if test "${enable_dts}" = "yes"; then
-@@ -2283,7 +2263,6 @@
+@@ -2309,7 +2291,6 @@
if test "${enable_flac}" = "yes"
then
AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
@@ -944,7 +935,7 @@
VLC_ADD_LDFLAGS([flacdec],[-lFLAC])
],[])
fi
-@@ -2311,7 +2290,6 @@
+@@ -2337,7 +2318,6 @@
then
dnl Use a custom libmpeg2
AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
@@ -952,7 +943,7 @@
VLC_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2])
VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include])
eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
-@@ -2331,8 +2309,7 @@
+@@ -2357,8 +2337,7 @@
#endif
#endif],
[AC_MSG_RESULT([yes])
@@ -962,7 +953,7 @@
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
-@@ -2349,7 +2326,7 @@
+@@ -2375,7 +2354,7 @@
if test "${enable_vorbis}" != "no"
then
AC_CHECK_HEADERS(vorbis/codec.h, [
@@ -971,7 +962,7 @@
VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
-@@ -2379,7 +2356,7 @@
+@@ -2405,7 +2384,7 @@
AC_CHECK_HEADERS(speex/speex.h, [
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_toolame}"
AC_CHECK_LIB(speex, speex_decode_int, [
@@ -980,7 +971,7 @@
VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
[ AC_MSG_RESULT([no])
AC_MSG_WARN([Your libspeex is too old, please get the development
-@@ -2403,7 +2380,6 @@
+@@ -2429,7 +2408,6 @@
real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
if test -f "${real_tarkin_tree}/tarkin.o"
then
@@ -988,16 +979,18 @@
VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
VLC_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
AC_MSG_RESULT(yes)
-@@ -2426,7 +2402,7 @@
+@@ -2451,8 +2429,8 @@
+ then
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
- if test "${SYS}" = "mingw32"; then
+- if test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGINS([theora])
++ if test "${SYS}" = "mingw32" -o test "${SYS}" = "linux"; then
+ VLC_ADD_BUILTINS([theora])
else
VLC_ADD_BUILTINS([theora])
fi
-@@ -2447,9 +2423,9 @@
+@@ -2473,9 +2451,9 @@
AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [
AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [
VLC_ADD_PLUGINS([dirac])
@@ -1009,7 +1002,7 @@
])
fi
-@@ -2463,7 +2439,6 @@
+@@ -2489,7 +2467,6 @@
LDFLAGS="${LDFLAGS_save} -lz"
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LDFLAGS([png],[-lpng -lz])
@@ -1017,7 +1010,7 @@
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
-@@ -2496,7 +2471,6 @@
+@@ -2522,7 +2499,6 @@
VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
AC_CHECK_LIB(x264, x264_encoder_open, [
@@ -1025,7 +1018,7 @@
VLC_ADD_LDFLAGS([x264],[-lx264])
],[
AC_MSG_ERROR([the specified tree hasn't been compiled])
-@@ -2529,7 +2503,7 @@
+@@ -2555,7 +2531,7 @@
[ --enable-cmml CMML support (default enabled)])
if test "${enable_cmml}" != "no"
then
@@ -1034,7 +1027,7 @@
fi
-@@ -2599,7 +2573,6 @@
+@@ -2625,7 +2601,6 @@
VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
],[
@@ -1042,7 +1035,7 @@
VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
])
-@@ -2768,7 +2741,6 @@
+@@ -2794,7 +2769,6 @@
if test "${FREETYPE_CONFIG}" != "no"
then
@@ -1050,7 +1043,7 @@
VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
AC_CHECK_HEADERS(Carbon/Carbon.h,
-@@ -2946,18 +2918,17 @@
+@@ -2972,18 +2946,17 @@
if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
@@ -1071,7 +1064,7 @@
VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
AC_MSG_RESULT(yes)
-@@ -3084,7 +3055,7 @@
+@@ -3110,7 +3083,7 @@
[ --enable-wingdi Win32 GDI module (default enabled on Win32)])
if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
@@ -1080,7 +1073,7 @@
VLC_ADD_LDFLAGS([wingdi],[-lgdi32])
fi
fi
-@@ -3203,8 +3174,7 @@
+@@ -3229,8 +3202,7 @@
(test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes")
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
@@ -1090,7 +1083,7 @@
AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h)
AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[
AC_MSG_RESULT(yes)
-@@ -3641,7 +3611,7 @@
+@@ -3667,7 +3639,7 @@
[ --enable-visual visualisation plugin (default enabled)])
if test "${enable_visual}" != "no"
then
@@ -1099,7 +1092,7 @@
fi
dnl
-@@ -3684,7 +3654,6 @@
+@@ -3710,7 +3682,6 @@
fi
if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
@@ -1107,7 +1100,7 @@
VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
else
-@@ -3693,7 +3662,6 @@
+@@ -3719,7 +3690,6 @@
AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
if test -f "${real_goom_tree}/libgoom.a"; then
AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
@@ -1115,7 +1108,7 @@
VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
else
-@@ -4230,7 +4198,6 @@
+@@ -4256,7 +4226,6 @@
modules/gui/qt/Makefile
modules/gui/skins2/Makefile
modules/gui/wxwindows/Makefile
@@ -1125,7 +1118,7 @@
modules/misc/memcpy/Makefile
Index: mozilla/npvlc_rc.rc
===================================================================
---- mozilla/npvlc_rc.rc (revision 9801)
+--- mozilla/npvlc_rc.rc (revision 9880)
+++ mozilla/npvlc_rc.rc (working copy)
@@ -31,17 +31,17 @@
BEGIN
@@ -1153,475 +1146,84 @@
END
END
BLOCK "VarFileInfo"
+Index: mozilla/vlcplugin.h
+===================================================================
+--- mozilla/vlcplugin.h (revision 9880)
++++ mozilla/vlcplugin.h (working copy)
+@@ -74,37 +74,13 @@
+ /*******************************************************************************
+ * Plugin properties.
+ ******************************************************************************/
+-#define PLUGIN_NAME "VLC multimedia plugin"
++#define PLUGIN_NAME "VLC Annodex viewer plugin"
+ #define PLUGIN_DESCRIPTION \
+ "VLC multimedia plugin <br>" \
+ " <br>" \
+ "version %s <br>" \
+- "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
++ "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a><br>Annodex WWW: <a href=\"http://www.annodex.net/\">http://www.annodex.net/</a>"
+
+ #define PLUGIN_MIMETYPES \
+- /* MPEG-1 and MPEG-2 */ \
+- "audio/mpeg:mp2,mp3,mpga,mpega:MPEG audio;" \
+- "audio/x-mpeg:mp2,mp3,mpga,mpega:MPEG audio;" \
+- "video/mpeg:mpg,mpeg,mpe:MPEG video;" \
+- "video/x-mpeg:mpg,mpeg,mpe:MPEG video;" \
+- "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
+- "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
+- /* MPEG-4 */ \
+- "video/mpeg4:mp4,mpg4:MPEG-4 video;" \
+- "audio/mpeg4:mp4,mpg4:MPEG-4 audio;" \
+- "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;" \
+- "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;" \
+- /* AVI */ \
+- "video/x-msvideo:avi:AVI video;" \
+- /* QuickTime */ \
+- "video/quicktime:mov,qt:QuickTime video;" \
+- /* Ogg */ \
+- "application/x-ogg:ogg:Ogg stream;" \
+- /* explicit plugin call */ \
+- "application/x-vlc-plugin::VLC plugin;" \
+- /* windows media */ \
+- "video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
+- "video/x-ms-asf:asf,asx:Windows Media Video;" \
+- "application/x-mplayer2::Windows Media;" \
+- "video/x-ms-wmv:wmv:Windows Media" \
++ "application/x-annodex-vlc-viewer-plugin::Annodex Media View"
+
Index: mozilla/vlcshell.cpp
===================================================================
---- mozilla/vlcshell.cpp (revision 9801)
+--- mozilla/vlcshell.cpp (revision 9880)
+++ mozilla/vlcshell.cpp (working copy)
-@@ -292,7 +292,13 @@
- ppsz_argv[2] = plugin_path;
+@@ -293,6 +293,7 @@
#elif defined(XP_WIN)
-- char *ppsz_argv[] = { NULL, "-vv" };
+ char *ppsz_argv[] = { NULL, "-vv" };
+
-+ /* Cache 600ms of stream data rather than the default of 1200ms, so
-+ * that we get much better response times (i.e. lower latency) on
-+ * transport controls such as Play/Pause/Seek */
-+
-+ char *ppsz_argv[] = { NULL, "--http-caching=600", "-vv" };
-+
HKEY h_key;
DWORD i_type, i_data = MAX_PATH + 1;
char p_data[MAX_PATH + 1];
-Index: extras/contrib/src/Makefile
-===================================================================
---- extras/contrib/src/Makefile (revision 9801)
-+++ extras/contrib/src/Makefile (working copy)
-@@ -36,6 +36,8 @@
- export CFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
- export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
- export LDFLAGS = -L$(PREFIX)/lib
-+export PKG_CONFIG_PATH=/usr/lib/pkgconfig:$(PREFIX)/lib/pkgconfig
-+export PKG_CONFIG=$(PREFIX)/bin/pkg-config
- endif
- ifeq ($(SYS),BEOS)
- export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin
-@@ -51,11 +53,9 @@
- # ***************************************************************************
+@@ -314,12 +315,18 @@
+ if( !ppsz_argv[0] ) ppsz_argv[0] = "vlc";
- ifeq ($(SYS),DARWIN)
--all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
-- .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-- .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
-- .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
-- .png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager
-+all: .pkgcfg \
-+ .ogg .vorbis .theora \
-+ .FLAC .speex
- endif
- ifeq ($(SYS),BEOS)
- all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
-@@ -216,6 +216,24 @@
- DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
+ #else
+- char *ppsz_argv[] =
+- {
+- "vlc"
+- /*, "--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins"*/
+- };
++ char *plugin_path;
++ char *home_directory;
++ char *ppsz_argv[] = { "vlc", "--plugin-path", NULL };
- # ***************************************************************************
-+# libiconv
-+# ***************************************************************************
++ home_directory = strdup( getenv("HOME") );
++ plugin_path = (char *) malloc( strlen( home_directory ) +
++ strlen( "/.mozilla/plugins" ) + 1);
++ strcpy( plugin_path, home_directory );
++ strcat( plugin_path, "/.mozilla/plugins" );
+
-+libiconv-$(LIBICONV_VERSION).tar.gz:
-+ $(WGET) $(LIBICONV_URL)
++ ppsz_argv[2] = plugin_path;
+
-+libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
-+ $(EXTRACT_GZ)
-+
-+.iconv: libiconv
-+ (cd libiconv; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-+ touch $@
-+
-+CLEAN_FILE += .iconv
-+CLEAN_PKG += libiconv
-+DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
-+
-+# ***************************************************************************
- # pkgconfig
- # ***************************************************************************
+ #endif
-@@ -232,7 +250,6 @@
- CLEAN_FILE += .pkgcfg
- CLEAN_PKG += pkgconfig
- DISTCLEAN_PKG += pkgconfig-$(PKGCFG_VERSION).tar.gz
--
- # ***************************************************************************
- # gettext
- # ***************************************************************************
-@@ -244,41 +261,21 @@
- $(EXTRACT_GZ)
- patch -p 0 < Patches/gettext.patch
-
--.intl: gettext
-- ( cd $< && ./configure --prefix=$(PREFIX) )
-+.gettext: gettext .iconv
-+ ( cd $< && ./configure --with-libiconv-prefix=/usr --prefix=$(PREFIX) --disable-shared --enable-static )
- ifeq ($(SYS),BEOS)
- # The ugliest kludge ever - so libtool correctly links shared libraries
- # on BeOS. Sorry, I just can't figure out how libtool works
- ( cd $< && for f in `find . -name libtool`; do mv $$f $$f.orig; sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' < $$f.orig > $$f; chmod +x $$f; rm $$f.orig; done )
- endif
- ( cd $< && make && make install )
-- $(INSTALL_NAME)
- touch $@
-
--CLEAN_FILE += .intl
-+CLEAN_FILE += .gettext
- CLEAN_PKG += gettext
- DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz
-
- # ***************************************************************************
--# libiconv
--# ***************************************************************************
--
--libiconv-$(LIBICONV_VERSION).tar.gz:
-- $(WGET) $(LIBICONV_URL)
--
--libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
-- $(EXTRACT_GZ)
--
--.iconv: libiconv
-- (cd libiconv; ./configure --prefix=$(PREFIX) --disable-nls && make && make install)
-- $(INSTALL_NAME)
-- touch $@
--
--CLEAN_FILE += .iconv
--CLEAN_PKG += libiconv
--DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
--
--# ***************************************************************************
- # freetype2
- # ***************************************************************************
-
-@@ -289,8 +286,7 @@
- $(EXTRACT_GZ)
-
- .freetype: freetype2
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .freetype
-@@ -421,8 +417,8 @@
- $(EXTRACT_GZ)
-
- .ogg: libogg
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-+ (cd "$(PREFIX)/lib" && perl -pi -e "s,^library_names=''"'$$'",library_names='libogg.a'," libogg.la)
- touch $@
-
- CLEAN_FILE += .ogg
-@@ -445,10 +441,10 @@
-
- libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
- $(EXTRACT_GZ)
-+ patch -p 0 < Patches/vorbis.patch
-
- .vorbis: libvorbis .ogg
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; /usr/bin/aclocal && /usr/bin/glibtoolize --copy --force && /usr/bin/autoconf && /usr/bin/automake --add-missing && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- .vorbisenc: .vorbis .ogg
-@@ -471,7 +467,7 @@
- patch -p 0 < Patches/theora.patch
-
- .theora: libtheora
-- (cd $<; CC="gcc $(CFLAGS)" ./configure --prefix=$(PREFIX) && make && make install)
-+ (cd $<; CC="gcc $(CFLAGS)" ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .theora
-@@ -489,8 +485,7 @@
- $(EXTRACT_GZ)
-
- .FLAC: flac
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .flac
-@@ -509,8 +504,7 @@
- patch -p 0 < Patches/speex.patch
-
- .speex: speex
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .speex
-@@ -535,8 +529,7 @@
- $(EXTRACT_BZ2)
-
- .faad: faad2
-- (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" --disable-shared --enable-static && make -C libfaad && make -C libfaad install)
- touch $@
-
- CLEAN_FILE += .faad
-@@ -555,7 +548,7 @@
- patch -p 0 < Patches/faac.patch
-
- .faac: faac
-- (cd $<; ./bootstrap && ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
-+ (cd $<; rm -rf autom4te.cache && ./bootstrap && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .faac
-@@ -573,7 +566,7 @@
- $(EXTRACT_GZ)
-
- .lame: lame
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .lame
-@@ -628,7 +621,8 @@
-
- ffmpeg:
- echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
-- CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
-+ CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) export -r HEAD ffmpeg
-+ rm -f ./ffmpeg.cvs
- patch -p 0 < Patches/ffmpeg.patch.cvs
- # (cd $@; ./bootstrap)
-
-@@ -640,11 +634,11 @@
- # patch -p 0 < Patches/ffmpeg.patch
-
- .ffmpeg: ffmpeg
-- (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
-+ (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 --disable-shared --enable-static && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
- touch $@
-
- CLEAN_FILE += .ffmpeg
--CLEAN_PKG += ffmpeg
-+CLEAN_PKG += ffmpeg ffmpeg.cvs
- DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz
-
- # ***************************************************************************
-@@ -697,8 +691,7 @@
- patch -p 0 < Patches/libdvdread.patch
-
- .dvdread: libdvdread .dvdcss
-- (cd $<; ./configure --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .dvdread
-@@ -723,8 +716,7 @@
- endif
-
- .dvdnav: libdvdnav .dvdread
-- (cd $<; ./configure --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
-- $(INSTALL_NAME)
-+ (cd $<; ./configure --disable-shared --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
- touch $@
-
- CLEAN_FILE += .dvdnav
-@@ -773,37 +765,19 @@
- # goom
- # ***************************************************************************
-
--#goom-macosx-altivec-bin.tar.gz:
--# $(WGET) $(GOOM_URL)
-+goom-macosx-altivec-bin.tar.gz:
-+ $(WGET) $(GOOM_URL)
-
--#goom: goom-macosx-altivec-bin.tar.gz
--# $(EXTRACT_GZ)
--
--#.goom: goom
--# (cd $<;)
--# touch $@
--
--#CLEAN_FILE += .goom
--#CLEAN_PKG += goom
--#DISTCLEAN_PKG += goom-macosx-altivec-bin.tar.gz
--
--# ***************************************************************************
--# goom2k4
--# ***************************************************************************
--
--goom2k4-$(GOOM2k4_VERSION).tar.gz:
-- $(WGET) $(GOOM2k4_URL)
--
--goom: goom2k4-$(GOOM2k4_VERSION).tar.gz
-+goom: goom-macosx-altivec-bin.tar.gz
- $(EXTRACT_GZ)
-
--.goom2k4: goom
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -faltivec" && make && make install )
-+.goom: goom
-+ (cd $<;)
- touch $@
-
--CLEAN_FILE += .goom2k4
-+CLEAN_FILE += .goom
- CLEAN_PKG += goom
--DISTCLEAN_PKG += goom2k4-$(GOOM2k_VESION).tar.gz
-+DISTCLEAN_PKG += goom-macosx-altivec-bin.tar.gz
-
- # ***************************************************************************
- # libcaca
-@@ -816,7 +790,7 @@
- $(EXTRACT_GZ)
-
- .caca: libcaca
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install)
-+ (cd $<; CFLAGS="-fno-common" ./configure --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-shared --enable-static && make && make install)
- touch $@
-
- CLEAN_FILE += .caca
-@@ -880,7 +854,7 @@
- patch -p 0 < Patches/libcddb.patch
-
- .cddb: libcddb
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="-L$(PREFIX)/lib -liconv" && make && make install)
-+ (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
- touch $@
-
- CLEAN_FILE += .cddb
-@@ -896,16 +870,17 @@
-
- vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
- $(EXTRACT_GZ)
-+ patch -p 0 < Patches/vcdimager.patch
-
- ifeq ($(SYS),DARWIN)
- .vcdimager: vcdimager
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install)
-+ (cd $<; ./configure --prefix=$(PREFIX) --without-cli-frontend --without-xml-frontend --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install)
- touch $@
- endif
-
- ifeq ($(SYS),BEOS)
- .vcdimager: vcdimager
-- (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-+ (cd $<; ./configure --prefix=$(PREFIX) --without-cli-frontend --without-xml-frontend --disable-shared --enable-static && make && make install)
- touch $@
- endif
-
-@@ -924,7 +899,9 @@
- $(EXTRACT_GZ)
-
- .cdio: libcdio
-- (cd $<; ./configure --prefix=$(PREFIX) --without-libcddb --without-vcdinfo && make && make install)
-+ (cd $<; ./configure --prefix=$(PREFIX) --without-libcddb --without-cd-info --without-cd-read --disable-shared --enable-static && make && make install)
-+ (cd "$(PREFIX)/lib" && perl -pi -e "s,^library_names=''"'$$'",library_names='libcdio.a'," libcdio.la)
-+ (cd "$(PREFIX)/lib" && perl -pi -e "s,^library_names=''"'$$'",library_names='libiso9660.a'," libiso9660.la)
- touch $@
-
- CLEAN_FILE += .cdio
-@@ -980,106 +957,14 @@
- cat Patches/libpng.patch | sed s,PREFIX,$(PREFIX), | patch -p0
-
- .png: libpng
-- (cd $<; cp scripts/makefile.macosx Makefile && make shared && make install)
-+ (cd $<; cp scripts/makefile.macosx Makefile && make && make install-static && make install-config)
- touch $@
-
- CLEAN_FILE += .png
- CLEAN_PKG += libpng
--DISCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2
-+DISTCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2
-
- # ***************************************************************************
--# libzvbi
--# ***************************************************************************
--
--zvbi-$(ZVBI_VERSION).tar.bz2:
-- $(WGET) $(ZVBI_URL)
--
--zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
-- $(EXTRACT_BZ2)
--
--.zvbi: zvbi
-- (cd $<; ./configure --prefix=$(PREFIX) && make )
-- touch $@
--
--CLEAN_FILE += .zvbi
--CLEAN_PKG += zvbi
--DISCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
--
--# ***************************************************************************
--# gpg-error
--# ***************************************************************************
--
--libgpg-error-$(GPGERROR_VERSION).tar.gz:
-- $(WGET) $(GPGERROR_URL)
--
--libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
-- $(EXTRACT_GZ)
--
--.gpgerror: libgpg-error
-- (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
-- touch $@
--
--CLEAN_FILE += .gpgerror
--CLEAN_PKG += libgpg-error
--DISCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
--
--# ***************************************************************************
--# libgcrypt
--# ***************************************************************************
--
--libgcrypt-$(GCRYPT_VERSION).tar.gz:
-- $(WGET) $(GCRYPT_URL)
--
--libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
-- $(EXTRACT_GZ)
--
--.gcrypt: libgcrypt
-- (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install )
-- touch $@
--
--CLEAN_FILE += .gcrypt
--CLEAN_PKG += libgcrypt
--DISCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz
--
--# ***************************************************************************
--# gnutls
--# ***************************************************************************
--
--gnutls-$(GNUTLS_VERSION).tar.bz2:
-- $(WGET) $(GNUTLS_URL)
--
--gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
-- $(EXTRACT_BZ2)
--
--.gnutls: gnutls
-- (cd $<; ./configure --prefix=$(PREFIX) && make install )
-- touch $@
--
--CLEAN_FILE += .gnutls
--CLEAN_PKG += gnutls
--DISCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2
--
--# ***************************************************************************
--# libopendaap
--# ***************************************************************************
--
--libopendaap-$(DAAP_VERSION).tar.bz2:
-- $(WGET) $(DAAP_URL)
--
--libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
-- $(EXTRACT_BZ2)
-- patch -p 0 < Patches/daap.patch
--
--.daap: libopendaap
-- (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install )
-- touch $@
--
--CLEAN_FILE += .daap
--CLEAN_PKG += libopendaap
--DISCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
--
--# ***************************************************************************
--# ***************************************************************************
- # Some cleansing
- # ***************************************************************************
-
-@@ -1090,6 +975,8 @@
- rm -rf $(CLEAN_PKG)
-
- clean-src: clean
-+
-+clean-packages: clean
- rm -rf $(DISTCLEAN_PKG)
-
- distclean: clean-src
+ i_ret = VLC_Init( p_plugin->i_vlc, sizeof(ppsz_argv)/sizeof(char*),
--
andre
More information about the cvs-annodex
mailing list