[MPlayer-cvslog] r37272 - in trunk: Changelog configure gui/dialog/about.c gui/dialog/dialog.c gui/dialog/preferences.c help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help...
ib
subversion at mplayerhq.hu
Mon Sep 8 22:17:02 CEST 2014
Author: ib
Date: Mon Sep 8 22:17:01 2014
New Revision: 37272
Log:
Remove GTK+ and GLib versions 1 relatedness from the GUI.
This isn't really a cut-back, because although it seemed
that compiling with GTK+ and GLib versions 1 were possible,
compiling actually hadn't been possible for quite some time.
Modified:
trunk/Changelog
trunk/configure
trunk/gui/dialog/about.c
trunk/gui/dialog/dialog.c
trunk/gui/dialog/preferences.c
Changes in other areas also in this revision:
Modified:
trunk/help/help_mp-cs.h
trunk/help/help_mp-de.h
trunk/help/help_mp-en.h
trunk/help/help_mp-es.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-hu.h
trunk/help/help_mp-it.h
trunk/help/help_mp-pl.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-sk.h
trunk/help/help_mp-tr.h
trunk/help/help_mp-uk.h
trunk/help/help_mp-zh_CN.h
trunk/help/help_mp-zh_TW.h
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Mon Sep 8 01:25:33 2014 (r37271)
+++ trunk/Changelog Mon Sep 8 22:17:01 2014 (r37272)
@@ -24,6 +24,8 @@ MPlayer
* Danish messages header file renamed from help_mp-dk.h to help_mp-da.h
in order to comply with ISO 639 language code (configure language
options will now require da instead of dk)
+ * configure: options --enable-gtk1, --with-glib-config= and
+ --with-gtk-config= removed
Ports:
* Windows: support file names as UTF-8 in slave mode and passing
@@ -48,6 +50,8 @@ MPlayer
slim, softgrip, standard, trium, tvisor, xanim)
* Video can be rotated
* New GUI message: evSetRotation
+ * GUI now officially needs GTK+ and GLib versions 2 (it hadn't compiled
+ with versions 1 for quite some time)
1.1: "We gave up on 1.0"
Modified: trunk/configure
==============================================================================
--- trunk/configure Mon Sep 8 01:25:33 2014 (r37271)
+++ trunk/configure Mon Sep 8 22:17:01 2014 (r37272)
@@ -328,7 +328,6 @@ Optional features:
--disable-mencoder disable MEncoder (A/V encoder) compilation [enable]
--disable-mplayer disable MPlayer compilation [enable]
--enable-gui enable GMPlayer compilation (GTK+ GUI) [disable]
- --enable-gtk1 force using GTK+ 1.2 for the GUI [disable]
--enable-termcap use termcap database for key codes [autodetect]
--enable-termios use termios database for key codes [autodetect]
--disable-iconv disable iconv for encoding conversion [autodetect]
@@ -604,8 +603,6 @@ Use these options if autodetection fails
--with-xvmclib=NAME adapter-specific library name (e.g. XvMCNVIDIA)
--with-freetype-config=PATH path to freetype-config
- --with-glib-config=PATH path to glib*-config
- --with-gtk-config=PATH path to gtk*-config
--with-sdl-config=PATH path to sdl*-config
--with-dvdnav-config=PATH path to dvdnav-config, also disables internal dvdread and dvdnav
--with-dvdread-config=PATH path to dvdread-config, also disables internal dvdread and dvdnav
@@ -809,7 +806,6 @@ _lircc=auto
_apple_remote=auto
_apple_ir=auto
_gui=no
-_gtk1=no
_termcap=auto
_termios=auto
_3dfx=no
@@ -919,12 +915,6 @@ for ac_option do
--with-freetype-config=*)
_freetypeconfig=$(option_value $ac_option)
;;
- --with-gtk-config=*)
- _gtkconfig=$(option_value $ac_option)
- ;;
- --with-glib-config=*)
- _glibconfig=$(option_value $ac_option)
- ;;
--with-dvdnav-config=*)
_dvdnavconfig=$(option_value $ac_option)
_dvdread_internal=no
@@ -1299,8 +1289,6 @@ for ac_option do
--disable-apple-ir) _apple_ir=no ;;
--enable-gui) _gui=yes ;;
--disable-gui) _gui=no ;;
- --enable-gtk1) _gtk1=yes ;;
- --disable-gtk1) _gtk1=no ;;
--enable-termcap) _termcap=yes ;;
--disable-termcap) _termcap=no ;;
--enable-termios) _termios=yes ;;
@@ -7885,7 +7873,6 @@ EOF
echores "$_xshape"
# Check for GTK2
- if test "$_gtk1" = no ; then
echocheck "GTK+ version"
if $_pkg_config gtk+-2.0 --exists ; then
@@ -7902,64 +7889,21 @@ EOF
echores "$_glib"
def_gui='#define CONFIG_GUI 1'
- def_gtk2='#define CONFIG_GTK2 1'
else
- _gtk1=yes
- echores "GLib 2 devel packages were not found, trying GTK+ 1.2"
+ die "GLib 2 devel packages were not found."
fi
else
- _gtk1=yes
- echores "GTK+ 2 devel packages were not found, trying GTK+ 1.2"
- fi
- fi
-
- # Check for (old) GTK1
- if test "$_gtk1" = yes ; then
- 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+ devel packages (which were not found)."
- fi
- fi
- _gtk=$($_gtkconfig --version 2>&1)
- extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
- libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
- echores "$_gtk (using $_gtkconfig)"
-
- # Check for (old) GLIB1
- 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 devel packages (which were not found)"
- fi
+ die "GTK+ 2 devel packages were not found."
fi
- _glib=$($_glibconfig --version 2>&1)
- libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
- echores "$_glib (using $_glibconfig)"
-
- def_gui='#define CONFIG_GUI 1'
- def_gtk2='#undef CONFIG_GTK2'
- fi
else #if ! win32
_gui_win32=yes
libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
def_gui='#define CONFIG_GUI 1'
- def_gtk2='#undef CONFIG_GTK2'
fi #if ! win32
else #if test "$_gui"
def_gui='#undef CONFIG_GUI'
- def_gtk2='#undef CONFIG_GTK2'
fi #if test "$_gui"
# --------------- GUI specific tests end -------------------
@@ -8996,7 +8940,6 @@ $def_xmms
/* GUI */
$def_gui
-$def_gtk2
$def_xshape
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Mon Sep 8 01:25:33 2014 (r37271)
+++ trunk/gui/dialog/about.c Mon Sep 8 22:17:01 2014 (r37272)
@@ -47,10 +47,8 @@ static GtkWidget * CreateAbout( void )
GtkWidget * AboutText;
GtkWidget * Ok;
-#ifdef CONFIG_GTK2
GtkTextBuffer * AboutTextBuffer;
GtkTextIter iter;
-#endif /* CONFIG_GTK2 */
GtkStyle * pixmapstyle;
GdkPixmap * pixmapwid;
@@ -89,26 +87,16 @@ static GtkWidget * CreateAbout( void )
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 );
-#ifdef CONFIG_GTK2
AboutText = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE);
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE);
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 );
- gtk_text_set_editable(GTK_TEXT(AboutText), FALSE);
-#endif
gtk_widget_show( AboutText );
gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
snprintf(title, sizeof(title), MP_TITLE, MPlayer);
-#ifdef CONFIG_GTK2
gtk_text_buffer_insert (AboutTextBuffer, &iter, title, -1);
gtk_text_buffer_insert (AboutTextBuffer, &iter,
-#else
- gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, title, -1 );
- gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-#endif
"\n"
MSGTR_GUI_Sponsored":\n"
" http://www.uhulinux.hu/\n"
Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c Mon Sep 8 01:25:33 2014 (r37271)
+++ trunk/gui/dialog/dialog.c Mon Sep 8 22:17:01 2014 (r37272)
@@ -113,9 +113,7 @@ void gtkInit(char *display_name)
{
int argc = 0;
char *arg[3], **argv = arg;
-#ifdef CONFIG_GTK2
char *env;
-#endif
GtkIconTheme *theme;
GdkPixmap *gdkIcon;
GdkBitmap *gdkIconMask;
@@ -129,14 +127,12 @@ void gtkInit(char *display_name)
arg[argc++] = display_name; // to open the requested display for the GUI, too.
}
-#ifdef CONFIG_GTK2
gtk_disable_setlocale();
env = getenv("G_FILENAME_ENCODING");
if ((!env && getenv("G_BROKEN_FILENAMES")) || (gstrncmp(env, "@locale", 7) == 0))
mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_LocaleEncoding);
-#endif
gtk_init(&argc, &argv);
wsSetErrorHandler(); // GDK has just set its own handler
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Mon Sep 8 01:25:33 2014 (r37271)
+++ trunk/gui/dialog/preferences.c Mon Sep 8 22:17:01 2014 (r37272)
@@ -551,10 +551,6 @@ static void prCListRow( GtkCList * clist
!strncmp( ao_driver[0],"esd",3 ) ||
!strncmp( ao_driver[0],"sdl",3 ) )
gtk_widget_set_sensitive( AConfig,TRUE );
-#ifndef CONFIG_GTK2
- if ( !strncmp( ao_driver[0],"arts",4 ) )
- gtkMessageBox(MSGBOX_WARNING, MSGTR_GUI_MSG_aRtsBroken);
-#endif
break;
case 1: // video driver
gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver );
More information about the MPlayer-cvslog
mailing list