Re: High CPU usage with tabs and GTK
Hello, Thank you for pointing out xscope, I didn't know about it. I ran my app under xscope and the first thing I noticed was that there were many DAMAGE-Event related messages, about 90 groups of them per second. So on a hunch, I disabled DAMAGE in X and the problem of the constant chatter went away completely, the CPU went to 0%-1% with tabs in the app and gtk.events_pending() returns False as soon as the window is rendered just like I expect it to. The output of xscope is very verbose, so what arguments do you recommend I use to narrow down the output to something useful? I was attempting to find a repeating pattern that I could post here, but the damage events all seemed to be mixed in with a lot of stuff that doesn't have a short term repeat. So, here is a semi random excerpt from the log that looked like it might apply: Thank you, -Neil- 6.35:64 bytes -- X11 Server ..EVENT: DAMAGE-Event detail: 02 data: 8b 09 20 06 8c 09 ..REPLY: GetGeometry depth: 18 root: WIN 0043 x: 4 y: 25 width: 00eb height: 02bd border-width: 6.33: Client -- 128 bytes REQUEST: XFIXES-Request minor opcode: 05 data: (3) REQUEST: DAMAGE-Request minor opcode: 03 data: (3) REQUEST: XFIXES-Request minor opcode: 0a data: (1) REQUEST: CreatePixmap depth: 18 pixmap-id: PXM 06200d76 drawable: DWB 06200061 width: 00ef height: 02c1 REQUEST: RenderRequest RENDERREQUEST: RenderCreatePicture picture: PICTURE 06200d77 drawable: DWB 06200d76 format: PICTFORMAT 0029 value-mask: 0 REQUEST: RenderRequest RENDERREQUEST: RenderFillRectangles op: Over dest: PICTURE 06200d77 color: COLOR r:d5d5 g:d1d1 b:cfcf a: rectangles: (1) REQUEST: GetProperty delete: False window: WIN 06200061 property: ATM 019d type: CARDINAL long-offset: On Mon, Feb 27, 2012 at 11:53 AM, Adam Jackson a...@redhat.com wrote: On Fri, 2012-02-24 at 23:40 -0800, Neil Whelchel wrote: Here is a cut and paste of what strace shows, the messages repeat about 90 times per second when tabs are active. strace output is unpleasantly difficult to read for this purpose. Try using xscope instead: http://cgit.freedesktop.org/xorg/app/xscope/ - ajax ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
dvi to vga, resolution too small
Problem: I have dual head videocard nvidia 6200 (agp) with VGA and DVI. Resolution of monitor is 1600x1200 on VGA head. But maximum resolution of monitor on DVI head (through DVI to VGA) is only 640x480. How to set bigger resolution? P.S. Sorry for my english. My environment: Videocard: # lspci -k | grep VGA -A3 01:00.0 VGA compatible controller: nVidia Corporation NV44A [GeForce 6200] (rev a1) Subsystem: PC Partner Limited Device 2017 Kernel driver in use: nvidia Kernel modules: nvidia Xorg: # Xorg -version X.Org X Server 1.11.2 Release Date: 2011-11-04 X Protocol Version 11, Revision 0 Build Operating System: Linux 3.2.1-gentoo-r2 i686 Gentoo Current Operating System: Linux monitoring1.korolyov.mtw.ru 3.2.1-gentoo-r2 #5 SMP Fri Feb 17 11:41:27 MSK 2012 i686 Kernel command line: root=/dev/sda2 Build Date: 17 February 2012 09:17:16AM Current version of pixman: 0.24.0 Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. xorg.conf: # cat /etc/X11/xorg.conf # nvidia-xconfig: X configuration file generated by nvidia-xconfig # nvidia-xconfig: version 290.10 (buildmeis...@swio-display-x86-rhel47-07.nvidia.com) Wed Nov 16 20:32:22 PST 2011 Section ServerLayout Identifier Layout0 Screen 0 Screen0 InputDeviceKeyboard0 CoreKeyboard InputDeviceMouse0 CorePointer EndSection Section Files EndSection Section InputDevice # generated from data in /etc/conf.d/gpm Identifier Mouse0 Driver mouse Option Protocol Option Device /dev/input/mice Option Emulate3Buttons no Option ZAxisMapping 4 5 EndSection Section InputDevice # generated from default Identifier Keyboard0 Driver kbd EndSection Section Monitor Identifier Monitor0 VendorName Unknown ModelName Unknown HorizSync 28.0 - 33.0 VertRefresh 43.0 - 72.0 Option DPMS EndSection Section Device Identifier Device0 Driver nvidia VendorName NVIDIA Corporation EndSection Section Screen Identifier Screen0 Device Device0 MonitorMonitor0 DefaultDepth24 SubSection Display Depth 24 EndSubSection EndSection Resolution (DVI to VGA): # su - username -c'export DISPLAY=:0.0; xrandr -q' xrandr: Failed to get size of gamma for output default Screen 0: minimum 320 x 240, current 640 x 480, maximum 640 x 480 default connected 640x480+0+0 0mm x 0mm 640x48050.0* 320x24051.0 Resolution (VGA): # su - username -c'export DISPLAY=:0.0; xrandr -q' xrandr: Failed to get size of gamma for output default Screen 0: minimum 320 x 175, current 1600 x 1200, maximum 1600 x 1200 default connected 1600x1200+0+0 0mm x 0mm 1600x1200 50.0*51.0 52.0 53.0 1400x1050 54.0 55.0 1280x1024 56.0 57.0 58.0 59.0 1280x960 60.0 61.0 1152x864 62.0 1024x768 63.0 64.0 65.0 66.0 67.0 68.0 960x72069.0 928x69670.0 896x67271.0 832x62472.0 800x60073.0 74.0 75.0 76.0 77.0 78.0 79.0 80.0 81.0 82.0 720x40083.0 640x51284.0 85.0 86.0 640x48087.0 88.0 89.0 90.0 91.0 92.0 93.0 94.0 640x40095.0 640x35096.0 576x43297.0 512x38498.0 99.0100.0101.0102.0 416x312 103.0 400x300 104.0105.0106.0107.0108.0 360x200 109.0 320x240 110.0111.0112.0113.0 320x200 114.0 320x175 115.0 ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: Configure Xorg on 2001 PPC iBook with Debian 6
On Wed, Feb 29, 2012 at 6:08 PM, Mike Mackenna mpmacke...@gmail.com wrote: Added this to the device section as shown below. The weird part is You missed the Option word. Anyway, I don't think r128 honors that option so never mind. vbe/int10 is disabled on ppc in most of the r128 driver because it does not work, but when doing probing (-configure) it still gets used. Instead, try to make or find a usable xorg.conf, something like this: http://mac.linux.be/content/xorgconf-ibook-g3-500-dual-usb-0 Tormod ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: Configure Xorg on 2001 PPC iBook with Debian 6
Scratch that... This is the one that is working. http://mac.linux.be/files/xorg/ibook6.txt On Wed, Feb 29, 2012 at 10:13 AM, Mike Mackenna mpmacke...@gmail.com wrote: Hello, I am trying to configure X on an old iBook running Debian 6. When I run Xorg -configure I get the error below. http://pastebin.com/bpVHVmN2 My xorg.conf.new file looks like this. http://pastebin.com/h85p1qGc My xorg.0.log file looks like this. http://pastebin.com/xFffPiug My kernel version is as follows. Linux ejhs-litlab-ibook-00 2.6.32-5-powerpc #1 Mon Jan 16 16:36:52 UTC 2012 ppc GNU/Linux Any help is greatly appreciated. Thanks, Mike -- Michael MacKenna mpmacke...@gmail.com Got Chrome? http://www.google.com/chrome ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
[ANNOUNCE] listres 1.0.3
The listres program generates a list of X resources for a widget in an X client written using a toolkit based on libXt. This minor maintenance release mostly delivers minor cleanups and improvements to source code, documentation, build configuration. Alan Coopersmith (4): listres depends on xproto, not x11 (Xlib) Combine usage string/fprintf calls into one Replace computed printf format string with static string listres 1.0.3 Gaetan Nadon (10): config: update AC_PREREQ statement to 2.60 config: upgrade to util-macros 1.8 for additional man page support config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 config: remove unrequired AC_SUBST([*_CFLAGS]) config: remove unrequired AC_SUBST([*_LIBS]) config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS man: remove trailing spaces and tabs man: replace hard coded man page section with substitution strings config: move man pages into their own directory git tag: listres-1.0.3 http://xorg.freedesktop.org/archive/individual/app/listres-1.0.3.tar.bz2 MD5: 4e8edcc03001203c101e79d880d55762 SHA1: ff226b0e565c337ac1ae60027487131920b8d86b SHA256: c3d71e9a01650e3fd470189a749cd0202ef03d9e399350a7a7443d7595ed478e http://xorg.freedesktop.org/archive/individual/app/listres-1.0.3.tar.gz MD5: 77cafc32e8e02cca2d4453e73e0c0e7d SHA1: d81489c59b9629a00bc7fbc3dda443c942d65fc2 SHA256: 87d5698b8aa4d841e45e6556932c9914210cbd8b10003d664b31185b087981be -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc pgpXJI0v1Nc98.pgp Description: PGP signature ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: [PATCH xorg-gtest 1/3] Separate XSERVER deps from X11 deps
On 02/27/2012 08:04 AM, Gaetan Nadon wrote: The previous commits fixed a compile error as there were no -I for Xlib.h but at the same time introduced a link error for the example subdir. The X server published C flags introduce -fvisibility=hidden. The X server is not a build dependency for the gtest libraries, unlike video drivers. The patch simply separates the two and now uses only the C flags required to build the libraries. As a consequence, XSERVER_LIBS usage is replaced as well which is a noop. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- configure.ac |3 ++- examples/Makefile.am |2 +- src/Makefile.am |6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index da94219..807dbce 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,8 @@ LT_INIT AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES( GTEST_DEPS, x11 ) +PKG_CHECK_MODULES( XSERVER, [xorg-server] ) # Check for Google Test AC_CHECK_GTEST diff --git a/examples/Makefile.am b/examples/Makefile.am index 7076623..13ab8ca 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,7 +23,7 @@ noinst_PROGRAMS = xorg-gtest-example xorg_gtest_example_SOURCES = xorg-gtest.cpp AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CXXFLAGS = $(XSERVER_CFLAGS) $(GTEST_CPPFLAGS) +AM_CXXFLAGS = $(GTEST_DEPS_CFLAGS) $(GTEST_CPPFLAGS) xorg_gtest_example_LDADD = $(top_builddir)/src/libxorg-gtest.la $(top_builddir)/src/libxorg-gtest_main.la -lgtest -lpthread -lX11 diff --git a/src/Makefile.am b/src/Makefile.am index 24a1b8c..2c2648a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,11 +28,11 @@ libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -libxorg_gtest_la_LDFLAGS = $(XSERVER_LIBS) -Wl,--version-script=libxorg-gtest.ver +libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=libxorg-gtest.ver libxorg_gtest_main_la_LDFLAGS = \ - $(XSERVER_LIBS) \ + $(GTEST_DEPS_LIBS) \ -Wl,--version-script=libxorg-gtest_main.ver -AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/include $(GTEST_DEPS_CFLAGS) EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver It looks like we really just don't need xorg-server flags. If we remove it: PKG_CHECK_MODULES(XSERVER, x11) everything still seems to work fine. I'll send a patch for that, which should resolve symbol visibility as well. -- Chase ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH libXaw3d] Fix parameters of FloatInRange
Introduced in f6cd786d1.
Reported-by: Jean-Pierre Demailly jean-pierre.demai...@ujf-grenoble.fr
Signed-off-by: Matt Turner matts...@gmail.com
---
src/Scrollbar.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Scrollbar.c b/src/Scrollbar.c
index be74ed3..5667327 100644
--- a/src/Scrollbar.c
+++ b/src/Scrollbar.c
@@ -865,7 +865,7 @@ InRange(int num, int small, int big)
*/
static float
-FloatInRange(int num, int small, int big)
+FloatInRange(float num, float small, float big)
{
return (num small) ? small : ((num big) ? big : num);
}
--
1.7.3.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH macros 1/2] Make XORG_TESTSET_CFLAG work for multiple languages
Signed-off-by: Chase Douglas chase.doug...@canonical.com --- xorg-macros.m4.in | 53 - 1 files changed, 32 insertions(+), 21 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 8550ca0..9041542 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1449,49 +1449,60 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC=yes], [SUNCC=no]) # -Werror=unused-command-line-argument # AC_DEFUN([XORG_TESTSET_CFLAG], [ -AC_REQUIRE([AC_PROG_CC_C99]) m4_if([$#], 0, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) m4_if([$#], 1, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) -xorg_testset_save_CFLAGS=$CFLAGS +AC_LANG_COMPILER_REQUIRE + +AC_LANG_CASE( + [C], [ + AC_REQUIRE([AC_PROG_CC_C99]) + define([PREFIX], [C]) + ], + [C++], [ + define([PREFIX], [CXX]) + ] +) + +[xorg_testset_save_]PREFIX[FLAGS]=$PREFIX[FLAGS] if test x$xorg_testset_unknown_warning_option = x ; then - CFLAGS=$CFLAGS -Werror=unknown-warning-option - AC_CACHE_CHECK([if $CC supports -Werror=unknown-warning-option], - xorg_cv_cc_flag_unknown_warning_option, + PREFIX[FLAGS]=$PREFIX[FLAGS] -Werror=unknown-warning-option + AC_CACHE_CHECK([if compiler supports -Werror=unknown-warning-option], + xorg_cv_compiler_flag_unknown_warning_option, AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], - [xorg_cv_cc_flag_unknown_warning_option=yes], - [xorg_cv_cc_flag_unknown_warning_option=no])) - xorg_testset_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option - CFLAGS=$xorg_testset_save_CFLAGS + [xorg_cv_compiler_flag_unknown_warning_option=yes], + [xorg_cv_compiler_flag_unknown_warning_option=no])) + xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option + PREFIX[FLAGS]=$[xorg_testset_save_]PREFIX[FLAGS] fi if test x$xorg_testset_unused_command_line_argument = x ; then if test x$xorg_testset_unknown_warning_option = xyes ; then - CFLAGS=$CFLAGS -Werror=unknown-warning-option + PREFIX[FLAGS]=$PREFIX[FLAGS] -Werror=unknown-warning-option fi - CFLAGS=$CFLAGS -Werror=unused-command-line-argument - AC_CACHE_CHECK([if $CC supports -Werror=unused-command-line-argument], - xorg_cv_cc_flag_unused_command_line_argument, + PREFIX[FLAGS]=$PREFIX[FLAGS] -Werror=unused-command-line-argument + AC_CACHE_CHECK([if compiler supports -Werror=unused-command-line-argument], + xorg_cv_compiler_flag_unused_command_line_argument, AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], - [xorg_cv_cc_flag_unused_command_line_argument=yes], - [xorg_cv_cc_flag_unused_command_line_argument=no])) - xorg_testset_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument - CFLAGS=$xorg_testset_save_CFLAGS + [xorg_cv_compiler_flag_unused_command_line_argument=yes], + [xorg_cv_compiler_flag_unused_command_line_argument=no])) + xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument + PREFIX[FLAGS]=$[xorg_testset_save_]PREFIX[FLAGS] fi found=no m4_foreach([flag], m4_cdr($@), [ if test $found = no ; then if test x$xorg_testset_unknown_warning_option = xyes ; then - CFLAGS=$CFLAGS -Werror=unknown-warning-option + PREFIX[FLAGS]=$PREFIX[FLAGS] -Werror=unknown-warning-option fi if test x$xorg_testset_unused_command_line_argument = xyes ; then - CFLAGS=$CFLAGS -Werror=unused-command-line-argument + PREFIX[FLAGS]=$PREFIX[FLAGS] -Werror=unused-command-line-argument fi - CFLAGS=$CFLAGS ]flag[ + PREFIX[FLAGS]=$PREFIX[FLAGS] ]flag[ dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname AC_MSG_CHECKING([if $CC supports ]flag[]) @@ -1501,7 +1512,7 @@ dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname [eval AS_TR_SH($cacheid)=yes], [eval AS_TR_SH($cacheid)=no])]) - CFLAGS=$xorg_testset_save_CFLAGS + PREFIX[FLAGS]=$[xorg_testset_save_]PREFIX[FLAGS] eval supported=$AS_TR_SH($cacheid) AC_MSG_RESULT([$supported]) -- 1.7.9
[PATCH macros 2/2] Define BASE_CXXFLAGS when C++ is the chosen language
Set the language to C++ before calling XORG_DEFAULT_OPTIONS. This can be done by calling AC_LANG(C++). Signed-off-by: Chase Douglas chase.doug...@canonical.com --- xorg-macros.m4.in | 166 ++-- 1 files changed, 96 insertions(+), 70 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 9041542..e5b468f 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1528,13 +1528,13 @@ dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname # --- # Minimum version: 1.16.0 # -# Defines BASE_CFLAGS to contain a set of command line arguments supported -# by the selected compiler which do NOT alter the generated code. These -# arguments will cause the compiler to print various warnings during -# compilation AND turn a conservative set of warnings into errors. +# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line +# arguments supported by the selected compiler which do NOT alter the generated +# code. These arguments will cause the compiler to print various warnings +# during compilation AND turn a conservative set of warnings into errors. # -# The set of flags supported by BASE_CFLAGS will grow in future -# versions of util-macros as options are added to new compilers. +# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in +# future versions of util-macros as options are added to new compilers. # AC_DEFUN([XORG_COMPILER_FLAGS], [ AC_REQUIRE([XORG_COMPILER_BRAND]) @@ -1545,76 +1545,89 @@ AC_ARG_ENABLE(selective-werror, [SELECTIVE_WERROR=$enableval], [SELECTIVE_WERROR=yes]) +AC_LANG_CASE( +[C], [ +define([PREFIX], [C]) +], +[C++], [ +define([PREFIX], [CXX]) +] +) # -v is too short to test reliably with XORG_TESTSET_CFLAG if test x$SUNCC = xyes; then -BASE_CFLAGS=-v +[BASE_]PREFIX[FLAGS]=-v else -BASE_CFLAGS= +[BASE_]PREFIX[FLAGS]= fi # This chunk of warnings were those that existed in the legacy CWARNFLAGS -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wall]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wpointer-arith]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wstrict-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-declarations]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wnested-externs]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wbad-function-cast]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wformat=2], [-Wformat]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wold-style-definition]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wdeclaration-after-statement]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat]) + +AC_LANG_CASE( + [C], [ + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement]) + ] +) # This chunk adds additional warnings that could catch undesired effects. -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wunused]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wuninitialized]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wshadow]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-qual]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-noreturn]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-format-attribute]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wredundant-decls]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) # These are currently disabled because they are noisy. They will be enabled # in the future once the codebase is sufficiently modernized to silence # them. For now, I don't want them to drown out the other warnings. -# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wlogical-op]) -# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wparentheses]) -# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-align]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # Turn some warnings into errors, so we don't
[PATCH xorg-gtest] Remove xorg-server pkgconfig check
xorg-server flags are not needed. Including them also causes -fvisibility=hidden to be used, which breaks the build output. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index ae254be..89a72a7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ XORG_DEFAULT_OPTIONS AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES(XSERVER, x11) # Check for Google Test AC_CHECK_GTEST -- 1.7.9 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 2/3] distcheck fails: cannot open linker script file libxorg-gtest.ver
On 02/27/2012 08:04 AM, Gaetan Nadon wrote: The $(top_srcdir) path is needed to locate the source as it is not in the same dir as the generated files. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- src/Makefile.am |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2c2648a..c760354 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,10 +28,10 @@ libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=libxorg-gtest.ver +libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=$(top_srcdir)/src/libxorg-gtest.ver libxorg_gtest_main_la_LDFLAGS = \ $(GTEST_DEPS_LIBS) \ - -Wl,--version-script=libxorg-gtest_main.ver + -Wl,--version-script=$(top_srcdir)/src/libxorg-gtest_main.ver AM_CXXFLAGS = -I$(top_srcdir)/include $(GTEST_DEPS_CFLAGS) Looks good to me. Applied and pushed. Thanks! -- Chase ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 3/3] distcheck: cannot create directory `xorg-gtest-0.1.1': Permission denied
On 02/27/2012 08:04 AM, Gaetan Nadon wrote:
Use the util-macros implementation to generate the ChangeLog
and the INSTALL file.
Signed-off-by: Gaetan Nadonmems...@videotron.ca
---
Makefile.am |6 +++---
configure.ac |6 ++
2 files changed, 9 insertions(+), 3 deletions(-)
delete mode 100644 ChangeLog
delete mode 100644 Changelog
delete mode 100644 INSTALL
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..000
diff --git a/Changelog b/Changelog
deleted file mode 100644
index e69de29..000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..000
diff --git a/Makefile.am b/Makefile.am
index a3f51a3..19598ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,11 @@ pkgconfig_DATA = xorg-gtest.pc
ACLOCAL_AMFLAGS = -I m4
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
ChangeLog:
- cd ${top_srcdir} \
- mkdir -p ${distdir} \
- git log ${distdir}/ChangeLog
+ $(CHANGELOG_CMD)
INSTALL:
$(INSTALL_CMD)
diff --git a/configure.ac b/configure.ac
index 807dbce..f5b0cea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,12 @@ AC_PROG_LIBTOOL
LT_INIT
+# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.16 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.16)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_PROG_CXX
AC_PROG_INSTALL
Looks good to me. Applied and pushed.
Thanks!
-- Chase
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Xi: prohibit multiple XIQueryVersion requests with different versions
On 02/26/2012 06:58 PM, Peter Hutterer wrote: Return BadValue if major or minor differs on the second call. Signed-off-by: Peter Huttererpeter.hutte...@who-t.net Makes sense. Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] dix: when rescaling from master, rescale from desktop dimensions (#46657)
On 02/26/2012 04:18 PM, Peter Hutterer wrote:
master-last.valuators[] is in desktop dimensions, so use those as
rescale axis ranges, not the screen. Otherwise, a rescale on any screen
not the top-left will cause out-of-bounds coordinates which will always
map to the bottom-right screen, causing the device to be stuck on that
screen.
X.Org Bug 46657http://bugs.freedesktop.org/show_bug.cgi?id=46657
Signed-off-by: Peter Huttererpeter.hutte...@who-t.net
---
dix/getevents.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dix/getevents.c b/dix/getevents.c
index 306d0ff..11c509c 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -341,14 +341,16 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr
pDev)
pDev-last.valuators[0] = rescaleValuatorAxis(pDev-last.valuators[0],
NULL,
pDev-valuator-axes +
0,
- 0, scr-width);
+ screenInfo.x,
+ screenInfo.width);
}
if(pDev-valuator-numAxes 1)
{
pDev-last.valuators[1] = rescaleValuatorAxis(pDev-last.valuators[1],
NULL,
pDev-valuator-axes +
1,
- 0, scr-height);
+ screenInfo.y,
+ screenInfo.height);
}
/* calculate the other axis as well based on info from the old
Seems right to me.
Reviewed-by: Chase Douglas chase.doug...@canonical.com
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 1/3] Separate XSERVER deps from X11 deps
On 12-02-29 01:57 PM, Chase Douglas wrote: On 02/27/2012 08:04 AM, Gaetan Nadon wrote: The previous commits fixed a compile error as there were no -I for Xlib.h but at the same time introduced a link error for the example subdir. The X server published C flags introduce -fvisibility=hidden. The X server is not a build dependency for the gtest libraries, unlike video drivers. The patch simply separates the two and now uses only the C flags required to build the libraries. As a consequence, XSERVER_LIBS usage is replaced as well which is a noop. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- configure.ac |3 ++- examples/Makefile.am |2 +- src/Makefile.am |6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index da94219..807dbce 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,8 @@ LT_INIT AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES( GTEST_DEPS, x11 ) +PKG_CHECK_MODULES( XSERVER, [xorg-server] ) # Check for Google Test AC_CHECK_GTEST diff --git a/examples/Makefile.am b/examples/Makefile.am index 7076623..13ab8ca 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,7 +23,7 @@ noinst_PROGRAMS = xorg-gtest-example xorg_gtest_example_SOURCES = xorg-gtest.cpp AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CXXFLAGS = $(XSERVER_CFLAGS) $(GTEST_CPPFLAGS) +AM_CXXFLAGS = $(GTEST_DEPS_CFLAGS) $(GTEST_CPPFLAGS) xorg_gtest_example_LDADD = $(top_builddir)/src/libxorg-gtest.la $(top_builddir)/src/libxorg-gtest_main.la -lgtest -lpthread -lX11 diff --git a/src/Makefile.am b/src/Makefile.am index 24a1b8c..2c2648a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,11 +28,11 @@ libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -libxorg_gtest_la_LDFLAGS = $(XSERVER_LIBS) -Wl,--version-script=libxorg-gtest.ver +libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=libxorg-gtest.ver libxorg_gtest_main_la_LDFLAGS = \ -$(XSERVER_LIBS) \ +$(GTEST_DEPS_LIBS) \ -Wl,--version-script=libxorg-gtest_main.ver -AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/include $(GTEST_DEPS_CFLAGS) EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver It looks like we really just don't need xorg-server flags. If we remove it: PKG_CHECK_MODULES(XSERVER, x11) There is need for PKG_CHECK_MODULES(x11). Currently in the sample, it is hard-coded to -lX11 which could be the wrong library if one intended to use the one locally built rather than the system one. Analogous issues to the header files which were assumed to be system installed. FYI: I have a dozen patches pending for various other issues. everything still seems to work fine. I'll send a patch for that, which should resolve symbol visibility as well. -- Chase ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 1/3] Separate XSERVER deps from X11 deps
On 02/29/2012 12:57 PM, Gaetan Nadon wrote: On 12-02-29 01:57 PM, Chase Douglas wrote: On 02/27/2012 08:04 AM, Gaetan Nadon wrote: The previous commits fixed a compile error as there were no -I for Xlib.h but at the same time introduced a link error for the example subdir. The X server published C flags introduce -fvisibility=hidden. The X server is not a build dependency for the gtest libraries, unlike video drivers. The patch simply separates the two and now uses only the C flags required to build the libraries. As a consequence, XSERVER_LIBS usage is replaced as well which is a noop. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- configure.ac |3 ++- examples/Makefile.am |2 +- src/Makefile.am |6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index da94219..807dbce 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,8 @@ LT_INIT AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES( GTEST_DEPS, x11 ) +PKG_CHECK_MODULES( XSERVER, [xorg-server] ) # Check for Google Test AC_CHECK_GTEST diff --git a/examples/Makefile.am b/examples/Makefile.am index 7076623..13ab8ca 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,7 +23,7 @@ noinst_PROGRAMS = xorg-gtest-example xorg_gtest_example_SOURCES = xorg-gtest.cpp AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CXXFLAGS = $(XSERVER_CFLAGS) $(GTEST_CPPFLAGS) +AM_CXXFLAGS = $(GTEST_DEPS_CFLAGS) $(GTEST_CPPFLAGS) xorg_gtest_example_LDADD = $(top_builddir)/src/libxorg-gtest.la $(top_builddir)/src/libxorg-gtest_main.la -lgtest -lpthread -lX11 diff --git a/src/Makefile.am b/src/Makefile.am index 24a1b8c..2c2648a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,11 +28,11 @@ libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -libxorg_gtest_la_LDFLAGS = $(XSERVER_LIBS) -Wl,--version-script=libxorg-gtest.ver +libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=libxorg-gtest.ver libxorg_gtest_main_la_LDFLAGS = \ -$(XSERVER_LIBS) \ +$(GTEST_DEPS_LIBS) \ -Wl,--version-script=libxorg-gtest_main.ver -AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/include $(GTEST_DEPS_CFLAGS) EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver It looks like we really just don't need xorg-server flags. If we remove it: PKG_CHECK_MODULES(XSERVER, x11) There is need for PKG_CHECK_MODULES(x11). Currently in the sample, it is hard-coded to -lX11 which could be the wrong library if one intended to use the one locally built rather than the system one. Analogous issues to the header files which were assumed to be system installed. Yeah, I'm not suggesting we remove the x11 flags. Just the xorg-server flags. See the patch I just sent to xorg-devel. FYI: I have a dozen patches pending for various other issues. \o/ -- Chase ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH macros 2/2] Define BASE_CXXFLAGS when C++ is the chosen language
On 12-02-29 03:24 PM, Chase Douglas wrote: Set the language to C++ before calling XORG_DEFAULT_OPTIONS. This can be done by calling AC_LANG(C++). Is this sentence a recommendation of what to do in a module or does it describe what the patch does? I am a little confused. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- xorg-macros.m4.in | 166 ++-- 1 files changed, 96 insertions(+), 70 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 9041542..e5b468f 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1528,13 +1528,13 @@ dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname # --- # Minimum version: 1.16.0 # -# Defines BASE_CFLAGS to contain a set of command line arguments supported -# by the selected compiler which do NOT alter the generated code. These -# arguments will cause the compiler to print various warnings during -# compilation AND turn a conservative set of warnings into errors. +# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line +# arguments supported by the selected compiler which do NOT alter the generated +# code. These arguments will cause the compiler to print various warnings +# during compilation AND turn a conservative set of warnings into errors. # -# The set of flags supported by BASE_CFLAGS will grow in future -# versions of util-macros as options are added to new compilers. +# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in +# future versions of util-macros as options are added to new compilers. # AC_DEFUN([XORG_COMPILER_FLAGS], [ AC_REQUIRE([XORG_COMPILER_BRAND]) Note that XORG_COMPILER_BRAND calls AC_PROG_CC_C99 which I think can reset the language back to C. @@ -1545,76 +1545,89 @@ AC_ARG_ENABLE(selective-werror, [SELECTIVE_WERROR=$enableval], [SELECTIVE_WERROR=yes]) +AC_LANG_CASE( So the test here would always result in C. I am not sure, it's hard to follow. The reason you see some AC_PROG_CC_C99 is that there is always a theoretical possibility that a be called without the module having first called XORG_DEFAULT_OPTIONS. By usage, this will not happen as all modules call XORG_DEFAULT_OPTIONS early up. It is safe to removing it if it gets too much in the way. All of X.Org is compiled with C, so it is not surprising to see this assumption everywhere. This is great. +[C], [ +define([PREFIX], [C]) +], +[C++], [ +define([PREFIX], [CXX]) +] +) # -v is too short to test reliably with XORG_TESTSET_CFLAG if test x$SUNCC = xyes; then -BASE_CFLAGS=-v +[BASE_]PREFIX[FLAGS]=-v else -BASE_CFLAGS= +[BASE_]PREFIX[FLAGS]= fi # This chunk of warnings were those that existed in the legacy CWARNFLAGS -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wall]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wpointer-arith]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wstrict-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-declarations]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wnested-externs]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wbad-function-cast]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wformat=2], [-Wformat]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wold-style-definition]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wdeclaration-after-statement]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat]) + +AC_LANG_CASE( + [C], [ + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement]) + ] +) # This chunk adds additional warnings that could catch undesired effects. -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wunused]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wuninitialized]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wshadow]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-qual]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-noreturn]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-format-attribute]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wredundant-decls]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
Re: [PATCH xorg-gtest] Remove xorg-server pkgconfig check
On 12-02-29 03:28 PM, Chase Douglas wrote: xorg-server flags are not needed. Including them also causes -fvisibility=hidden to be used, which breaks the build output. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index ae254be..89a72a7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ XORG_DEFAULT_OPTIONS AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES(XSERVER, x11) # Check for Google Test AC_CHECK_GTEST That will do it. The name XSERVER is very confusing, but that can be changed later. Reviewed-by: Gaetan Nadonmems...@videotron.ca ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xorg-gtest 2/2] config: do not initialize libtool twice
AC_PROG_LIBTOOL initializes libtool, contrary to what the name may suggest. It has been renamed to LT_INIT in libtool v2. However X.Org has a requirement to support libtool v1.5. Signed-off-by: Gaetan Nadon mems...@videotron.ca --- configure.ac |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d15eac6..72d947c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,6 @@ AC_SUBST([LIB_VERSION]) # Initialize libtool AC_PROG_LIBTOOL -LT_INIT - # Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])]) -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH macros 2/2] Define BASE_CXXFLAGS when C++ is the chosen language
On 02/29/2012 02:58 PM, Gaetan Nadon wrote: On 12-02-29 03:24 PM, Chase Douglas wrote: Set the language to C++ before calling XORG_DEFAULT_OPTIONS. This can be done by calling AC_LANG(C++). Is this sentence a recommendation of what to do in a module or does it describe what the patch does? I am a little confused. You're right, I should have prefixed it with You can use this by ...: You can use this functionality by setting the language to C++ before calling XORG_DEFAULT_OPTIONS. This can accomplished with AC_LANG(C++). Signed-off-by: Chase Douglaschase.doug...@canonical.com --- xorg-macros.m4.in | 166 ++-- 1 files changed, 96 insertions(+), 70 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 9041542..e5b468f 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1528,13 +1528,13 @@ dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname # --- # Minimum version: 1.16.0 # -# Defines BASE_CFLAGS to contain a set of command line arguments supported -# by the selected compiler which do NOT alter the generated code. These -# arguments will cause the compiler to print various warnings during -# compilation AND turn a conservative set of warnings into errors. +# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line +# arguments supported by the selected compiler which do NOT alter the generated +# code. These arguments will cause the compiler to print various warnings +# during compilation AND turn a conservative set of warnings into errors. # -# The set of flags supported by BASE_CFLAGS will grow in future -# versions of util-macros as options are added to new compilers. +# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in +# future versions of util-macros as options are added to new compilers. # AC_DEFUN([XORG_COMPILER_FLAGS], [ AC_REQUIRE([XORG_COMPILER_BRAND]) Note that XORG_COMPILER_BRAND calls AC_PROG_CC_C99 which I think can reset the language back to C. Perhaps I should use AC_LANG_CASE() in XORG_COMPILER_BRAND as well? I think wrapping AC_REQUIRE([AC_PROG_CC_C99]) would suffice. The rest should be fine for CC and CXX both. Any issues with that? @@ -1545,76 +1545,89 @@ AC_ARG_ENABLE(selective-werror, [SELECTIVE_WERROR=$enableval], [SELECTIVE_WERROR=yes]) +AC_LANG_CASE( So the test here would always result in C. I am not sure, it's hard to follow. Your logic seems right, but I can confirm that it works as I intedended. Hopefully with the fix to XORG_COMPILER_BRAND we will be working properly for sure. The reason you see some AC_PROG_CC_C99 is that there is always a theoretical possibility that a be called without the module having first called XORG_DEFAULT_OPTIONS. By usage, this will not happen as all modules call XORG_DEFAULT_OPTIONS early up. It is safe to removing it if it gets too much in the way. I'm not sure what you are commenting on here... I am guessing that you meant to comment below where AC_PROG_CC_C99 is called, which is the case in one of the AC_LANG_CASE statements. If so, I'm happy to remove it, leave it, or change it. Just let me know. All of X.Org is compiled with C, so it is not surprising to see this assumption everywhere. This is great. +[C], [ +define([PREFIX], [C]) +], +[C++], [ +define([PREFIX], [CXX]) +] +) # -v is too short to test reliably with XORG_TESTSET_CFLAG if test x$SUNCC = xyes; then -BASE_CFLAGS=-v +[BASE_]PREFIX[FLAGS]=-v else -BASE_CFLAGS= +[BASE_]PREFIX[FLAGS]= fi # This chunk of warnings were those that existed in the legacy CWARNFLAGS -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wall]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wpointer-arith]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wstrict-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-prototypes]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-declarations]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wnested-externs]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wbad-function-cast]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wformat=2], [-Wformat]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wold-style-definition]) -XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wdeclaration-after-statement]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat]) + +AC_LANG_CASE( + [C], [ + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast]) +
Re: [PATCH xorg-gtest] Remove xorg-server pkgconfig check
On 02/29/2012 03:15 PM, Gaetan Nadon wrote: On 12-02-29 03:28 PM, Chase Douglas wrote: xorg-server flags are not needed. Including them also causes -fvisibility=hidden to be used, which breaks the build output. Signed-off-by: Chase Douglaschase.doug...@canonical.com --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index ae254be..89a72a7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ XORG_DEFAULT_OPTIONS AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES( XSERVER, x11 [xorg-server] ) +PKG_CHECK_MODULES(XSERVER, x11) # Check for Google Test AC_CHECK_GTEST That will do it. The name XSERVER is very confusing, but that can be changed later. Reviewed-by: Gaetan Nadonmems...@videotron.ca And pushed. Thanks! ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 1/2] config: no need to m4_include gtest.m4
On 02/29/2012 03:23 PM, Gaetan Nadon wrote: This is done when autoconf runs aclocal. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- configure.ac |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ae254be..d15eac6 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,6 @@ AC_INIT([Dummy X.org Testing Environment for Google Test], AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) -m4_include([m4/gtest.m4]) - # Initialize Automake AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) AM_SILENT_RULES([yes]) Looks right to me. Applied and pushed. Thanks! ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-gtest 2/2] config: do not initialize libtool twice
On 02/29/2012 03:23 PM, Gaetan Nadon wrote: AC_PROG_LIBTOOL initializes libtool, contrary to what the name may suggest. It has been renamed to LT_INIT in libtool v2. However X.Org has a requirement to support libtool v1.5. Signed-off-by: Gaetan Nadonmems...@videotron.ca --- configure.ac |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d15eac6..72d947c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,6 @@ AC_SUBST([LIB_VERSION]) # Initialize libtool AC_PROG_LIBTOOL -LT_INIT - # Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])]) The libtool docs support your claim :). Applied and pushed. Thanks! ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[Bug 44141] ATI R600: GPU lockup when using OpenGL
https://bugs.freedesktop.org/show_bug.cgi?id=44141 --- Comment #9 from Fabrice fabrice.j...@gmail.com 2012-02-29 00:03:27 PST --- Well, F16 still provide libdrm 2.4.30 so I won't try to compile. By the way, still an issue with xorg-x11-drv-ati 6.14.3.4. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 28106] radeon KMS causes hardware conflict/interference with Intel wifi and audio, crashes wireless
https://bugs.freedesktop.org/show_bug.cgi?id=28106 --- Comment #68 from Neven nkla...@gmail.com 2012-02-29 12:44:29 PST --- The wifi I tried disabling the sound quaility is still bad when doing anything display intensive. I havent tried disabling alsa altogether to see if the wifi is still dropping.. I wanna say when I first come up with MSI fixed version it sounds fine, youtube also sounds normal, but if I make the unity taskbar show up, then it goes into some sort of bad state where sound is bad again..maybe the clock switch in the gpu clock or cpu? Not sure I need to do some more experiments, haven't had the time. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 46796] New: [X800SE] Mouse cursor corruption when switching users
https://bugs.freedesktop.org/show_bug.cgi?id=46796 Bug #: 46796 Summary: [X800SE] Mouse cursor corruption when switching users Classification: Unclassified Product: xorg Version: unspecified Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/Radeon AssignedTo: xorg-driver-ati@lists.x.org ReportedBy: br...@canonical.com QAContact: xorg-t...@lists.x.org Forwarding this bug from Ubuntu reporter Jonathan Voss: http://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-ati/+bug/929960 [Problem] Mouse cursor corruption when switching users with an older ATI card [Original Description] I'm guessing the box is 64x64 pixels. It's got horizontal lines across it. The mouse pointer looks completely normal in screenshots, so I am including a picture taken with my phone. It looked messed up in the same way on the other account, and continues to look messed up now that I have switched back. It still functions normally, but it's a little hard to know where you're clicking since the actual pointer seems to be a bit away from the upper left corner of this box. I've just reproduced it twice tonight. It seems to happen randomly when switching to other accounts or to the login screen. I can't get it to happen consistently however so it's hard to tell what's causing it. Since my last reboot, I've switched through a bunch of accounts, gnome3, unity, and unity 2d, without getting the mouse corruption. By the way, I use a program called redshift, which causes a reddish hue at night, as can be seen in the picture. Redshift does not appear to affect the mouse pointer though. It may also cause this bug I guess. DistroRelease: Ubuntu 12.04 Package: xorg 1:7.6+10ubuntu1 ProcVersionSignature: Ubuntu 3.2.0-14.23-generic 3.2.3 Uname: Linux 3.2.0-14-generic i686 .tmp.unity.support.test.0: ApportVersion: 1.91-0ubuntu1 Architecture: i386 CompizPlugins: [core,bailer,detection,composite,opengl,decor,mousepoll,move,compiztoolbox,snap,regex,place,imgpng,vpswitch,grid,gnomecompat,resize,animation,wall,unitymtgrabhandles,session,expo,fade,workarounds,ezoom,scale,unityshell] CompositorRunning: None Date: Thu Feb 9 21:35:01 2012 DistUpgraded: Log time: 2012-01-29 13:29:25.075442 DistroCodename: precise DistroVariant: ubuntu ExtraDebuggingInterest: Yes, whatever it takes to get this fixed in Ubuntu GraphicsCard: Advanced Micro Devices [AMD] nee ATI R423 UK [Radeon X800SE (PCIE)] [1002:554b] (prog-if 00 [VGA controller]) Subsystem: C.P. Technology Co. Ltd Device [148c:2154] Subsystem: C.P. Technology Co. Ltd Device [148c:2155] InstallationMedia: Ubuntu 10.04.1 LTS Lucid Lynx - Release i386 (20100816.1) Lsusb: Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub Bus 001 Device 003: ID 0bc2:0503 Seagate RSS LLC Bus 002 Device 002: ID 046d:c52b Logitech, Inc. Unifying Receiver MachineType: System manufacturer System Product Name ProcKernelCmdLine: BOOT_IMAGE=/boot/vmlinuz-3.2.0-14-generic root=UUID=9735bb88-e60b-48fc-8db3-4153611e79a3 ro quiet splash vt.handoff=7 SourcePackage: xorg Symptom: display UpgradeStatus: Upgraded to precise on 2012-02-08 (1 days ago) dmi.bios.date: 11/08/2005 dmi.bios.vendor: Phoenix Technologies, LTD dmi.bios.version: ASUS A8N5X ACPI BIOS Revision 0502 dmi.board.name: A8N5X dmi.board.vendor: ASUSTeK Computer INC. dmi.board.version: 1.XX dmi.chassis.asset.tag: 123456789000 dmi.chassis.type: 3 dmi.chassis.vendor: Chassis Manufacture dmi.chassis.version: Chassis Version dmi.modalias: dmi:bvnPhoenixTechnologies,LTD:bvrASUSA8N5XACPIBIOSRevision0502:bd11/08/2005:svnSystemmanufacturer:pnSystemProductName:pvrSystemVersion:rvnASUSTeKComputerINC.:rnA8N5X:rvr1.XX:cvnChassisManufacture:ct3:cvrChassisVersion: dmi.product.name: System Product Name dmi.product.version: System Version dmi.sys.vendor: System manufacturer version.compiz: compiz 1:0.9.6+bzr20110929-0ubuntu8 version.libdrm2: libdrm2 2.4.30-1ubuntu1 version.libgl1-mesa-dri: libgl1-mesa-dri 8.0~rc2-0ubuntu4 version.libgl1-mesa-dri-experimental: libgl1-mesa-dri-experimental N/A version.libgl1-mesa-glx: libgl1-mesa-glx 8.0~rc2-0ubuntu4 version.xserver-xorg-core: xserver-xorg-core 2:1.11.3-0ubuntu10 version.xserver-xorg-input-evdev: xserver-xorg-input-evdev 1:2.6.99.901-1ubuntu3 version.xserver-xorg-video-ati: xserver-xorg-video-ati 1:6.14.99~git20111219.aacbd629-0ubuntu2 version.xserver-xorg-video-intel: xserver-xorg-video-intel 2:2.17.0-1ubuntu3 version.xserver-xorg-video-nouveau: xserver-xorg-video-nouveau 1:0.0.16+git20111201+b5534a1-1build2 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ xorg-driver-ati mailing list
[Bug 46796] [X800SE] Mouse cursor corruption when switching users
https://bugs.freedesktop.org/show_bug.cgi?id=46796 --- Comment #1 from Bryce Harrington br...@canonical.com 2012-02-29 16:07:00 PST --- Created attachment 57834 -- https://bugs.freedesktop.org/attachment.cgi?id=57834 BootDmesg.txt -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
