[cvs-annodex] commit (/annodex):
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
andre
nobody at lists.annodex.net
Thu Feb 24 00:03:02 EST 2005
Update of /annodex (new revision 935)
Modified files:
AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
Log Message:
AnnodexFirefoxExtension:
* Updated VLC patch
Modified: AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff
===================================================================
--- AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-23 13:02:10 UTC (rev 934)
+++ AnnodexFirefoxExtension/trunk/Windows/VLC-Build/VLC_Annodex.diff 2005-02-23 13:03:01 UTC (rev 935)
@@ -1,6 +1,6 @@
Index: vlc.win32.nsi
===================================================================
---- vlc.win32.nsi (revision 9929)
+--- vlc.win32.nsi (revision 10044)
+++ vlc.win32.nsi (working copy)
@@ -131,8 +131,8 @@
File vlc.exe.manifest
@@ -15,7 +15,7 @@
Index: configure.ac
===================================================================
---- configure.ac (revision 9929)
+--- configure.ac (revision 10044)
+++ configure.ac (working copy)
@@ -1,7 +1,7 @@
dnl Autoconf settings for vlc
@@ -35,30 +35,30 @@
AM_CONFIG_HEADER(config.h)
dnl
-@@ -957,12 +957,12 @@
+@@ -982,11 +982,12 @@
+ VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
+ VLC_ADD_PLUGINS([trivial_channel_mixer simple_channel_mixer])
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])
--VLC_ADD_PLUGINS([image])
- VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
- VLC_ADD_PLUGINS([rawvideo blend scale time marq logo])
+-VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
++VLC_ADD_PLUGINS([playlist export sgimb m3u xtag])
+ VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au])
- VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
- VLC_ADD_PLUGINS([access_ftp access_directory sap http])
-+VLC_ADD_PLUGINS([ogg vorbis speex theora flac cmml])
+ VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http access_mms])
+ VLC_ADD_PLUGINS([access_ftp ipv4])
++VLC_ADD_PLUGINS([ogg vorbis theora cmml])
- dnl
- dnl Switch to enable a version of VLC where most modules will be builtin
-@@ -1743,7 +1743,7 @@
+ if test "${SYS}" != "mingwce"; then
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq sap])
+@@ -1788,7 +1789,7 @@
then
AC_CHECK_HEADERS(ogg/ogg.h, [
AC_CHECK_LIB( ogg, oggpack_read, [
-- VLC_ADD_PLUGINS([ogg mux_ogg])
+- VLC_ADD_PLUGINS([ogg])
+ VLC_ADD_BUILTINS([ogg])
- VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
- ],[])
- fi
-@@ -1941,7 +1941,6 @@
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_PLUGINS([mux_ogg])
+ fi
+@@ -1989,7 +1990,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, [
@@ -66,7 +66,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, [
-@@ -2006,7 +2005,6 @@
+@@ -2054,7 +2054,6 @@
VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore])
fi
@@ -74,7 +74,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])
-@@ -2046,7 +2044,6 @@
+@@ -2094,7 +2093,6 @@
fi
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a)
@@ -82,7 +82,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])
-@@ -2096,10 +2093,8 @@
+@@ -2144,10 +2142,8 @@
AC_CHECK_HEADERS(faad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
AC_CHECK_LIB(faad, faacDecOpen, [
@@ -93,7 +93,7 @@
VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
[ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
LDFLAGS="${LDFLAGS_save}"
-@@ -2130,7 +2125,6 @@
+@@ -2178,7 +2174,6 @@
then
dnl Use a custom toolame
AC_MSG_RESULT(${real_toolame_tree}/libtoolame/libtoolame.a)
@@ -101,7 +101,7 @@
VLC_ADD_LDFLAGS([toolame],[${real_faad_tree}/libtoolame/libtoolame.a])
VLC_ADD_CPPFLAGS([toolame],[-I${real_toolame_tree}/libtoolame])
else
-@@ -2161,7 +2155,7 @@
+@@ -2209,7 +2204,7 @@
(test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
then
if test "${SYS}" = "mingw32"; then
@@ -110,7 +110,7 @@
else
AC_CHECK_HEADERS(QuickTime/QuickTime.h,
[ VLC_ADD_BUILTINS([quicktime])
-@@ -2219,7 +2213,6 @@
+@@ -2267,7 +2262,6 @@
VLC_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}"
AC_CHECK_LIB(a52, a52_free, [
@@ -118,7 +118,7 @@
VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
VLC_ADD_LDFLAGS([a52tofloat32],[-la52])
],[
-@@ -2290,7 +2283,6 @@
+@@ -2338,7 +2332,6 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
],[
AC_CHECK_LIB(dts, dts_free, [
@@ -126,7 +126,7 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
],[
if test -f ${real_dts_tree}/libdts/libdts.a
-@@ -2314,7 +2306,6 @@
+@@ -2362,7 +2355,6 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
],[
AC_CHECK_LIB(dts, dts_free, [
@@ -134,7 +134,7 @@
VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
],[
if test "${enable_dts}" = "yes"; then
-@@ -2335,7 +2326,6 @@
+@@ -2383,7 +2375,6 @@
if test "${enable_flac}" = "yes"
then
AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
@@ -142,7 +142,7 @@
VLC_ADD_LDFLAGS([flacdec],[-lFLAC])
],[])
fi
-@@ -2363,7 +2353,6 @@
+@@ -2411,7 +2402,6 @@
then
dnl Use a custom libmpeg2
AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
@@ -150,7 +150,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`"
-@@ -2383,8 +2372,7 @@
+@@ -2431,8 +2421,7 @@
#endif
#endif],
[AC_MSG_RESULT([yes])
@@ -160,7 +160,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.])])],
-@@ -2401,7 +2389,7 @@
+@@ -2449,7 +2438,7 @@
if test "${enable_vorbis}" != "no"
then
AC_CHECK_HEADERS(vorbis/codec.h, [
@@ -169,7 +169,7 @@
VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
-@@ -2431,7 +2419,7 @@
+@@ -2479,7 +2468,7 @@
AC_CHECK_HEADERS(speex/speex.h, [
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_toolame}"
AC_CHECK_LIB(speex, speex_decode_int, [
@@ -178,7 +178,7 @@
VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
[ AC_MSG_RESULT([no])
AC_MSG_WARN([Your libspeex is too old, please get the development
-@@ -2455,7 +2443,6 @@
+@@ -2503,7 +2492,6 @@
real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
if test -f "${real_tarkin_tree}/tarkin.o"
then
@@ -186,7 +186,7 @@
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)
-@@ -2477,8 +2464,8 @@
+@@ -2525,8 +2513,8 @@
then
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
@@ -197,7 +197,7 @@
else
VLC_ADD_BUILTINS([theora])
fi
-@@ -2499,9 +2486,9 @@
+@@ -2547,9 +2535,9 @@
AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [
AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [
VLC_ADD_PLUGINS([dirac])
@@ -209,7 +209,7 @@
])
fi
-@@ -2515,7 +2502,6 @@
+@@ -2563,7 +2551,6 @@
LDFLAGS="${LDFLAGS_save} -lz"
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LDFLAGS([png],[-lpng -lz])
@@ -217,7 +217,7 @@
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
-@@ -2548,7 +2534,6 @@
+@@ -2596,7 +2583,6 @@
VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
AC_CHECK_LIB(x264, x264_encoder_open, [
@@ -225,7 +225,7 @@
VLC_ADD_LDFLAGS([x264],[-lx264])
],[
AC_MSG_ERROR([the specified tree hasn't been compiled])
-@@ -2581,7 +2566,7 @@
+@@ -2629,7 +2615,7 @@
[ --enable-cmml CMML support (default enabled)])
if test "${enable_cmml}" != "no"
then
@@ -234,7 +234,7 @@
fi
-@@ -2651,7 +2636,6 @@
+@@ -2700,7 +2686,6 @@
VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
],[
@@ -242,7 +242,7 @@
VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
])
-@@ -2820,7 +2804,6 @@
+@@ -2872,7 +2857,6 @@
if test "${FREETYPE_CONFIG}" != "no"
then
@@ -250,7 +250,7 @@
VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
AC_CHECK_HEADERS(Carbon/Carbon.h,
-@@ -2998,18 +2981,17 @@
+@@ -3050,18 +3034,17 @@
if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
@@ -271,7 +271,7 @@
VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
AC_MSG_RESULT(yes)
-@@ -3136,7 +3118,7 @@
+@@ -3188,7 +3171,7 @@
[ --enable-wingdi Win32 GDI module (default enabled on Win32)])
if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
@@ -279,8 +279,8 @@
+ VLC_ADD_BUILTINS([wingdi])
VLC_ADD_LDFLAGS([wingdi],[-lgdi32])
fi
- fi
-@@ -3255,8 +3237,7 @@
+ if test "${SYS}" = "mingwce"; then
+@@ -3314,8 +3297,7 @@
(test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes")
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
@@ -290,7 +290,7 @@
AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h)
AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[
AC_MSG_RESULT(yes)
-@@ -3693,7 +3674,7 @@
+@@ -3766,7 +3748,7 @@
[ --enable-visual visualisation plugin (default enabled)])
if test "${enable_visual}" != "no"
then
@@ -299,7 +299,7 @@
fi
dnl
-@@ -3736,7 +3717,6 @@
+@@ -3809,7 +3791,6 @@
fi
if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
@@ -307,7 +307,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
-@@ -3745,7 +3725,6 @@
+@@ -3818,7 +3799,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)
@@ -315,9 +315,33 @@
VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
else
+Index: mozilla/vlc.r
+===================================================================
+--- mozilla/vlc.r (revision 10044)
++++ mozilla/vlc.r (working copy)
+@@ -9,8 +9,8 @@
+ resource 'STR#' (126)
+ {
+ {
+- "A VLC test plugin... hope it goes somewhere",
+- "VLC plugin"
++ "VLC Annodex viewer plugin",
++ "VLC Annodex viewer plugin"
+ };
+ };
+
+@@ -26,7 +26,7 @@
+ resource 'STR#' (128,"MIME Type")
+ {
+ {
+- "application/vlc-plugin", ""
++ "application/x-annodex-vlc-viewer-plugin", ""
+ };
+ };
+
Index: mozilla/npvlc_rc.rc
===================================================================
---- mozilla/npvlc_rc.rc (revision 9929)
+--- mozilla/npvlc_rc.rc (revision 10044)
+++ mozilla/npvlc_rc.rc (working copy)
@@ -31,17 +31,17 @@
BEGIN
@@ -347,7 +371,7 @@
BLOCK "VarFileInfo"
Index: mozilla/vlcplugin.h
===================================================================
---- mozilla/vlcplugin.h (revision 9929)
+--- mozilla/vlcplugin.h (revision 10044)
+++ mozilla/vlcplugin.h (working copy)
@@ -74,37 +74,13 @@
/*******************************************************************************
@@ -392,7 +416,7 @@
Index: mozilla/vlcshell.cpp
===================================================================
---- mozilla/vlcshell.cpp (revision 9929)
+--- mozilla/vlcshell.cpp (revision 10044)
+++ mozilla/vlcshell.cpp (working copy)
@@ -86,6 +86,7 @@
# define AOUT_PLUGINS "oss,dummy"
--
andre
More information about the cvs-annodex
mailing list