On Thu, 11 Dec 2008 15:11:23 -0800
Jesse Barnes <jbar...@virtuousgeek.org> wrote:

> Initially I thought the merge of the KMS bits into libdrm would be as easy as
> merging the  modesetting-gem branch into master.  But that branch has a ton of
> stuff in it, including code for radeon and nv that its maintainers probably
> don't want merged yet.  So I reverted my initial attempt and came up with this
> patch instead.
> 
> If it looks ok, I'll go ahead and commit it.  It basically just pulls over 
> the 
> xf86drmMode.* bits along with the new ioctl definitions in shared-core.

I was going to try and see if this breaks nouveau, but the patch looks
line-break damaged, and I couldn't get it to apply.

Please do not mix the names nouveau and nv.

> diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
> index a5be36e..c3619a6 100644
> --- a/libdrm/Makefile.am
> +++ b/libdrm/Makefile.am
> @@ -22,13 +22,14 @@ SUBDIRS = . intel
>  
>  libdrm_la_LTLIBRARIES = libdrm.la
>  libdrm_ladir = $(libdir)
> -libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
> +libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined

Is this intentional?

>  
>  AM_CFLAGS = -I$(top_srcdir)/shared-core
>  libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
> +     xf86drmMode.c libdrm_lists.h
>       libdrm_lists.h
>  
>  libdrmincludedir = ${includedir}
> -libdrminclude_HEADERS = xf86drm.h
> +libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
>  
>  EXTRA_DIST = ChangeLog TODO

-- 
Pekka Paalanen
http://www.iki.fi/pq/

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to