mplayerplug-in for mozilla

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260/Source

Modified Files:
	plugin-ui.cpp 
Log Message:
Allow compile with GTK2 2.0 (config dialog is limited)

Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** plugin-ui.cpp	5 Dec 2005 20:19:42 -0000	1.179
--- plugin-ui.cpp	6 Dec 2005 18:41:38 -0000	1.180
***************
*** 1954,1957 ****
--- 1954,1958 ----
  	(int) gtk_range_get_value(GTK_RANGE(instance->conf_cachepercent));
  
+ #ifdef GTK24_ENABLED
      if (instance->vo != NULL)
  	free(instance->vo);
***************
*** 1971,1975 ****
  	strdup(gtk_entry_get_text
  	       (GTK_ENTRY(GTK_BIN(instance->conf_dir)->child)));
! 
      instance->showtime =
  	gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
--- 1972,1977 ----
  	strdup(gtk_entry_get_text
  	       (GTK_ENTRY(GTK_BIN(instance->conf_dir)->child)));
! #endif
!     
      instance->showtime =
  	gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
***************
*** 2179,2182 ****
--- 2181,2185 ----
  		     GTK_SIGNAL_FUNC(CloseConfigEvent), instance);
  
+ #ifdef GTK24_ENABLED
      instance->conf_vo = gtk_combo_box_entry_new_text();
      if (instance->conf_vo != NULL) {
***************
*** 2253,2256 ****
--- 2256,2260 ----
  	}
      }
+ #endif
  
      conf_ok = gtk_button_new_with_label(_("OK"));
***************
*** 2262,2265 ****
--- 2266,2270 ----
  		     GTK_SIGNAL_FUNC(CloseConfig), instance);
  
+ #ifdef GTK24_ENABLED
      conf_label = gtk_label_new(_("Video Output:"));
      gtk_misc_set_alignment(GTK_MISC(conf_label), 0.0, 0.0);
***************
*** 2269,2272 ****
--- 2274,2278 ----
      gtk_table_attach_defaults(GTK_TABLE(conf_table), instance->conf_vo, 1,
  			      2, 0, 1);
+ 
      conf_label = gtk_label_new(_("Audio Output:"));
      gtk_misc_set_alignment(GTK_MISC(conf_label), 0.0, 0.0);
***************
*** 2284,2288 ****
      gtk_table_attach_defaults(GTK_TABLE(conf_table), instance->conf_dir, 1,
  			      2, 2, 3);
! 
  
      conf_label = gtk_label_new(_("Minimum Cache Size:"));
--- 2290,2294 ----
      gtk_table_attach_defaults(GTK_TABLE(conf_table), instance->conf_dir, 1,
  			      2, 2, 3);
! #endif
  
      conf_label = gtk_label_new(_("Minimum Cache Size:"));
***************
*** 2450,2454 ****
      gtk_container_add(GTK_CONTAINER(conf_hbutton_box), conf_cancel);
  
! 
      if (instance->conf_vo != NULL)
  	gtk_widget_show(instance->conf_vo);
--- 2456,2460 ----
      gtk_container_add(GTK_CONTAINER(conf_hbutton_box), conf_cancel);
  
! #ifdef GTK24_ENABLED
      if (instance->conf_vo != NULL)
  	gtk_widget_show(instance->conf_vo);
***************
*** 2457,2461 ****
      if (instance->conf_dir != NULL)
  	gtk_widget_show(instance->conf_dir);
! 
      gtk_widget_show(conf_ok);
      gtk_widget_show(conf_cancel);
--- 2463,2467 ----
      if (instance->conf_dir != NULL)
  	gtk_widget_show(instance->conf_dir);
! #endif
      gtk_widget_show(conf_ok);
      gtk_widget_show(conf_cancel);

Update of /cvsroot/mplayerplug-in/mplayerplug-in
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260

Modified Files:
	ChangeLog config.h.in configure configure.in 
Log Message:
Allow compile with GTK2 2.0 (config dialog is limited)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -C2 -d -r1.361 -r1.362
*** ChangeLog	6 Dec 2005 16:08:47 -0000	1.361
--- ChangeLog	6 Dec 2005 18:41:38 -0000	1.362
***************
*** 1,3 ****
--- 1,4 ----
  Development
+ 	Allow compile with GTK2 2.0 (config dialog is limited)
  	Compile and mark memmem,strlcat and strlcpy as C functions
  	Enforce that GTK2 >= 2.4.0

Index: config.h.in
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/config.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config.h.in	15 Feb 2005 22:28:35 -0000	1.9
--- config.h.in	6 Dec 2005 18:41:38 -0000	1.10
***************
*** 173,176 ****
  #undef GTK2_ENABLED
  
! /* Define to 1 if you have GTK2 */
  #undef GTK1_ENABLED
--- 173,179 ----
  #undef GTK2_ENABLED
  
! /* Define to 1 if you have GTK2 2.4+ */
! #undef GTK24_ENABLED
! 
! /* Define to 1 if you have GTK1 */
  #undef GTK1_ENABLED

Index: configure
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configure	6 Dec 2005 15:49:23 -0000	1.54
--- configure	6 Dec 2005 18:41:38 -0000	1.55
***************
*** 3235,3238 ****
--- 3235,3339 ----
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
+ echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
+ 
+         if $PKG_CONFIG --exists "gtk+-2.0" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
+ echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
+             GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
+             echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
+ echo "${ECHO_T}$GTK_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking GTK_LIBS" >&5
+ echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
+             GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
+             echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
+ echo "${ECHO_T}$GTK_LIBS" >&6
+         else
+             GTK_CFLAGS=""
+             GTK_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+             GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
+ 
+         fi
+ 
+ 
+ 
+      else
+         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+         echo "*** See http://www.freedesktop.org/software/pkgconfig"
+      fi
+   fi
+ 
+   if test $succeeded = yes; then
+      GTK_DEFINES="-DGTK_ENABLED"
+ cat >>confdefs.h <<\_ACEOF
+ #define GTK2_ENABLED 1
+ _ACEOF
+ 
+   else
+      { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5
+ echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;}
+   fi
+ 
+ 
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   case $PKG_CONFIG in
+   [\\/]* | ?:[\\/]*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+   echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4.0" >&5
  echo $ECHO_N "checking for gtk+-2.0 >= 2.4.0... $ECHO_C" >&6
***************
*** 3274,3278 ****
       GTK_DEFINES="-DGTK_ENABLED"
  cat >>confdefs.h <<\_ACEOF
! #define GTK2_ENABLED 1
  _ACEOF
  
--- 3375,3379 ----
       GTK_DEFINES="-DGTK_ENABLED"
  cat >>confdefs.h <<\_ACEOF
! #define GTK24_ENABLED 1
  _ACEOF
  

Index: configure.in
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configure.in	6 Dec 2005 15:49:23 -0000	1.54
--- configure.in	6 Dec 2005 18:41:38 -0000	1.55
***************
*** 83,87 ****
  
  if test $use_gtk2 = yes; then
!   PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.4.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])])
    PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])])
  fi
--- 83,88 ----
  
  if test $use_gtk2 = yes; then
!   PKG_CHECK_MODULES(GTK,[gtk+-2.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])])
!   PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.4.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK24_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])])
    PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])])
  fi

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28208/Source

Modified Files:
	plugin-setup.h 
Log Message:
Compile and mark memmem,strlcat and strlcpy as C functions

Index: plugin-setup.h
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** plugin-setup.h	26 Oct 2005 14:07:47 -0000	1.51
--- plugin-setup.h	6 Dec 2005 16:08:47 -0000	1.52
***************
*** 37,41 ****
  #endif
  
- 
  #define STATE_RESET 0
  #define STATE_NEW 1
--- 37,40 ----
***************
*** 146,159 ****
  // function defintions, grouped by source file
  #ifndef HAVE_MEMMEM
! extern void *memmem(const void *haystack, const size_t haystack_len,
  		    const void *needle, const size_t needle_len);
  #endif
  
  #ifndef HAVE_STRLCPY
! extern size_t strlcpy(char *dst, const char *src, size_t siz);
  #endif
  
  #ifndef HAVE_STRLCAT
! extern size_t strlcat(char *dst, const char *src, size_t siz);
  #endif
  
--- 145,158 ----
  // function defintions, grouped by source file
  #ifndef HAVE_MEMMEM
! extern "C" void *memmem(const void *haystack, const size_t haystack_len,
  		    const void *needle, const size_t needle_len);
  #endif
  
  #ifndef HAVE_STRLCPY
! extern "C" size_t strlcpy(char *dst, const char *src, size_t siz);
  #endif
  
  #ifndef HAVE_STRLCAT
! extern "C" size_t strlcat(char *dst, const char *src, size_t siz);
  #endif

Update of /cvsroot/mplayerplug-in/mplayerplug-in
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28208

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Compile and mark memmem,strlcat and strlcpy as C functions

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Makefile.in	21 Jul 2005 15:26:02 -0000	1.26
--- Makefile.in	6 Dec 2005 16:08:47 -0000	1.27
***************
*** 115,125 ****
  
  memmem.o: extras/memmem.c $(HEADERS)
! 	$(CXX) -c -o $@ $(CFLAGS) extras/memmem.c
  
  strlcat.o: extras/strlcat.c $(HEADERS)
! 	$(CXX) -c -o $@ $(CFLAGS) extras/strlcat.c
  
  strlcpy.o: extras/strlcpy.c $(HEADERS)
! 	$(CXX) -c -o $@ $(CFLAGS) extras/strlcpy.c
  
  clean:
--- 115,125 ----
  
  memmem.o: extras/memmem.c $(HEADERS)
! 	$(CC) -c -o $@ $(CFLAGS) extras/memmem.c
  
  strlcat.o: extras/strlcat.c $(HEADERS)
! 	$(CC) -c -o $@ $(CFLAGS) extras/strlcat.c
  
  strlcpy.o: extras/strlcpy.c $(HEADERS)
! 	$(CC) -c -o $@ $(CFLAGS) extras/strlcpy.c
  
  clean:
***************
*** 134,136 ****
  uninstall:
  	./uninstall.sh
- 
--- 134,135 ----

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.361
diff -C2 -d -r1.360 -r1.361
*** ChangeLog	6 Dec 2005 15:49:23 -0000	1.360
--- ChangeLog	6 Dec 2005 16:08:47 -0000	1.361
***************
*** 1,3 ****
--- 1,4 ----
  Development
+ 	Compile and mark memmem,strlcat and strlcpy as C functions
  	Enforce that GTK2 >= 2.4.0
  	Fix to allow src and href media to be the same url

Update of /cvsroot/mplayerplug-in/mplayerplug-in
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24411

Modified Files:
	ChangeLog configure configure.in 
Log Message:
Enforce that GTK2 >= 2.4.0

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -C2 -d -r1.359 -r1.360
*** ChangeLog	5 Dec 2005 20:19:42 -0000	1.359
--- ChangeLog	6 Dec 2005 15:49:23 -0000	1.360
***************
*** 1,3 ****
--- 1,4 ----
  Development
+ 	Enforce that GTK2 >= 2.4.0
  	Fix to allow src and href media to be the same url
  	Fix fgetc crash by using a lock and changing to fread

Index: configure
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure	28 Nov 2005 20:34:56 -0000	1.53
--- configure	6 Dec 2005 15:49:23 -0000	1.54
***************
*** 3235,3242 ****
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
!         echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
! echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
  
!         if $PKG_CONFIG --exists "gtk+-2.0" ; then
              echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
--- 3235,3242 ----
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
!         echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4.0" >&5
! echo $ECHO_N "checking for gtk+-2.0 >= 2.4.0... $ECHO_C" >&6
  
!         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4.0" ; then
              echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
***************
*** 3245,3249 ****
              echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
  echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
!             GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
              echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
  echo "${ECHO_T}$GTK_CFLAGS" >&6
--- 3245,3249 ----
              echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
  echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
!             GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0"`
              echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
  echo "${ECHO_T}$GTK_CFLAGS" >&6
***************
*** 3251,3255 ****
              echo "$as_me:$LINENO: checking GTK_LIBS" >&5
  echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
!             GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
              echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
  echo "${ECHO_T}$GTK_LIBS" >&6
--- 3251,3255 ----
              echo "$as_me:$LINENO: checking GTK_LIBS" >&5
  echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
!             GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0"`
              echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
  echo "${ECHO_T}$GTK_LIBS" >&6
***************
*** 3259,3263 ****
              ## If we have a custom action on failure, don't print errors, but
              ## do set a variable so people can do so.
!             GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
  
          fi
--- 3259,3263 ----
              ## If we have a custom action on failure, don't print errors, but
              ## do set a variable so people can do so.
!             GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"`
  
          fi

Index: configure.in
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure.in	28 Nov 2005 20:34:56 -0000	1.53
--- configure.in	6 Dec 2005 15:49:23 -0000	1.54
***************
*** 83,87 ****
  
  if test $use_gtk2 = yes; then
!   PKG_CHECK_MODULES(GTK,[gtk+-2.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])])
    PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])])
  fi
--- 83,87 ----
  
  if test $use_gtk2 = yes; then
!   PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.4.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])])
    PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])])
  fi