* ./configure.in: workaround Debian bug #150490 (bad mozilla-config output).

  * ./mozilla/vlcplugin.h: added .mov and .mp4 files to the plugin.
  * ./Makefile: we no longer try to merge .a files into libvlc.a, but rather
    add them to the vlc-config output.

diff --git a/Makefile b/Makefile
index 0da950464190fdddcd434f55039d5d7aef349664..0eeb38a2492a989f05136ba51486a7c8da85ec88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ PLUGINS_DIR :=        a52 \
                dvdread \
                dvdplay \
                esd \
-      familiar \
+               familiar \
                fb \
                ffmpeg \
                mp4 \
@@ -104,7 +104,7 @@ PLUGINS_TARGETS := a52/a52 \
                dvdread/dvdread \
                dvdplay/dvdplay \
                esd/esd \
-      familiar/familiar \
+               familiar/familiar \
                fb/fb \
                ffmpeg/ffmpeg \
                mp4/mp4 \
@@ -321,9 +321,9 @@ distclean: clean
 #
 # Install/uninstall rules
 #
-install: vlc-install plugins-install libvlc-install po-install mozilla-install
+install: vlc-install plugins-install builtins-install libvlc-install po-install mozilla-install
 
-uninstall: vlc-uninstall plugins-uninstall libvlc-install po-uninstall mozilla-uninstall
+uninstall: vlc-uninstall plugins-uninstall builtins-uninstall libvlc-uninstall po-uninstall mozilla-uninstall
 
 vlc-install:
        mkdir -p $(DESTDIR)$(bindir)
@@ -615,7 +615,7 @@ endif
 # Main application target
 #
 vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
+       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(LDFLAGS) $(vlc_LDFLAGS) $(BUILTIN_OBJ) $(builtins_LDFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@
@@ -628,20 +628,13 @@ endif
 #
 # Main library target
 #
-lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) $(BUILTIN_OBJ)
+lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
        rm -f $@
        ar rc $@ $(LIBVLC_OBJ)
-ifneq (,$(BUILTINS))
-       rm -Rf lib/tmp && mkdir -p lib/tmp
-       cd lib/tmp && for i in $(BUILTINS) ; do ar x ../../plugins/$$i.a ; done
-       ar rcs $@ lib/tmp/*
-       rm -Rf lib/tmp
-endif
        $(RANLIB) $@
 
 #lib/libvlc.so: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
 #      $(CC) -shared $(LIBVLC_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) -o $@
-#      chmod a-x $@
 
 #
 # Plugins target

diff --git a/configure b/configure
index 483cecb539395482a580ca00081806ae479308c2..209d95b82d943f6c801590de0358f0ac2ce513ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -9137,7 +9137,7 @@ fi
   then
     MOZILLA=1
     mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
-    mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs `"
+        mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`"
   fi
 fi
 
@@ -9193,7 +9193,7 @@ CFLAGS="${save_CFLAGS}"
 LDFLAGS="${save_LDFLAGS}"
 
 libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
-for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} @libdir@/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
+for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} ${libdir}/vlc/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
 
 
 

diff --git a/configure.in b/configure.in
index 918ae3aebf5410dfd60b0bbea10d7a17085e9e8a..42a75b26fa9e84c47eb236fdf5def9086ad85dde 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1772,7 +1772,8 @@ then
   then
     MOZILLA=1
     mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
-    mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs `"
+    dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
+    mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`"
   fi
 fi
 
@@ -1824,7 +1825,7 @@ dnl
 dnl  Create the vlc-config script
 dnl
 libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
-for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} @libdir@/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
+for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} ${libdir}/vlc/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
 AC_SUBST(libvlc_LDFLAGS)
 
 dnl 

diff --git a/debian/rules b/debian/rules
index e6b5d0b297939fa3a22112579400d2ec45e400f6..3313b95224a3c95f0cc3aa6cc518130dabd5df9d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 export DH_COMPAT=3
 
 # Compilation options
-export FFMPEG_VERSION=20020707
+export FFMPEG_VERSION=cvs
 export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-ffmpeg --with-ffmpeg-tree=ffmpeg-$(FFMPEG_VERSION) --enable-mp4"
 # Remove --without-dvdcss here in non-totalitarian countries
 export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"
@@ -80,7 +80,7 @@ install: build
        # install development files
        mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
        mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
-#      mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/vlc/
+       mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/vlc/
        mv debian/vlc/usr/include/vlc/* debian/libvlc0-dev/usr/include/vlc/
        ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
 

diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index 04859a440b0621de613d600dfaa9db3bb27b3a3c..a2280f33822b3760758540a71f03be655fa74262 100644 (file)
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -2,7 +2,7 @@
  * videolan.c: a VideoLAN plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.h,v 1.1 2002/07/04 18:11:57 sam Exp $
+ * $Id: vlcplugin.h,v 1.2 2002/07/23 20:12:55 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -46,19 +46,29 @@ typedef struct _PluginInstance
  * Plugin properties.
  ******************************************************************************/
 #define PLUGIN_NAME         "VideoLAN Client Plug-in"
-#define PLUGIN_DESCRIPTION  "VideoLAN Client (VLC) Multimedia Player Plug-in"
+#define PLUGIN_DESCRIPTION \
+    "VideoLAN Client Multimedia Player Plugin <br>" \
+    " <br>" \
+    COPYRIGHT_MESSAGE " <br>" \
+    "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
 
 #define PLUGIN_MIMETYPES \
-    /* MPEG audio */ \
-    "audio/mpeg:mp2,mp3:MPEG audio;" \
-    "audio/x-mpeg:mp2,mp3:MPEG audio;" \
-    /* MPEG video */ \
-    "video/mpeg:mpg,mpeg:MPEG video;" \
-    "video/x-mpeg:mpg,mpeg:MPEG video;" \
-    "video/mpeg-system:mpg,mpeg:MPEG video;" \
-    "video/x-mpeg-system:mpg,mpeg:MPEG video;" \
-    /* AVI video */ \
+    /* 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;" \
     /* explicit plugin call */ \
     "application/x-vlc-plugin::VLC plugin"