[patch] New (working) gtk2-patch, place in the files directory

mplayer-0.90_rc4-gtk2.patch (text/plain), 6.01 KB, created by jINKs on 2003-02-10 18:59:05 UTC

diff -Naur Gui/mplayer/gtk/about.c Gui/mplayer/gtk/about.c
--- Gui/mplayer/gtk/about.c	2002-11-28 11:24:57.000000000 +0200
+++ Gui/mplayer/gtk/about.c	2002-12-10 19:04:01.000000000 +0200
@@ -28,6 +28,11 @@
   GtkWidget     * AboutText;
   GtkWidget     * Ok;
 
+#ifdef HAVE_GTK2_GUI
+  GtkTextBuffer * AboutTextBuffer;
+  GtkTextIter   iter;
+#endif //HAVE_GTK2_GUI
+
   GtkStyle      * pixmapstyle;
   GdkPixmap     * pixmapwid;
   GdkBitmap     * mask;
@@ -67,12 +72,25 @@
   gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 );
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
 
-  AboutText=gtk_text_new( NULL,NULL );
+#ifdef HAVE_GTK2_GUI
+  AboutText = gtk_text_view_new();
+  AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
+  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);  
+#else  
+  AboutText = gtk_text_new( NULL,NULL );
+#endif //HAVE_GTK2_GUI
+     
   gtk_widget_set_name( AboutText,"AboutText" );
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
+
+#ifdef HAVE_GTK2_GUI  
+  gtk_text_buffer_insert (AboutTextBuffer, &iter,   
+#else 
   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-  	"\n" 
+#endif //HAVE_GTK2_GUI  
+       
+       "\n" 
 	MSGTR_ABOUT_UHU 
 	"             (http://www.uhulinux.hu/)\n" 
 	"\n" 
@@ -150,7 +168,13 @@
 	"     * Attila Kinali\n" 
 	"     * Dirk Vornheder\n" 
 	"     * Bohdan Horst (Nexus)\n" 
-	"\n",-1 );
+	"\n",
+
+#ifdef HAVE_GTK2_GUI  
+	-1);
+#else
+	-1);
+#endif //HAVE_GTK2_GUI
 
   AddHSeparator( vbox );
   Ok=AddButton( MSGTR_Ok,AddHButtonBox( vbox ) );
diff -Naur configure configure
--- configure	2002-12-09 14:44:30.000000000 +0200
+++ configure	2002-12-10 19:06:50.000000000 +0200
@@ -130,6 +130,7 @@
 Optional features:
   --disable-mencoder     disable mencoder (a/v encoder) compilation [enable]
   --enable-gui           enable gmplayer compilation (gtk-1.2 GUI) [disable]
+  --enable-gtk2          enable gtk2 port of the gui [disable]
   --enable-largefiles    enable support for files > 2 GBytes [disable]
   --enable-linux-devfs   set default devices to devfs ones [disable]
   --enable-termcap       use termcap database for key codes [autodetect]
@@ -1007,6 +1008,7 @@
 _opendivx=no
 _lirc=auto
 _gui=no
+_gtk2=no
 _termcap=auto
 _termios=auto
 _3dfx=no
@@ -1174,6 +1176,8 @@
   --disable-lirc)	_lirc=no	;;
   --enable-gui)		_gui=yes	;;
   --disable-gui)	_gui=no		;;
+  --enable-gtk2)	_gtk2=yes	;;
+  --disable-gtk2)	_gtk2=no	;;
   --enable-termcap)	_termcap=yes	;;
   --disable-termcap)	_termcap=no	;;
   --enable-termios)	_termios=yes    ;;
@@ -4386,42 +4390,70 @@
   fi
   echores "$_xshape"
 
+  # Check for new GTK (2.x.x)
+  if test "$_gtk2" = yes ; then 
+  
+    # Check for GTK:
+    echocheck "GTK+ version"
 
-  # Check for GTK:
-  echocheck "gtk version"
-  if test -z "$_gtkconfig" ; then
-    if ( gtk-config --version ) >/dev/null 2>&1 ; then
-      _gtkconfig="gtk-config"
-    elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
-      _gtkconfig="gtk12-config"
-    else
-      die "the GUI requires GTK (which was not found)"
+    _gtk=`pkg-config gtk+-2.0 --modversion 2>&1`
+    _inc_gtk=`pkg-config gtk+-2.0 --cflags 2>&1`
+    _ld_gtk=`pkg-config gtk+-2.0 --libs 2>&1`
+    echores "$_gtk"
+  
+    # Check for GLIB
+    echocheck "glib version"
+    _glib=`pkg-config glib-2.0 --modversion 2>&1`
+    _inc_glib=`pkg-config glib-2.0 --cflags 2>&1`
+    _ld_glib=`pkg-config glib-2.0 --libs 2>&1`
+    echores "$_glib"
+
+    _def_gui='#define HAVE_NEW_GUI 1'
+    _def_gtk2_gui='#define HAVE_GTK2_GUI 1'
+    _ld_gui='$(GTKLIB) $(GLIBLIB)'
+
+  # Check for "old" GTK (1.2.x)
+  else 
+  
+    # Check for GTK:
+    echocheck "GTK+ version"
+    if test -z "$_gtkconfig" ; then
+      if ( gtk-config --version ) >/dev/null 2>&1 ; then
+        _gtkconfig="gtk-config"
+      elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
+        _gtkconfig="gtk12-config"
+      else
+        die "the GUI requires GTK+ (which was not found)"
+      fi
     fi
-  fi
-  _gtk=`$_gtkconfig --version 2>&1`
-  _inc_gtk=`$_gtkconfig --cflags 2>&1`
-  _ld_gtk=`$_gtkconfig --libs 2>&1`
-  echores "$_gtk (using $_gtkconfig)"
-
-  # Check for GLIB
-  echocheck "glib version"
-  if test -z "$_glibconfig" ; then
-    if ( glib-config --version ) >/dev/null 2>&1 ; then
-      _glibconfig="glib-config"
-    elif ( glib12-config --version ) >/dev/null 2>&1 ; then
-      _glibconfig="glib12-config"
-    else
-      die "the GUI requires GLIB (which was not found)"
+    _gtk=`$_gtkconfig --version 2>&1`
+    _inc_gtk=`$_gtkconfig --cflags 2>&1`
+    _ld_gtk=`$_gtkconfig --libs 2>&1`
+    echores "$_gtk (using $_gtkconfig)"
+  
+    # Check for GLIB
+    echocheck "glib version"
+    if test -z "$_glibconfig" ; then
+      if ( glib-config --version ) >/dev/null 2>&1 ; then
+        _glibconfig="glib-config"
+      elif ( glib12-config --version ) >/dev/null 2>&1 ; then
+        _glibconfig="glib12-config"
+      else
+        die "the GUI requires GLIB (which was not found)"
+      fi
     fi
-  fi
-  _glib=`$_glibconfig --version 2>&1`
-  _inc_glib=`$_glibconfig --cflags 2>&1`
-  _ld_glib=`$_glibconfig --libs 2>&1`
-  echores "$_glib (using $_glibconfig)"
-
-  _def_gui='#define HAVE_NEW_GUI 1'
-  _ld_gui='$(GTKLIB) $(GLIBLIB)'
 
+    _glib=`$_glibconfig --version 2>&1`
+    _inc_glib=`$_glibconfig --cflags 2>&1`
+    _ld_glib=`$_glibconfig --libs 2>&1`
+    echores "$_glib (using $_glibconfig)"
+
+    _def_gui='#define HAVE_NEW_GUI 1'
+    _def_gtk2_gui='#undef HAVE_GTK2_GUI'
+    _ld_gui='$(GTKLIB) $(GLIBLIB)'
+  
+  fi
+  
   echo "Creating Gui/config.mak"
   cat > Gui/config.mak << EOF
 # -------- Generated by configure -----------
@@ -4435,6 +4467,7 @@
 
 else
   _def_gui='#undef HAVE_NEW_GUI'
+  _def_gtk2_gui='#undef HAVE_GTK2_GUI'
 fi
 # --------------- GUI specific tests end -------------------
 
@@ -4962,6 +4995,7 @@
 
 /* gui support, please do not edit this option */
 $_def_gui
+$_def_gtk2_gui
 
 /* Audio output drivers */
 $_def_ossaudio