[Mplayerplug-in-cvs] mplayerplug-in ChangeLog,1.436,1.437 Makefile.in,1.28,1.29 configure,1.62,1.63
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-05-09 15:36:02
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3698 Modified Files: ChangeLog Makefile.in configure configure.in install.sh mplayerplug-in.spec Log Message: DivX Browser Plug-In emulation - requires new .so & .xpt files Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** configure 27 Apr 2006 23:40:06 -0000 1.62 --- configure 9 May 2006 15:35:52 -0000 1.63 *************** *** 868,871 **** --- 868,872 ---- --enable-rm Build with Real Media Support --enable-gmp Build with Google Media Support + --enable-dvx Build with DivX Media Support Optional Packages: *************** *** 3821,3824 **** --- 3822,3832 ---- gmp=yes fi; + # Check whether --enable-dvx or --disable-dvx was given. + if test "${enable_dvx+set}" = set; then + enableval="$enable_dvx" + if test "$enableval" = ""; then dvx=yes; else dvx=$enableval; fi + else + dvx=yes + fi; CREATE="mplayerplug-in" *************** *** 3835,3838 **** --- 3843,3849 ---- CREATE=" $CREATE mplayerplug-in-gmp" fi + if test x$dvx = xyes; then + CREATE=" $CREATE mplayerplug-in-dvx" + fi Index: mplayerplug-in.spec =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/mplayerplug-in.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** mplayerplug-in.spec 9 Apr 2006 19:40:33 -0000 1.40 --- mplayerplug-in.spec 9 May 2006 15:35:52 -0000 1.41 *************** *** 58,61 **** --- 58,62 ---- %{mozilla_dir}/plugins/mplayerplug-in-rm.so %{mozilla_dir}/plugins/mplayerplug-in-gmp.so + %{mozilla_dir}/plugins/mplayerplug-in-dvx.so %{mozilla_dir}/plugins/mplayerplug-in.xpt %{mozilla_dir}/plugins/mplayerplug-in-wmp.xpt *************** *** 63,66 **** --- 64,68 ---- %{mozilla_dir}/plugins/mplayerplug-in-rm.xpt %{mozilla_dir}/plugins/mplayerplug-in-gmp.xpt + %{mozilla_dir}/plugins/mplayerplug-in-dvx.xpt %config(noreplace) %{config_dir}/mplayerplug-in.conf %config(noreplace) %{config_dir}/mplayerplug-in.types Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v retrieving revision 1.436 retrieving revision 1.437 diff -C2 -d -r1.436 -r1.437 *** ChangeLog 5 May 2006 23:23:44 -0000 1.436 --- ChangeLog 9 May 2006 15:35:52 -0000 1.437 *************** *** 1,3 **** --- 1,4 ---- Development + ' Don't show buffering % in tracker when we are streaming as value doesn't mean anything Index: Makefile.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Makefile.in,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Makefile.in 27 Apr 2006 23:40:06 -0000 1.28 --- Makefile.in 9 May 2006 15:35:52 -0000 1.29 *************** *** 31,34 **** --- 31,37 ---- plugin-support.o plugin-setup-gmp.o plugin-list.o plugin-ui.o \ plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) + OBJ_DVX= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ + plugin-support.o plugin-setup-dvx.o plugin-list.o plugin-ui.o \ + plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) INSTALL = @INSTALL@ SHAREDTARGET=mplayerplug-in *************** *** 72,75 **** --- 75,82 ---- cp Source/nsIScriptableMplayerPlugin.xpt mplayerplug-in-gmp.xpt + $(SHAREDTARGET)-dvx: $(OBJ_DVX) + $(CXX) -shared -o $(SHAREDTARGET)-dvx.so $(OBJ_DVX) $(CFLAGS) $(LDFLAGS) + cp Source/nsIScriptableMplayerPlugin.xpt mplayerplug-in-dvx.xpt + np_entry.o: plugingate/np_entry.cpp $(CXX) -c -o $@ $(CFLAGS) plugingate/np_entry.cpp *************** *** 99,102 **** --- 106,112 ---- $(CXX) -c -o $@ $(CFLAGS) $(LIBS) -DGMP Source/plugin-setup.cpp + plugin-setup-dvx.o: Source/plugin-setup.cpp $(SCRIPTABLEHEADERS) + $(CXX) -c -o $@ $(CFLAGS) $(LIBS) -DDVX Source/plugin-setup.cpp + plugin-support.o: Source/plugin-support.cpp $(SCRIPTABLEHEADERS) $(CXX) -c -o $@ $(CFLAGS) $(LIBS) Source/plugin-support.cpp Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** configure.in 27 Apr 2006 23:40:06 -0000 1.62 --- configure.in 9 May 2006 15:35:52 -0000 1.63 *************** *** 113,116 **** --- 113,119 ---- AC_HELP_STRING([--enable-gmp], [Build with Google Media Support]), [if test "$enableval" = ""; then gmp=yes; else gmp=$enableval; fi],[gmp=yes]) + AC_ARG_ENABLE(dvx, + AC_HELP_STRING([--enable-dvx], [Build with DivX Media Support]), + [if test "$enableval" = ""; then dvx=yes; else dvx=$enableval; fi],[dvx=yes]) CREATE="mplayerplug-in" *************** *** 127,130 **** --- 130,136 ---- CREATE=" $CREATE mplayerplug-in-gmp" fi + if test x$dvx = xyes; then + CREATE=" $CREATE mplayerplug-in-dvx" + fi AC_SUBST(CREATE) Index: install.sh =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/install.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** install.sh 9 Apr 2006 13:58:20 -0000 1.18 --- install.sh 9 May 2006 15:35:52 -0000 1.19 *************** *** 15,19 **** $INSTALL -b -D -m0644 mplayerplug-in.conf ${DESTDIR}/etc/mplayerplug-in.conf $INSTALL -b -D -m0644 mplayerplug-in.types ${DESTDIR}/etc/mplayerplug-in.types ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp do $INSTALL -D -m0755 ${mod}.so ${DESTDIR}${libdir}/mozilla/plugins/${mod}.so --- 15,19 ---- $INSTALL -b -D -m0644 mplayerplug-in.conf ${DESTDIR}/etc/mplayerplug-in.conf $INSTALL -b -D -m0644 mplayerplug-in.types ${DESTDIR}/etc/mplayerplug-in.types ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp mplayerplug-in-dvx do $INSTALL -D -m0755 ${mod}.so ${DESTDIR}${libdir}/mozilla/plugins/${mod}.so *************** *** 27,31 **** echo "Installing for user `whoami`" ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp do $INSTALL -D -m0755 ${mod}.so ${HOME}/.mozilla/plugins/${mod}.so --- 27,31 ---- echo "Installing for user `whoami`" ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp mplayerplug-in-dvx do $INSTALL -D -m0755 ${mod}.so ${HOME}/.mozilla/plugins/${mod}.so *************** *** 48,52 **** echo "Installing into ${DEST}" if [ ! -d ${DEST} ]; then mkdir ${DEST}; fi ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp do $INSTALL -D -m0755 ${mod}.so ${DEST}/${mod}.so --- 48,52 ---- echo "Installing into ${DEST}" if [ ! -d ${DEST} ]; then mkdir ${DEST}; fi ! for mod in mplayerplug-in mplayerplug-in-wmp mplayerplug-in-qt mplayerplug-in-rm mplayerplug-in-gmp mplayerplug-in-dvx do $INSTALL -D -m0755 ${mod}.so ${DEST}/${mod}.so |