rpms/gnome-desktop/devel add-randr-12.patch, 1.11, 1.12 gnome-desktop.spec, 1.126, 1.127
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Wed Feb 20 18:27:02 UTC 2008
- Previous message (by thread): rpms/swfdec-mozilla/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 swfdec-mozilla.spec, 1.5, 1.6
- Next message (by thread): rpms/selinux-policy/devel policy-20071130.patch, 1.67, 1.68 selinux-policy.spec, 1.610, 1.611
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ssp
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10427
Modified Files:
add-randr-12.patch gnome-desktop.spec
Log Message:
Update randr
add-randr-12.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 add-randr-12.patch
Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/add-randr-12.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- add-randr-12.patch 16 Feb 2008 01:38:09 -0000 1.11
+++ add-randr-12.patch 20 Feb 2008 18:26:49 -0000 1.12
@@ -1,196 +1,7 @@
-diff -up gnome-desktop-2.21.91/configure.in.add-randr-12 gnome-desktop-2.21.91/configure.in
---- gnome-desktop-2.21.91/configure.in.add-randr-12 2008-02-11 13:38:20.000000000 -0500
-+++ gnome-desktop-2.21.91/configure.in 2008-02-13 10:51:26.000000000 -0500
-@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
- AC_SUBST(GNOME_DISTRIBUTOR)
- AC_SUBST(GNOME_DATE)
-
--GNOME_COMMON_INIT
--GNOME_DEBUG_CHECK
--GNOME_COMPILE_WARNINGS([maximum])
--GNOME_MAINTAINER_MODE_DEFINES
-+#GNOME_COMMON_INIT
-+#GNOME_DEBUG_CHECK
-+#GNOME_COMPILE_WARNINGS([maximum])
-+#GNOME_MAINTAINER_MODE_DEFINES
-
- # As a special favour for vuntz, support --disable-deprecations
-
-diff -up gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/Makefile.am
---- gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 2008-02-11 13:35:11.000000000 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/Makefile.am 2008-02-13 10:51:26.000000000 -0500
-@@ -2,4 +2,7 @@ libgnomeui_desktopdir = $(includedir)/gn
- libgnomeui_desktop_HEADERS = \
- gnome-ditem-edit.h \
- gnome-hint.h \
-- gnome-bg.h
-+ gnome-bg.h \
-+ randrwrap.h \
-+ monitor-db.h
-+
-diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h
---- /dev/null 2008-02-13 09:53:53.228642516 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h 2008-02-15 20:28:36.000000000 -0500
-@@ -0,0 +1,51 @@
-+#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
-+#error This is not for general consumption yet.
-+#endif
-+
-+#ifndef MONITOR_DB_H
-+#define MONITOR_DB_H
-+
-+#include <libgnomeui/randrwrap.h>
-+#include <glib.h>
-+
-+typedef struct Output Output;
-+typedef struct Configuration Configuration;
-+
-+struct Output
-+{
-+ char * name;
-+
-+ gboolean on;
-+ int width;
-+ int height;
-+ int rate;
-+ int x;
-+ int y;
-+ RWRotation rotation;
-+
-+ gboolean connected;
-+ char vendor[4];
-+ guint product;
-+ guint serial;
-+ double aspect;
-+ int pref_width;
-+ int pref_height;
-+ char * display_name;
-+};
-+
-+struct Configuration
-+{
-+ Output **outputs;
-+};
-+
-+void configuration_free (Configuration *configuration);
-+Configuration *configuration_new_current (RWScreen *screen);
-+gboolean configuration_match (Configuration *config1,
-+ Configuration *config2);
-+gboolean configuration_save (Configuration *configuration,
-+ GError **err);
-+gboolean configuration_apply_stored (RWScreen *screen);
-+gboolean configuration_applicable (Configuration *configuration,
-+ RWScreen *screen);
-+
-+#endif
-diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h
---- /dev/null 2008-02-13 09:53:53.228642516 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h 2008-02-15 20:28:36.000000000 -0500
-@@ -0,0 +1,100 @@
-+#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
-+#error This is not yet for general consumption.
-+#endif
-+
-+#ifndef RANDR_WRAP_H
-+#define RANDR_WRAP_H
-+
-+#include <glib.h>
-+#include <gdk/gdk.h>
-+
-+typedef struct RWScreen RWScreen;
-+typedef struct RWOutput RWOutput;
-+typedef struct RWCrtc RWCrtc;
-+typedef struct RWMode RWMode;
-+
-+typedef void (* RWScreenChanged) (RWScreen *screen, gpointer data);
-+
-+typedef enum
-+{
-+ RW_ROTATION_0 = (1 << 0),
-+ RW_ROTATION_90 = (1 << 1),
-+ RW_ROTATION_180 = (1 << 2),
-+ RW_ROTATION_270 = (1 << 3),
-+ RW_REFLECT_X = (1 << 4),
-+ RW_REFLECT_Y = (1 << 5)
-+} RWRotation;
-+
-+/* RWScreen */
-+RWScreen * rw_screen_new (GdkScreen *screen,
-+ RWScreenChanged callback,
-+ gpointer data);
-+RWOutput ** rw_screen_list_outputs (RWScreen *screen);
-+RWCrtc ** rw_screen_list_crtcs (RWScreen *screen);
-+RWMode ** rw_screen_list_modes (RWScreen *screen);
-+void rw_screen_set_size (RWScreen *screen,
-+ int width,
-+ int height,
-+ int mm_width,
-+ int mm_height);
-+RWCrtc * rw_screen_get_crtc_by_id (RWScreen *screen,
-+ guint32 id);
-+gboolean rw_screen_refresh (RWScreen *screen);
-+RWOutput * rw_screen_get_output_by_id (RWScreen *screen,
-+ guint32 id);
-+RWOutput * rw_screen_get_output_by_name (RWScreen *screen,
-+ const char *name);
-+void rw_screen_get_ranges (RWScreen *screen,
-+ int *min_width,
-+ int *max_width,
-+ int *min_height,
-+ int *max_height);
-+
-+/* RWOutput */
-+guint32 rw_output_get_id (RWOutput *output);
-+const char * rw_output_get_name (RWOutput *output);
-+gboolean rw_output_is_connected (RWOutput *output);
-+int rw_output_get_size_inches (RWOutput *output);
-+int rw_output_get_width_mm (RWOutput *outout);
-+int rw_output_get_height_mm (RWOutput *output);
-+const guint8 *rw_output_get_edid_data (RWOutput *output);
-+RWCrtc ** rw_output_get_possible_crtcs (RWOutput *output);
-+RWMode * rw_output_get_current_mode (RWOutput *output);
-+RWCrtc * rw_output_get_crtc (RWOutput *output);
-+void rw_output_get_position (RWOutput *output,
-+ int *x,
-+ int *y);
-+gboolean rw_output_can_clone (RWOutput *output,
-+ RWOutput *clone);
-+RWMode ** rw_output_list_modes (RWOutput *output);
-+RWMode * rw_output_get_preferred_mode (RWOutput *output);
-+gboolean rw_output_supports_mode (RWOutput *output,
-+ RWMode *mode);
-+
-+/* RWMode */
-+guint32 rw_mode_get_id (RWMode *mode);
-+guint rw_mode_get_width (RWMode *mode);
-+guint rw_mode_get_height (RWMode *mode);
-+int rw_mode_get_freq (RWMode *mode);
-+
-+/* RWCrtc */
-+guint32 rw_crtc_get_id (RWCrtc *crtc);
-+gboolean rw_crtc_set_config (RWCrtc *crtc,
-+ int x,
-+ int y,
-+ RWMode *mode,
-+ RWRotation rotation,
-+ RWOutput **outputs,
-+ int n_outputs);
-+gboolean rw_crtc_can_drive_output (RWCrtc *crtc,
-+ RWOutput *output);
-+RWMode * rw_crtc_get_current_mode (RWCrtc *crtc);
-+void rw_crtc_get_position (RWCrtc *crtc,
-+ int *x,
-+ int *y);
-+RWRotation rw_crtc_get_current_rotation (RWCrtc *crtc);
-+RWRotation rw_crtc_get_rotations (RWCrtc *crtc);
-+gboolean rw_crtc_supports_rotation (RWCrtc *crtc,
-+ RWRotation rotation);
-+
-+#endif
diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c
---- /dev/null 2008-02-13 09:53:53.228642516 -0500
[...3453 lines suppressed...]
++typedef enum
++{
++ UNDEFINED,
++ DVI,
++ HDMI_A,
++ HDMI_B,
++ MDDI,
++ DISPLAY_PORT
++} Interface;
++
++typedef enum
++{
++ UNDEFINED_COLOR,
++ MONOCHROME,
++ RGB,
++ OTHER_COLOR
++} ColorType;
++
++typedef enum
++{
++ NO_STEREO,
++ FIELD_RIGHT,
++ FIELD_LEFT,
++ TWO_WAY_RIGHT_ON_EVEN,
++ TWO_WAY_LEFT_ON_EVEN,
++ FOUR_WAY_INTERLEAVED,
++ SIDE_BY_SIDE
++} StereoType;
++
++struct Timing
++{
++ int width;
++ int height;
++ int frequency;
++};
++
++struct DisplayDescriptor
++{
++};
++
++struct DetailedTiming
++{
++ int pixel_clock;
++ int h_addr;
++ int h_blank;
++ int h_sync;
++ int h_front_porch;
++ int v_addr;
++ int v_blank;
++ int v_sync;
++ int v_front_porch;
++ int width_mm;
++ int height_mm;
++ int right_border;
++ int top_border;
++ int interlaced;
++ StereoType stereo;
++
++ int digital_sync;
++ union
++ {
++ struct
++ {
++ int bipolar;
++ int serrations;
++ int sync_on_green;
++ } analog;
++
++ struct
++ {
++ int composite;
++ int serrations;
++ int negative_vsync;
++ int negative_hsync;
++ } digital;
++ };
++};
++
++struct MonitorInfo
++{
++ int checksum;
++ char manufacturer_code[4];
++ int product_code;
++ unsigned int serial_number;
++
++ int production_week; /* -1 if not specified */
++ int production_year; /* -1 if not specified */
++ int model_year; /* -1 if not specified */
++
++ int major_version;
++ int minor_version;
++
++ int is_digital;
++
++ union
++ {
++ struct
++ {
++ int bits_per_primary;
++ Interface interface;
++ int rgb444;
++ int ycrcb444;
++ int ycrcb422;
++ } digital;
++
++ struct
++ {
++ double video_signal_level;
++ double sync_signal_level;
++ double total_signal_level;
++
++ int blank_to_black;
++
++ int separate_hv_sync;
++ int composite_sync_on_h;
++ int composite_sync_on_green;
++ int serration_on_vsync;
++ ColorType color_type;
++ } analog;
++ };
++
++ int width_mm; /* -1 if not specified */
++ int height_mm; /* -1 if not specified */
++ double aspect_ratio; /* -1.0 if not specififed */
++
++ double gamma; /* -1.0 if not specified */
++
++ int standby;
++ int suspend;
++ int active_off;
++
++ int srgb_is_standard;
++ int preferred_timing_includes_native;
++ int continuous_frequency;
++
++ double red_x;
++ double red_y;
++ double green_x;
++ double green_y;
++ double blue_x;
++ double blue_y;
++ double white_x;
++ double white_y;
++
++ Timing established[24]; /* Terminated by 0x0x0 */
++ Timing standard[8];
++
++ int n_detailed_timings;
++ DetailedTiming detailed_timings[4]; /* If monitor has a preferred
++ * mode, it is the first one
++ * (whether it has, is
++ * determined by the
++ * preferred_timing_includes
++ * bit.
++ */
++
++ /* Optional product description */
++ char dsc_serial_number[14];
++ char dsc_product_name[14];
++ char dsc_string[14]; /* Unspecified ASCII data */
++};
++
++MonitorInfo *decode_edid (const uchar *data);
++char * make_display_name (const char *output_name,
++ const MonitorInfo *info);
+diff -up gnome-desktop-2.21.91/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.21.91/libgnome-desktop/Makefile.am
+--- gnome-desktop-2.21.91/libgnome-desktop/Makefile.am.add-randr-12 2008-02-11 13:35:11.000000000 -0500
++++ gnome-desktop-2.21.91/libgnome-desktop/Makefile.am 2008-02-13 10:51:26.000000000 -0500
+@@ -20,7 +20,12 @@ libgnome_desktop_2_la_SOURCES = \
+ gnome-desktop-item.c \
+ gnome-ditem-edit.c \
+ gnome-hint.c \
+- gnome-bg.c
++ gnome-bg.c \
++ display-name.c \
++ randrwrap.c \
++ monitor-db.c \
++ edid-parse.c \
++ edid.h
+
+ libgnome_desktop_2_la_LIBADD = \
+ $(XLIB_LIBS) \
+diff -up gnome-desktop-2.21.91/configure.in.add-randr-12 gnome-desktop-2.21.91/configure.in
+--- gnome-desktop-2.21.91/configure.in.add-randr-12 2008-02-11 13:38:20.000000000 -0500
++++ gnome-desktop-2.21.91/configure.in 2008-02-13 10:51:26.000000000 -0500
+@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
+ AC_SUBST(GNOME_DISTRIBUTOR)
+ AC_SUBST(GNOME_DATE)
+
+-GNOME_COMMON_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
++#GNOME_COMMON_INIT
++#GNOME_DEBUG_CHECK
++#GNOME_COMPILE_WARNINGS([maximum])
++#GNOME_MAINTAINER_MODE_DEFINES
+
+ # As a special favour for vuntz, support --disable-deprecations
+
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-desktop.spec 19 Feb 2008 17:14:06 -0000 1.126
+++ gnome-desktop.spec 20 Feb 2008 18:26:49 -0000 1.127
@@ -12,7 +12,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.21.91
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -122,6 +122,9 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Wed Feb 20 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.91-7
+* Update randr code
+
* Tue Feb 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-6
- Fix a possible crash in the background code
- Previous message (by thread): rpms/swfdec-mozilla/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 swfdec-mozilla.spec, 1.5, 1.6
- Next message (by thread): rpms/selinux-policy/devel policy-20071130.patch, 1.67, 1.68 selinux-policy.spec, 1.610, 1.611
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list