[HEADS UP/CFT] Xserver 1.6 + randr + intel

[Robert Noland]

Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
planning to commit this sometime next week.  This patch includes the
following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
the 2.6.1 release of the intel driver.

cd /usr/src
patch -p0 -E -i <patchfile>

Then update the ports in the following order:
randrproto
libXrandr
xrandr
xorg-server
then rebuild your video and input drivers. (xf86-video-whatever,
keyboard, and mouse)

The patch is http://people.freebsd.org/~rnoland/xserver-1.6rc.patch

robert.

--
Robert Noland <[hidden email]>
FreeBSD

[Robert Noland]

On Sat, 2009-01-31 at 21:52 -0500, Robert Noland wrote:
> Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> planning to commit this sometime next week.  This patch includes the
> following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> the 2.6.1 release of the intel driver.
>
> cd /usr/src

A couple of folks pointed out my typo...

cd /usr/ports

> patch -p0 -E -i <patchfile>
>
> Then update the ports in the following order:
> randrproto
> libXrandr
> xrandr
> xorg-server
> then rebuild your video and input drivers. (xf86-video-whatever,
> keyboard, and mouse)
>
> The patch is http://people.freebsd.org/~rnoland/xserver-1.6rc.patch

I also failed to update my cvs on a couple of them when importing from
git... So I have respun the patch, should apply cleanly now.

The updated intel driver has XvMC support on 965+ and I think when I
fixed that upstream, it also fixed it for the rest of them (915/945,
etc).  You may have to hack on mplayer or ffmpeg, can't remember which
one to find a player that uses it, but it's there... vlc is also
reported to support it.

robert.

> robert.

--
Robert Noland <[hidden email]>
FreeBSD

[Marcin Cieslak]

Robert Noland wrote:
> Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> planning to commit this sometime next week.  This patch includes the
> following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> the 2.6.1 release of the intel driver.


After a successful upgrade of kernel and world r187968M:two days ago and
a successful (sic!) update of X to server 1.5.3 and friends I have
decided to give 1.6 a try.

I have tried this both with intel and nv driver (my laptop has both but
only one can be active at the time - switchable at the boot time).

1. First thing, I have lost access to my legacy X11 fonts.

[dix] Could not init font path element /usr/local/lib/X11/fonts/misc/,
removing from list!
[dix] Could not init font path element /usr/local/lib/X11/fonts/TTF/,
removing from list!
[dix] Could not init font path element /usr/local/lib/X11/fonts/OTF,
removing from list!

etc.

I get:

% xset fp+ /usr/local/lib/X11/fonts/100dpi
xset:  bad font path element (#23), possible causes are:
     Directory does not exist or has wrong permissions
     Directory missing fonts.dir
     Incorrect font server address or syntax

There is no more a "freetype" and "xtrap" module, so I had to change by
config.

Gtk applications (seamonkey) and Qt (psi) have no problems with fonts,
but xterm does. xterm is unable to locate any bitmap font (fallback to
"fixed") and when told to use Freetype fonts (-fa 'Luxi Mono-10' option)
it looks like black text on black background (my xterm has a white fb,
black bg). You can issue commands in such a window (the letter spacing
is preserved and the cursor moves), but xterm segfaults when there is
a need to scroll.

xterm -bg white segfaults immediately,

xterm has been recompiled after 1.6 installation.

2. Once (when running NVidia) the server froze, i.e. I could only move
mouse and no keys worked (including server zap, switching VTs or
Ctrl-Alt-Del). This happened when displaying a fast-scrolling
./configure output of the libXfont in a full-screen xterm window.

The freeze doesn't look like
a http://bugs.freedesktop.org/show_bug.cgi?id=17358 however.

I am using dwm as the window manager.

A bunch of config files and output from various commands is available at:

http://akson.sgh.waw.pl/~saper/FreeBSD/ports/xorg-server/xorg-1.6/

--Marcin

_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"

[Paul B. Mahol]

On 2/3/09, Marcin Cieslak <[hidden email]> wrote:

> Robert Noland wrote:
>> Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
>> planning to commit this sometime next week.  This patch includes the
>> following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
>> the 2.6.1 release of the intel driver.
>
>
> After a successful upgrade of kernel and world r187968M:two days ago and
> a successful (sic!) update of X to server 1.5.3 and friends I have
> decided to give 1.6 a try.
>
> I have tried this both with intel and nv driver (my laptop has both but
> only one can be active at the time - switchable at the boot time).
>
> 1. First thing, I have lost access to my legacy X11 fonts.
>
> [dix] Could not init font path element /usr/local/lib/X11/fonts/misc/,
> removing from list!
> [dix] Could not init font path element /usr/local/lib/X11/fonts/TTF/,
> removing from list!
> [dix] Could not init font path element /usr/local/lib/X11/fonts/OTF,
> removing from list!
>
> etc.
>
> I get:
>
> % xset fp+ /usr/local/lib/X11/fonts/100dpi
> xset:  bad font path element (#23), possible causes are:
>      Directory does not exist or has wrong permissions
>      Directory missing fonts.dir
>      Incorrect font server address or syntax
>
> There is no more a "freetype" and "xtrap" module, so I had to change by
> config.
>
> Gtk applications (seamonkey) and Qt (psi) have no problems with fonts,
> but xterm does. xterm is unable to locate any bitmap font (fallback to
> "fixed") and when told to use Freetype fonts (-fa 'Luxi Mono-10' option)
> it looks like black text on black background (my xterm has a white fb,
> black bg). You can issue commands in such a window (the letter spacing
> is preserved and the cursor moves), but xterm segfaults when there is
> a need to scroll.
>
> xterm -bg white segfaults immediately,
>
> xterm has been recompiled after 1.6 installation.
>
> 2. Once (when running NVidia) the server froze, i.e. I could only move
> mouse and no keys worked (including server zap, switching VTs or
> Ctrl-Alt-Del). This happened when displaying a fast-scrolling
> ./configure output of the libXfont in a full-screen xterm window.
>
> The freeze doesn't look like
> a http://bugs.freedesktop.org/show_bug.cgi?id=17358 however.
>
> I am using dwm as the window manager.
>
> A bunch of config files and output from various commands is available at:
>
> http://akson.sgh.waw.pl/~saper/FreeBSD/ports/xorg-server/xorg-1.6/
>
> --Marcin
>
> _______________________________________________
> [hidden email] mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-x11
> To unsubscribe, send any mail to "[hidden email]"
>

Missing freetype module should be fixed in xorg-server git.

--
Paul
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"

[Marcin Cieslak]

Paul B. Mahol wrote:
> On 2/3/09, Marcin Cieslak <[hidden email]> wrote:

>> 1. First thing, I have lost access to my legacy X11 fonts.
>
> Missing freetype module should be fixed in xorg-server git.
>

It was actually --enable-builtin-fonts (the default) that caused the
problem. The attached patch fixes the problem.

I also added "--disable-builtin-fonts" to the Makefile since I didn't
want to re-generate the configure file, but it may not be necessary.

Adding this patch to the x11-servers/xorg-server/files made my xterm run
again.

Thanks for the pointer, the patch is actually http://42.pl/u/1v1N 
slightly modified.

--Marcin

--- include/dixfont.h.orig 2009-01-31 05:21:50.000000000 +0100
+++ include/dixfont.h 2009-02-04 01:36:50.928061947 +0100
@@ -142,4 +142,6 @@
 
 extern void SetGlyphCachingMode(int /*newmode*/);
 
+extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);
+
 #endif /* DIXFONT_H */
--- dix/dixfonts.c.orig 2009-01-31 05:21:50.000000000 +0100
+++ dix/dixfonts.c 2009-02-04 01:34:22.024360263 +0100
@@ -1907,12 +1907,9 @@
 {
     patternCache = MakeFontPatternCache();
 
-#ifdef BUILTIN_FONTS
     BuiltinRegisterFpeFunctions();
-#else
     FontFileRegisterFpeFunctions();
     fs_register_fpe_functions();
-#endif
 }
 
 int
--- hw/xfree86/common/xf86Config.c.orig 2009-01-31 05:21:50.000000000 +0100
+++ hw/xfree86/common/xf86Config.c 2009-02-04 01:34:22.029363650 +0100
@@ -110,8 +110,6 @@
 #define PROJECTROOT "/usr/X11R6"
 #endif
 
-static char *fontPath = NULL;
-
 static ModuleDefault ModuleDefaults[] = {
     {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
     {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
@@ -586,90 +584,55 @@
 static void
 configFiles(XF86ConfFilesPtr fileconf)
 {
-  MessageType pathFrom = X_DEFAULT;
-  int countDirs;
-  char *temp_path;
-  char *log_buf;
-
-  /* FontPath */
-  /* Try XF86Config FontPath first */
-  if (!xf86fpFlag) {
-   if (fileconf) {
-    if (fileconf->file_fontpath) {
-      char *f = xf86ValidateFontPath(fileconf->file_fontpath);
-      pathFrom = X_CONFIG;
-      if (*f) {
-        if (xf86Info.useDefaultFontPath) {
-          char *g;
-          xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath);
-  g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
-          strcpy(g, f);
-          strcat(g, ",");
-          defaultFontPath = strcat(g, defaultFontPath);
-          xfree(f);
-        } else {
-          defaultFontPath = f;
-        }
-      } else {
- xf86Msg(X_WARNING,
-    "FontPath is completely invalid.  Using compiled-in default.\n");
-        fontPath = NULL;
-        pathFrom = X_DEFAULT;
-      }
-    }
-   } else {
-      xf86Msg(X_DEFAULT,
-    "No FontPath specified.  Using compiled-in default.\n");
-      pathFrom = X_DEFAULT;
-   }
-  } else {
-    /* Use fontpath specified with '-fp' */
-    if (fontPath)
-    {
-      fontPath = NULL;
-    }
-    pathFrom = X_CMDLINE;
-  }
-  if (!fileconf) {
-      /* xf86ValidateFontPath will write into it's arg, but defaultFontPath
-       could be static, so we make a copy. */
-    char *f = xnfalloc(strlen(defaultFontPath) + 1);
-    f[0] = '\0';
-    strcpy (f, defaultFontPath);
-    defaultFontPath = xf86ValidateFontPath(f);
-    xfree(f);
-  } else {
-   if (fileconf) {
-    if (!fileconf->file_fontpath) {
-      /* xf86ValidateFontPath will write into it's arg, but defaultFontPath
-       could be static, so we make a copy. */
-     char *f = xnfalloc(strlen(defaultFontPath) + 1);
-     f[0] = '\0';
-     strcpy (f, defaultFontPath);
-     defaultFontPath = xf86ValidateFontPath(f);
-     xfree(f);
+    MessageType pathFrom;
+    Bool must_copy;
+    int size, countDirs;
+    char *temp_path, *log_buf, *start, *end;
+
+    /* FontPath */
+    must_copy = TRUE;
+
+    temp_path = defaultFontPath ? defaultFontPath : "";
+    if (xf86fpFlag)
+ pathFrom = X_CMDLINE;
+    else if (fileconf && fileconf->file_fontpath) {
+ pathFrom = X_CONFIG;
+ if (xf86Info.useDefaultFontPath) {
+    defaultFontPath = Xprintf("%s%s%s",
+      fileconf->file_fontpath,
+      *temp_path ? "," : "", temp_path);
+    must_copy = FALSE;
+ }
+ else
+    defaultFontPath = fileconf->file_fontpath;
     }
-   }
-  }
-
-  /* If defaultFontPath is still empty, exit here */
+    else
+ pathFrom = X_DEFAULT;
+    temp_path = defaultFontPath ? defaultFontPath : "";
 
-  if (! *defaultFontPath)
-    FatalError("No valid FontPath could be found.");
+    /* ensure defaultFontPath contains "built-ins" */
+    start = strstr(temp_path, "built-ins");
+    end = start + strlen("built-ins");
+    if (start == NULL ||
+ !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
+ defaultFontPath = Xprintf("%s%sbuilt-ins",
+  temp_path, *temp_path ? "," : "");
+ must_copy = FALSE;
+    }
+    /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
+    temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
+    defaultFontPath = xf86ValidateFontPath(temp_path);
+    free(temp_path);
+
+    /* make fontpath more readable in the logfiles */
+    countDirs = 1;
+    temp_path = defaultFontPath;
+    while ((temp_path = index(temp_path, ',')) != NULL) {
+ countDirs++;
+ temp_path++;
+    }
 
-  /* make fontpath more readable in the logfiles */
-  countDirs = 1;
-  temp_path = defaultFontPath;
-  while((temp_path = index(temp_path, ',')) != NULL) {
-    countDirs++;
-    temp_path++;
-  }
-  log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
-  if(!log_buf) /* fallback to old method */
-    xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath);
-  else {
-    char *start, *end;
-    int size;
+    log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
     temp_path = log_buf;
     start = defaultFontPath;
     while((end = index(start, ',')) != NULL) {
@@ -685,7 +648,6 @@
     strcpy(temp_path, start);
     xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
     xfree(log_buf);
-  }
 
 
   if (fileconf && fileconf->file_inputdevs) {
--- configure.ac.orig 2009-01-31 06:11:48.000000000 +0100
+++ configure.ac 2009-02-04 01:34:22.021359628 +0100
@@ -503,9 +503,6 @@
  [Install libxf86config (default: disabled)]),
  [INSTALL_LIBXF86CONFIG=$enableval],
  [INSTALL_LIBXF86CONFIG=no])
-AC_ARG_ENABLE(builtin-fonts,  AS_HELP_STRING([--enable-builtin-fonts], [Use only built-in fonts (default: yes)]),
-                                [BUILTIN_FONTS=$enableval],
-                                [BUILTIN_FONTS=yes])
 AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
                                  [NULL_ROOT_CURSOR=$enableval],
                                  [NULL_ROOT_CURSOR=no])
@@ -958,11 +955,6 @@
  AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
 fi
 
-if test "x$BUILTIN_FONTS" = xyes; then
-       AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts])
-       FONTPATH="built-ins"
-fi
-
 if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
    AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
    REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"

_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"

[Robert Noland]

On Tue, 2009-02-03 at 20:15 +0100, Marcin Cieslak wrote:

> Robert Noland wrote:
> > Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> > planning to commit this sometime next week.  This patch includes the
> > following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> > the 2.6.1 release of the intel driver.
>
>
> After a successful upgrade of kernel and world r187968M:two days ago and
> a successful (sic!) update of X to server 1.5.3 and friends I have
> decided to give 1.6 a try.
>
> I have tried this both with intel and nv driver (my laptop has both but
> only one can be active at the time - switchable at the boot time).
>
> 1. First thing, I have lost access to my legacy X11 fonts.
>
> [dix] Could not init font path element /usr/local/lib/X11/fonts/misc/,
> removing from list!
> [dix] Could not init font path element /usr/local/lib/X11/fonts/TTF/,
> removing from list!
> [dix] Could not init font path element /usr/local/lib/X11/fonts/OTF,
> removing from list!

The font issue is being discussed on the xorg lists and I expect a
resolution will be present in the final 1.6 server.

> etc.
>
> I get:
>
> % xset fp+ /usr/local/lib/X11/fonts/100dpi
> xset:  bad font path element (#23), possible causes are:
>      Directory does not exist or has wrong permissions
>      Directory missing fonts.dir
>      Incorrect font server address or syntax
>
> There is no more a "freetype" and "xtrap" module, so I had to change by
> config.

AFAICT, xtrap is just gone... I need to get some clarification on what
is going on with freetype.

> Gtk applications (seamonkey) and Qt (psi) have no problems with fonts,
> but xterm does. xterm is unable to locate any bitmap font (fallback to
> "fixed") and when told to use Freetype fonts (-fa 'Luxi Mono-10' option)
> it looks like black text on black background (my xterm has a white fb,
> black bg). You can issue commands in such a window (the letter spacing
> is preserved and the cursor moves), but xterm segfaults when there is
> a need to scroll.
>
> xterm -bg white segfaults immediately,
>
> xterm has been recompiled after 1.6 installation.
>
> 2. Once (when running NVidia) the server froze, i.e. I could only move
> mouse and no keys worked (including server zap, switching VTs or
> Ctrl-Alt-Del). This happened when displaying a fast-scrolling
> ./configure output of the libXfont in a full-screen xterm window.

I'm not really setup to test the nv driver at the moment, so I can't add
a lot here.

robert.

> The freeze doesn't look like
> a http://bugs.freedesktop.org/show_bug.cgi?id=17358 however.
>
> I am using dwm as the window manager.
>
> A bunch of config files and output from various commands is available at:
>
> http://akson.sgh.waw.pl/~saper/FreeBSD/ports/xorg-server/xorg-1.6/
>
> --Marcin
>
> _______________________________________________
> [hidden email] mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-x11
> To unsubscribe, send any mail to "[hidden email]"

--

Robert Noland <[hidden email]>
FreeBSD

[Marcin Cieslak]

Robert Noland wrote:

> The font issue is being discussed on the xorg lists and I expect a
> resolution will be present in the final 1.6 server.

Yes, this is more or less the patch I have sent before.

Things are fine when disabling "builtin fonts only" feature of the X.org
server and we no longer need freetype module for that.

> AFAICT, xtrap is just gone... I need to get some clarification on what
> is going on with freetype.

Not needed anymore I guess. To sum: everything runs fine since yesterday
I have upgraded with a remove-bultin-fonts-feature-patch.

> I'm not really setup to test the nv driver at the moment, so I can't add
> a lot here.

"Nv" used to have some trouble, but for now it is running stable for me.
I will switch by box to Intel however, any hints how to test the new
XvMC extension support?

--Marcin

_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"

[Marcin Cieslak]

A short how-to:

1) Compile and configure Xserver 1.6 with xf86-video-intel driver 2.6.1

2) Add

         Option          "XvMC"                  "on"

to your /etc/X11/xorg.conf in the Section "Device" for the "intel" driver:

Section "Device"
         Identifier  "Intel945"
         Driver      "intel"
         VendorName  "Intel Corporation"
         BoardName   "Mobile 945GM/GMS, 943/940GML Express Integrated
Graphics Controller"
         (...)
         Option          "XvMC"                  "on"
EndSection

3) Add two flags to your ports/multimedia/mplayer/Makefile, so it looks
more or less like this:

CONFIGURE_ARGS+=        --disable-ssse3 \
                         --disable-directfb \
                         --disable-faac \
                         --disable-twolame \
                         --disable-mencoder \
                         --enable-xvmc \
                         --with-xvmclib=XvMCW

4) Verify that /usr/local/lib/libXvMCW.so is installed (should be
required by the intel driver).

5) Recompile mplayer and reinstall

6) Get a pure MPEG-2 video stream (MPEG-2 TS for example)

7) Play it with:

%  mplayer -vo xvmc -vc ffmpeg12mc El_Rep_35.mpg
MPlayer 1.0rc2-4.2.1 (C) 2000-2007 MPlayer Team
CPU: Intel(R) Core(TM)2 CPU         T5600  @ 1.83GHz (Family: 6, Model:
15, Stepping: 2)
CPUflags:  MMX: 1 MMX2: 1 3DNow: 0 3DNow2: 0 SSE: 1 SSE2: 1
Compiled for x86 CPU with extensions: MMX MMX2 SSE SSE2

Playing El_Rep_35.mpg.
MPEG-PS file format detected.
VIDEO:  MPEG2  640x480  (aspect 1)  25.000 fps    0.0 kbps ( 0.0 kbyte/s)
xscreensaver_disable: Could not find XScreenSaver window.
dcop: not found
vo_xvmc: X-Video extension 2.2
vo_xvmc: X-Video MotionCompensation Extension version 1.1
==========================================================================
Forced video codec: ffmpeg12mc
Opening video decoder: [ffmpeg] FFmpeg's libavcodec codec family
[VD_FFMPEG] XVMC accelerated codec.
Selected video codec: [ffmpeg12mc] vfm: ffmpeg (FFmpeg MPEG-1/2 (XvMC))
==========================================================================
(...)
[VD_FFMPEG] XVMC-accelerated MPEG-2.
[VD_FFMPEG] Trying pixfmt=0.
VDec: vo config request - 640 x 480 (preferred colorspace: MPEG1/2
Motion Compensation and IDCT)
VDec: using MPEG1/2 Motion Compensation as output csp (no 1)
Movie-Aspect is 1.33:1 - prescaling to correct movie aspect.
VO: [xvmc] 640x480 => 640x480 MPEG1/2 Motion Compensation
vo_xvmc: Port 80 grabed
vo_xvmc: Found matching surface with id=434D5658 on 80 port at 0 adapter
[intel_xvmc] info: decoder type is i915/945 MPEG2 MC decoder
vo_xvmc: Allocated Direct Context
vo_xvmc: data_blocks allocated
vo_xvmc: mv_blocks allocated
vo_xvmc: Motion Compensation context allocated - 8 surfaces
vo_xvmc: idct=0 unsigned_intra=0
vo_xvmc: looking for OSD support
vo_xvmc: No OSD support for this mode

OSD does not work, and I probably don't have IDCT but other than that it
seems to work, from -msglevel vo=9 output:

vo_xvmc: query_format=1DC70002
vo_xvmc: Querying 2 adaptors
vo_xvmc: Quering adaptor #0
vo_xvmc: probing port #80
vo_xvmc: XvMC list have 2 surfaces
vo_xvmc: Found matching surface with id=434D5658 on 80 port at 0 adapter
vo_xvmc: Querying 2 adaptors
vo_xvmc: Quering adaptor #0
vo_xvmc: probing port #80
vo_xvmc: XvMC list have 2 surfaces
vo_xvmc: Port 80 grabed
vo_xvmc: Found matching surface with id=434D5658 on 80 port at 0 adapter
vo_xvmc: Allocated Direct Context
vo_xvmc: data_blocks allocated
vo_xvmc: mv_blocks allocated
vo_xvmc: surface[0] = 0xdb0c60 .rndr=0x80775d800
vo_xvmc: surface[1] = 0xdb0c80 .rndr=0x80775d870
vo_xvmc: surface[2] = 0xdb0ca0 .rndr=0x80775d8e0
vo_xvmc: surface[3] = 0xdb0cc0 .rndr=0x80775d950
vo_xvmc: surface[4] = 0xdb0ce0 .rndr=0x80775d9c0
vo_xvmc: surface[5] = 0xdb0d00 .rndr=0x80775da30
vo_xvmc: surface[6] = 0xdb0d20 .rndr=0x80775daa0
vo_xvmc: surface[7] = 0xdb0d40 .rndr=0x80775db10
vo_xvmc: Motion Compensation context allocated - 8 surfaces
vo_xvmc: idct=0 unsigned_intra=0
vo_xvmc: looking for OSD support
vo_xvmc: No OSD support for this mode

--Marcin

_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"

[Peter Jeremy-2]

On Sat, 2009-01-31 at 21:52 -0500, Robert Noland wrote:
> Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> planning to commit this sometime next week.  This patch includes the
> following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> the 2.6.1 release of the intel driver.

I notice that this timeline hasn't eventuated.  Given the ongoing
problems with the X.org 7.4 upgrade, could you please release the
patch you intend to commit and wait for people to test it before
committing it.  It is much easier to undo an uncommitted patch than
try to roll back the ports tree.

>> The patch is http://people.freebsd.org/~rnoland/xserver-1.6rc.patch
>
>I also failed to update my cvs on a couple of them when importing from
>git... So I have respun the patch, should apply cleanly now.

This patch has two failures against the current ports tree:

|Index: x11-servers/xorg-server/Makefile
|===================================================================
|RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v
|retrieving revision 1.64
|diff -u -r1.64 Makefile
|--- x11-servers/xorg-server/Makefile   27 Jan 2009 09:31:22 -0000      1.64
|+++ x11-servers/xorg-server/Makefile   1 Feb 2009 05:47:52 -0000
--------------------------
Patching file x11-servers/xorg-server/Makefile using Plan A...
Hunk #1 failed at 6.
Hunk #2 succeeded at 36.
1 out of 2 hunks failed--saving rejects to x11-servers/xorg-server/Makefile.rej
...
|Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|===================================================================
|RCS file: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|diff -N x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c  15 Apr 2008 18:01:15 -0000      1.2
|+++ /dev/null  1 Jan 1970 00:00:00 -0000
--------------------------
Patching file x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c using Plan A...
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c.rej

The patch to Makefile is just a PORTREVISION mismatch and easy to fix.
The bsd_mouse.c patch is more problematic.  Your patch is intented to
completely remove the patch file but you have since updated the patchfile
to fix problems with multiple mouse opens and it's not clear whether
those changes are still required.

--
Peter Jeremy

[Robert Noland]

On Sun, 2009-02-08 at 07:30 +1100, Peter Jeremy wrote:

> On Sat, 2009-01-31 at 21:52 -0500, Robert Noland wrote:
> > Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> > planning to commit this sometime next week.  This patch includes the
> > following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> > the 2.6.1 release of the intel driver.
>
> I notice that this timeline hasn't eventuated.  Given the ongoing
> problems with the X.org 7.4 upgrade, could you please release the
> patch you intend to commit and wait for people to test it before
> committing it.  It is much easier to undo an uncommitted patch than
> try to roll back the ports tree.
>
> >> The patch is http://people.freebsd.org/~rnoland/xserver-1.6rc.patch
> >
> >I also failed to update my cvs on a couple of them when importing from
> >git... So I have respun the patch, should apply cleanly now.
>
> This patch has two failures against the current ports tree:
>
> |Index: x11-servers/xorg-server/Makefile
> |===================================================================
> |RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v
> |retrieving revision 1.64
> |diff -u -r1.64 Makefile
> |--- x11-servers/xorg-server/Makefile   27 Jan 2009 09:31:22 -0000      1.64
> |+++ x11-servers/xorg-server/Makefile   1 Feb 2009 05:47:52 -0000
> --------------------------
> Patching file x11-servers/xorg-server/Makefile using Plan A...
> Hunk #1 failed at 6.
> Hunk #2 succeeded at 36.
> 1 out of 2 hunks failed--saving rejects to x11-servers/xorg-server/Makefile.rej
> ...
> |Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
> |===================================================================
> |RCS file: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
> |diff -N x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
> |--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c  15 Apr 2008 18:01:15 -0000      1.2
> |+++ /dev/null  1 Jan 1970 00:00:00 -0000
> --------------------------
> Patching file x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c using Plan A...
> Hunk #1 failed at 0.
> 1 out of 1 hunks failed--saving rejects to x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c.rej
>
> The patch to Makefile is just a PORTREVISION mismatch and easy to fix.
> The bsd_mouse.c patch is more problematic.  Your patch is intented to
> completely remove the patch file but you have since updated the patchfile
> to fix problems with multiple mouse opens and it's not clear whether
> those changes are still required.

I'll respin the patch, but the os-support has been removed from the
server in 1.6.  It now lives in the mouse driver itself, so that patch
is just entirely removed.

robert.

>
--
Robert Noland <[hidden email]>
FreeBSD