]>
Commit | Line | Data |
---|---|---|
08636e41 AG |
1 | diff -burN MPlayer-1.0pre3.orig/configure MPlayer-1.0pre3/configure |
2 | --- MPlayer-1.0pre3.orig/configure 2004-01-02 15:29:02.000000000 +0100 | |
3 | +++ MPlayer-1.0pre3/configure 2004-01-02 15:45:49.000000000 +0100 | |
4 | @@ -314,8 +314,7 @@ | |
963cfe38 | 5 | (e.g. /opt/bin/freetype-config) |
6 | --with-fribidi-config=PATH path to fribidi-config | |
7 | (e.g. /opt/bin/fribidi-config) | |
501dd69d | 8 | - --with-glib-config=PATH path to glib*-config (e.g. /opt/bin/glib-config) |
963cfe38 | 9 | - --with-gtk-config=PATH path to gtk*-config (e.g. /opt/bin/gtk-config) |
501dd69d | 10 | + --with-pkg-config=PATH path to pkg-config (e.g. /opt/bin/pkg-config) |
963cfe38 | 11 | --with-sdl-config=PATH path to sdl*-config (e.g. /opt/bin/sdl-config) |
12 | EOF | |
13 | exit 0 | |
08636e41 | 14 | @@ -1542,11 +1541,8 @@ |
501dd69d | 15 | --with-fribidi-config=*) |
16 | _fribidiconfig=`echo $ac_option | cut -d '=' -f 2` | |
17 | ;; | |
18 | - --with-gtk-config=*) | |
19 | - _gtkconfig=`echo $ac_option | cut -d '=' -f 2` | |
20 | - ;; | |
21 | - --with-glib-config=*) | |
22 | - _glibconfig=`echo $ac_option | cut -d '=' -f 2` | |
23 | + --with-pkg-config=*) | |
24 | + _pkgconfig=`echo $ac_option | cut -d '=' -f 2` | |
25 | ;; | |
26 | # dvdnav disabled, it does not work | |
27 | # --with-dvdnav-config=*) | |
08636e41 | 28 | @@ -5538,37 +5534,38 @@ |
501dd69d | 29 | echores "$_xshape" |
30 | ||
08636e41 | 31 | |
501dd69d | 32 | - # Check for GTK: |
963cfe38 | 33 | - echocheck "GTK version" |
501dd69d | 34 | - if test -z "$_gtkconfig" ; then |
35 | - if ( gtk-config --version ) >/dev/null 2>&1 ; then | |
36 | - _gtkconfig="gtk-config" | |
37 | - elif ( gtk12-config --version ) >/dev/null 2>&1 ; then | |
38 | - _gtkconfig="gtk12-config" | |
08636e41 AG |
39 | - else |
40 | - die "The GUI requires GTK devel packages (which were not found)." | |
501dd69d | 41 | + # Check for pkg-config |
42 | + echocheck "pkg-config" | |
08636e41 AG |
43 | + if test -z "$_pkgconfig"; then |
44 | + if ( pkg-config --version ) > /dev/null 2>&1; then | |
501dd69d | 45 | + _pkgconfig="pkg-config" |
08636e41 AG |
46 | + else |
47 | + die "The GUI requires pkg-config (which was not found)." | |
501dd69d | 48 | fi |
49 | fi | |
50 | - _gtk=`$_gtkconfig --version 2>&1` | |
51 | - _inc_gtk=`$_gtkconfig --cflags 2>&1` | |
52 | - _ld_gtk=`$_gtkconfig --libs 2>&1` | |
53 | - echores "$_gtk (using $_gtkconfig)" | |
08636e41 AG |
54 | + |
55 | + # Check for GTK | |
56 | + if ( $_pkgconfig --modversion gtk+-2.0 ) > /dev/null 2>&1; then | |
501dd69d | 57 | + : |
58 | + else | |
59 | + die "the GUI requires GTK (which was not found)" | |
60 | + fi | |
61 | + _gtk=`$_pkgconfig --modversion gtk+-2.0 2>&1` | |
62 | + _inc_gtk=`$_pkgconfig --cflags gtk+-2.0 2>&1` | |
08636e41 AG |
63 | + _ld_gtk=`$_pkgconfig --libs gtk+-2.0 2>&1` |
64 | + echores "$_gtk (using $_pkconfig)" | |
501dd69d | 65 | |
66 | # Check for GLIB | |
67 | echocheck "glib version" | |
68 | - if test -z "$_glibconfig" ; then | |
69 | - if ( glib-config --version ) >/dev/null 2>&1 ; then | |
70 | - _glibconfig="glib-config" | |
71 | - elif ( glib12-config --version ) >/dev/null 2>&1 ; then | |
72 | - _glibconfig="glib12-config" | |
73 | - else | |
08636e41 | 74 | - die "The GUI requires GLib devel packages (which were not found)" |
501dd69d | 75 | - fi |
08636e41 | 76 | + if ( $_pkgconfig --modversion glib-2.0 ) > /dev/null 2>&1 ; then |
501dd69d | 77 | + : |
78 | + else | |
08636e41 | 79 | + die "The GUI requires GLIB (which was not found)" |
501dd69d | 80 | fi |
81 | - _glib=`$_glibconfig --version 2>&1` | |
82 | - _inc_glib=`$_glibconfig --cflags 2>&1` | |
83 | - _ld_glib=`$_glibconfig --libs 2>&1` | |
84 | - echores "$_glib (using $_glibconfig)" | |
85 | + _glib=`$_pkgconfig --modversion glib-2.0 2>&1` | |
86 | + _inc_glib=`$_pkgconfig --cflags glib-2.0 2>&1` | |
08636e41 | 87 | + _ld_glib=`$_pkgconfig --libs glib-2.0 2>&1` |
501dd69d | 88 | + echores "$_glib (using $_pkgconfig)" |
89 | ||
90 | _def_gui='#define HAVE_NEW_GUI 1' | |
91 | _ld_gui='$(GTKLIB) $(GLIBLIB)' | |
08636e41 AG |
92 | diff -burN MPlayer-1.0pre3.orig/Gui/mplayer/gtk/about.c MPlayer-1.0pre3/Gui/mplayer/gtk/about.c |
93 | --- MPlayer-1.0pre3.orig/Gui/mplayer/gtk/about.c 2004-01-02 15:29:01.000000000 +0100 | |
94 | +++ MPlayer-1.0pre3/Gui/mplayer/gtk/about.c 2004-01-02 15:56:07.000000000 +0100 | |
501dd69d | 95 | @@ -67,11 +67,20 @@ |
96 | gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 ); | |
97 | gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC ); | |
98 | ||
99 | +#ifdef USE_GTK1 | |
100 | AboutText=gtk_text_new( NULL,NULL ); | |
101 | +#else | |
102 | + AboutText=gtk_text_view_new(); | |
08636e41 | 103 | + gtk_text_view_set_editable( GTK_TEXT_VIEW( AboutText ), FALSE ); |
501dd69d | 104 | +#endif |
105 | gtk_widget_set_name( AboutText,"AboutText" ); | |
106 | gtk_widget_show( AboutText ); | |
107 | gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText ); | |
108 | +#ifdef USE_GTK1 | |
109 | gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, | |
110 | +#else | |
08636e41 | 111 | + gtk_text_buffer_set_text( gtk_text_view_get_buffer( AboutText), |
501dd69d | 112 | +#endif |
113 | "\n" | |
114 | MSGTR_ABOUT_UHU | |
115 | " (http://www.uhulinux.hu/)\n" |