<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2">
</HEAD>
<BODY>
On Mon, 2011-11-21 at 03:42 +0200, Martin-Éric Racine wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
Please note that the --rebase option completely rewrites some recent
changes performed into master!
</PRE>
</BLOCKQUOTE>
That would be on your local disk, right? Without the rebase option it does a merge. It depends what you prefer, but for evaluation/testing, having code merged with local changes is not ideal.
<BLOCKQUOTE TYPE=CITE>
<PRE>
2011/11/21 Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>>:
> This aggregates the patches recently posted.
>
> You can browse the patches at <A HREF="http://cgit.freedesktop.org/~gnadon/xf86-video-geode/">http://cgit.freedesktop.org/~gnadon/xf86-video-geode/</A>
> or you can pull them into your source tree:
>
> git pull --rebase git://people.freedesktop.org/~gnadon/xf86-video-geode
>
> There are no driver functionality changes but it now compiles on FreeBSD
> A quick check to load the driver on a Geode system would be appreciated.
>
> New configure option:
> --enable-ztv Enable Video For Linux based ZTV driver (default:
> auto-detected)
> This option now works:
> --enable-strict-compilation
> Enable all warnings from compiler and make them
> errors (default: disabled)
>
> Gaetan Nadon (21):
> Move ztv driver to it's own directory
> Add conditional build for ztv
> Add a configure option to enable/disable building the ztv driver
> Remove no longer used AMD_V4L2_VIDEO from makefiles
> Remove HAVE__GX HAVE_LX and OPT_ACCEL from ztv build
> Remove unused LINUX_2_6 macro from geode driver makefile
> Remove broken duplicate visibility configure option
> Remove ztv LINUX_2_6 switch and dead code
> Remove unrequired .s assembly files automake support
> Remove duplicate warning variable and werror option
> Remove -DPNL_SUP for the ztv driver
> Remove unused and misleading I386ARCH configuration code
> Remove -I linux_v26 as the directory does not exist
> geode source: streamline whitespace and sort alphabetically
> Detect 32bit support on 64bit OS and compile with -m32 if found
> Separate compiler from pre-processor options
> Move back ztv with geode driver
> config: remove a few dead/obsolete lines of code
> config: The compiler version to use is now set in
> XORG_DEFAULT_OPTIONS
> config: fix Autoconf warnings and improve comments
> Remove unrequired large file descriptor partial support
>
> Makefile.am | 1 +
> configure.ac | 128 ++++++++++++++++--------------
> src/Makefile.am | 232 +++++++++++++++++++++++++++---------------------------
> src/durango.c | 2 -
> src/geode_msr.c | 9 ++-
> src/z4l.c | 22 -----
> 6 files changed, 192 insertions(+), 202 deletions(-)
>
> --
> 1.7.4.1
>
> _______________________________________________
> Xorg-driver-geode mailing list
> <A HREF="mailto:Xorg-driver-geode@lists.x.org">Xorg-driver-geode@lists.x.org</A>
> <A HREF="http://lists.x.org/mailman/listinfo/xorg-driver-geode">http://lists.x.org/mailman/listinfo/xorg-driver-geode</A>
>
</PRE>
</BLOCKQUOTE>
<BR>
</BODY>
</HTML>